BrowserWindow.bjs

BrowserWindow.vala

diff --git a/BrowserWindow.bjs b/BrowserWindow.bjs
index d9105a9..5fa1d66 100644 (file)
--- a/BrowserWindow.bjs
+++ b/BrowserWindow.bjs
@@ -24,11 +24,8 @@
      "$ xns" : "Gtk",
      "items" : [
       {
-       "listeners" : {
-        "load_finished" : "( ) => {\n\t\t \n       this.printit(); \n \n}"
-       },
        "id" : "view",
-       "* init" : "\n\n{\n#if GTK3\n\t\t this.el.load_changed.connect( (ev ) => {\n            \t\tif (ev == WebKit.LoadEvent.FINISHED) {\n\t                   this.printit(); \n                   }\n             \n            });\n\n#else\n //listeners\n            this.el.resource_request_starting.connect( (p0, webres, netreq ) => {\n              print(\"resource req. started %s\\n\", netreq.uri);\n                 \n            });\n            \n            this.el.load_finished.connect( ( ) => {\n            \t\t \n                   this.printit(); \n             \n            });\n            \n#endif\n}\n",
+       "* init" : "\n\n{\n#if GTK3\n\t\t this.el.load_changed.connect( (ev ) => {\n            \t\tif (ev == WebKit.LoadEvent.FINISHED) {\n\t                   this.printit(); \n                   }\n             \n            });\n\n#else\n //listeners\n            this.el.resource_request_starting.connect( (p0, webres, netreq ) => {\n              print(\"resource req. started %s\\n\", netreq.uri);\n                 \n            });\n            \n            this.el.load_finished.connect( ( ) => {\n            \t\t \n                   this.printit(); \n             \n            });\n#endif\n}\n",
        "| void printit" : "() {\n   print(\"load_finsihed\\n\");\n   \n   if (this.print_started) {\n      print(\"load_finsihed - already printing..\\n\");\n      return;\n  }\n   \n    this.print_started = true; // flag to stop double call.\n    \n    \n\t// inject any javascript if needed..\n\tif (webkitpdf.opt_inject_js != null) {\n\t\n\t\tprint(\"injecting javascript files \\n\");\n\t\tforeach(var inject_js in  webkitpdf.opt_inject_js) {\n\t\tprint(\"inject? %s\\n\", inject_js);\n\t\t\tstring str;\n\t\t\ttry {\n\t\t\t\tFileUtils.get_contents( inject_js, out str);\n\t\t\t} catch(FileError e) {\n\t\t\t\tprint(\"Failed to inject %s\\n\",  inject_js);\n\t\t\t\tcontinue;\n\t\t\t}\n#if GTK3\n\t\t\tGLib.MainLoop mainloop = new GLib.MainLoop();\n\t\t\tthis.el.run_javascript.begin(str, null, (obj,res) => {\n\t\t\t\tmainloop.quit();\n\t\t\t});\n\t\t\tmainloop.run();\n\t\t\t\n#else \t\t\t\n\t\t\tthis.el.execute_script(str);\n#endif\n\t\t}\n\t}\n\t\n\t\n\t\n\tprint(\"calling print in %d seconds\\n\", (int)webkitpdf.opt_delay);\n\tif (webkitpdf.opt_target_pdf != null) {\n\t\tGLib.Timeout.add_seconds(webkitpdf.opt_delay, () => { \n\n\t\t\tthis.printpdf();\n\t\t\t return false;\n\t\t}, GLib.Priority.DEFAULT);\n\t\treturn;\n\t}\n\t\t\n\n#if GTK3\n\tprint(\"PNG not supported in webkit2\\n\");\n\treturn;\n#else\n\t\t\n    GLib.Timeout.add_seconds(webkitpdf.opt_delay, () => { \n   \n\t\t\n\t\t// ----------------- JPEG \n\t\t// resize the window...\n\t\t// window.document.documentElement.scrollHeight\n\t\tvar scroll_height = (int) _this.view.el.get_dom_document().document_element.scroll_height;\n\t\tprint(\"Scroll height %d\\n\", scroll_height);\n\t\tif (scroll_height> 1024 || webkitpdf.opt_width > 0  || webkitpdf.opt_height > 0  ) {\n\t\t\tvar w = webkitpdf.opt_width > 0 ?  webkitpdf.opt_width  : 1200;\n\t\t\tvar h = int.min(scroll_height, 6000);\n\t\t\t_this.scrolled_window.el.set_size_request( w, h); \n\t\t\t_this.el.resize (w+50, h+50);\n\t\t\tprint(\"Resize to %d, %d\\n\", w,h);\n\t\t    GLib.Timeout.add_seconds(webkitpdf.opt_delay > 0 ? webkitpdf.opt_delay : 1 , () => { \n\t\t\t\tthis.printpng();\n\t\t\t\treturn false;\n\t\t\t  }, GLib.Priority.DEFAULT);\n  \t\t    return false;\n\t\t}\n\t\tthis.printpng();\t\t\n\t\treturn false;\n\t  }, GLib.Priority.DEFAULT);\n\n\n#endif    \n    \n}\n",
        "* pack" : "add",
        "xtype" : "WebView",

diff --git a/BrowserWindow.vala b/BrowserWindow.vala
index 05634b8..cddb205 100644 (file)
--- a/BrowserWindow.vala
+++ b/BrowserWindow.vala
@@ -132,16 +132,8 @@ public class BrowserWindow : Object
                                this.printit(); 
                          
                         });
-                        
             #endif
             }
-
-            //listeners
-            this.el.load_finished.connect( ( ) => {
-                        
-                   this.printit(); 
-             
-            });
         }
 
         // user defined functions