Merge pull request niklasvh#78 from cobexer/fix-undefined-refs-and-bo…

…okmarklet fixed a few undefined references, fixed missing files in a few places
phpkunst · Mar 14, 2012 · d7f4509 · d7f4509
2 parents 6cf3d36 + b47347d
commit d7f4509
Show file tree

Hide file tree

Showing 6 changed files with 14 additions and 11 deletions.
diff --git a/build.xml b/build.xml
@@ -75,6 +75,7 @@
                 <file name="Queue.js"/>
                 <file name="Renderer.js"/>
                 <file name="Util.js"/>
+                <file name="renderers/Canvas.js"/>
             </sources>
         </jscomp>
         <delete file="${build.dir}/${JS_NAME_MIN}.tmp"></delete>

diff --git a/src/Preload.js b/src/Preload.js
@@ -168,7 +168,7 @@ _html2canvas.Preload = function( options ) {
             /*
             if (background_image && background_image !== "1" && background_image !== "none" && background_image.substring(0,7) !== "-webkit" && background_image.substring(0,3)!== "-o-" && background_image.substring(0,4) !== "-moz"){
                 // TODO add multi image background support
-                src = html2canvas.Util.backgroundImage(background_image.split(",")[0]);
+                src = _html2canvas.Util.backgroundImage(background_image.split(",")[0]);
                 methods.loadImage(src);            */
             }
         }

diff --git a/src/Util.js b/src/Util.js
@@ -40,7 +40,7 @@ html2canvas = function( elements, opts ) {
 
     options = _html2canvas.Util.Extend(opts, options);
 
-    options.renderer = options.renderer || html2canvas.Renderer.Canvas( options );
+    options.renderer = options.renderer || _html2canvas.Renderer.Canvas( options );
 
     _html2canvas.logging = options.logging;
     options.complete = function( images ) {
@@ -89,4 +89,4 @@ html2canvas = function( elements, opts ) {
 html2canvas.log = h2clog; // for renderers
 html2canvas.Renderer = {
     Canvas: undefined // We are assuming this will be used
-};
+};
diff --git a/src/plugins/bookmarklet.js b/src/plugins/bookmarklet.js
@@ -13,6 +13,8 @@
         'src/Preload',
         'src/Queue',
         'src/Renderer',
+        'src/Util',
+        'src/renderers/Canvas',
         'src/plugins/jquery.plugin.html2canvas'
     ],
     relFiles = [

diff --git a/src/renderers/Canvas.js b/src/renderers/Canvas.js
@@ -7,7 +7,7 @@
 */
 
 
-html2canvas.Renderer.Canvas = function( options ) {
+_html2canvas.Renderer.Canvas = function( options ) {
 
     options = options || {};
 
@@ -21,11 +21,11 @@ html2canvas.Renderer.Canvas = function( options ) {
 
 
     if (canvas.getContext){
-        html2canvas.log("html2canvas: Renderer: using canvas renderer");
+        h2clog("html2canvas: Renderer: using canvas renderer");
         canvasReadyToDraw = true;
     } else if ( options.flashcanvas !== undefined ){
         usingFlashcanvas = true;
-        html2canvas.log("html2canvas: Renderer: canvas not available, using flashcanvas");
+        h2clog("html2canvas: Renderer: canvas not available, using flashcanvas");
         var script = doc.createElement("script");
         script.src = options.flashcanvas;
 
@@ -52,7 +52,7 @@ html2canvas.Renderer.Canvas = function( options ) {
                     window.setTimeout( intervalFunc, 250 );
 
                 } else {
-                    html2canvas.log("html2canvas: Renderer: Can't track when flashcanvas is loaded");
+                    h2clog("html2canvas: Renderer: Can't track when flashcanvas is loaded");
                 }
 
             } else {
@@ -62,7 +62,7 @@ html2canvas.Renderer.Canvas = function( options ) {
         })(script, function(){
 
             if (typeof window.FlashCanvas !== "undefined") {
-                html2canvas.log("html2canvas: Renderer: Flashcanvas initialized");
+                h2clog("html2canvas: Renderer: Flashcanvas initialized");
                 window.FlashCanvas.initElement( canvas );
 
                 canvasReadyToDraw = true;
@@ -226,4 +226,4 @@ html2canvas.Renderer.Canvas = function( options ) {
 
     return methods;
 
-};
+};
diff --git a/src/renderers/SVG.js b/src/renderers/SVG.js
@@ -9,7 +9,7 @@
 
 // WARNING THIS file is outdated, and hasn't been tested in quite a while
 
-html2canvas.Renderer.SVG = function( options ) {
+_html2canvas.Renderer.SVG = function( options ) {
 
     options = options || {};
 
@@ -203,4 +203,4 @@ html2canvas.Renderer.SVG = function( options ) {
     return methods;
 
 
-};
+};