src/Builder4/DialogPluginWebkit.bjs

src/Builder4/DialogPluginWebkit.vala

diff --git a/src/Builder4/DialogPluginWebkit.bjs b/src/Builder4/DialogPluginWebkit.bjs
index 92b529b..e0e723a 100644 (file)
--- a/src/Builder4/DialogPluginWebkit.bjs
+++ b/src/Builder4/DialogPluginWebkit.bjs
@@ -15,7 +15,7 @@
    "gint default_height" : 500,
    "gboolean deletable" : true,
    "xtype" : "Dialog",
-   "| string show" : " (Gtk.Window ?parent, string text) {// JsRender.Node node) {\n \n    if (parent  != null) {\n        this.el.set_transient_for(parent);\n        this.el.modal = true;\n    }\n    \n    _this.webview.el.load_html( text , \n            //fixme - should be a config option!\n            // or should we catch stuff and fix it up..\n            \"xhttp://localhost/app.Builder/\"\n    );\n        \n    \n    this.el.show_all();\n     var   ret = \"\";\n    while (true) {\n        var response_id = this.el.run();\n        if (response_id < 1) {\n            this.el.hide();\n             return \"\";\n        }\n        // keep showing...?\n        break;\n    }\n    \n    // now we save it..\n    this.el.hide();\n    \n    return ret;\n    \n    \n    \n}\n",
+   "| string show" : " (Gtk.Window ?parent, string text) {// JsRender.Node node) {\n \n    if (parent  != null) {\n        this.el.set_transient_for(parent);\n        this.el.modal = true;\n    }\n    \n    \n    var runhtml = \"<script type=\\\"text/javascript\\\">\\n\" ;\n    string builderhtml;\n    \n    \n    GLib.FileUtils.get_contents(BuilderApplication.configDirectory() + \"/resources/roo.builder.js\", out builderhtml);\n\n    runhtml += builderhtml + \"\\n\";\n    runhtml += \"</script>\\n\" ;\n\n    // fix to make sure they are the same..\n    \n    // need to modify paths\n\n    string inhtml;\n    \n    GLib.FileUtils.get_contents(\n        BuilderApplication.configDirectory() + \"/resources/roo.builder.html\"\n            , out inhtml);\n    \n    \n/*\n    string js_src = js + \"\\n\" +\n\t\"Roo.onReady(function() {\\n\" +\n\t\"if (\" + _this.file.name +\".show) \" +  _this.file.name +\".show({});\\n\" +\n\t\"Roo.XComponent.build();\\n\" +\n\t\"});\\n\";\n*/\t\n  \n    //var fc =    FakeServerCache.factory_with_data(js_src);\n    //this.runjs = fc.fname;\n    \n        var html = inhtml.replace(\"</head>\", runhtml + this.runhtml + \n\n      //      \"<script type=\\\"text/javascript\\\" src=\\\"xhttp://localhost\" + fc.fname + \"\\\"></script>\" +   \n              //  \"<script type=\\\"text/javascript\\\">\\n\" +\n              //  js_src + \"\\n\" + \n              //  \"</script>\" + \n                        \n        \"</head>\");\n        //print(\"LOAD HTML \" + html);\n        \n         //var rootURL = _this.file.project.rootURL;\n   \n        \n        \n        this.el.load_html( html , \n            //fixme - should be a config option!\n            \"xhttp://localhost/app.Builder.js/\"\n        );\n    \n        \n    \n    this.el.show_all();\n     var   ret = \"\";\n    while (true) {\n        var response_id = this.el.run();\n        if (response_id < 1) {\n            this.el.hide();\n             return \"\";\n        }\n        // keep showing...?\n        break;\n    }\n    \n    // now we save it..\n    this.el.hide();\n    \n    return ret;\n    \n    \n    \n}\n",
    "$ xns" : "Gtk",
    "gint default_width" : 500,
    "gboolean modal" : true,

diff --git a/src/Builder4/DialogPluginWebkit.vala b/src/Builder4/DialogPluginWebkit.vala
index 71db7b6..431bd33 100644 (file)
--- a/src/Builder4/DialogPluginWebkit.vala
+++ b/src/Builder4/DialogPluginWebkit.vala
@@ -56,11 +56,57 @@ public class Xcls_DialogPluginWebkit : Object
             this.el.modal = true;
         }
         
-        _this.webview.el.load_html( text , 
+        
+        var runhtml = "<script type=\"text/javascript\">\n" ;
+        string builderhtml;
+        
+        
+        GLib.FileUtils.get_contents(BuilderApplication.configDirectory() + "/resources/roo.builder.js", out builderhtml);
+    
+        runhtml += builderhtml + "\n";
+        runhtml += "</script>\n" ;
+    
+        // fix to make sure they are the same..
+        
+        // need to modify paths
+    
+        string inhtml;
+        
+        GLib.FileUtils.get_contents(
+            BuilderApplication.configDirectory() + "/resources/roo.builder.html"
+                , out inhtml);
+        
+        
+    /*
+        string js_src = js + "\n" +
+       "Roo.onReady(function() {\n" +
+       "if (" + _this.file.name +".show) " +  _this.file.name +".show({});\n" +
+       "Roo.XComponent.build();\n" +
+       "});\n";
+    */ 
+      
+        //var fc =    FakeServerCache.factory_with_data(js_src);
+        //this.runjs = fc.fname;
+        
+            var html = inhtml.replace("</head>", runhtml + this.runhtml + 
+    
+          //      "<script type=\"text/javascript\" src=\"xhttp://localhost" + fc.fname + "\"></script>" +   
+                  //  "<script type=\"text/javascript\">\n" +
+                  //  js_src + "\n" + 
+                  //  "</script>" + 
+                            
+            "</head>");
+            //print("LOAD HTML " + html);
+            
+             //var rootURL = _this.file.project.rootURL;
+       
+            
+            
+            this.el.load_html( html , 
                 //fixme - should be a config option!
-                // or should we catch stuff and fix it up..
-                "xhttp://localhost/app.Builder/"
-        );
+                "xhttp://localhost/app.Builder.js/"
+            );
+        
             
         
         this.el.show_all();