mirror/html2canvas
1
0
Fork 0
mirror of https://github.com/niklasvh/html2canvas.git synced 2023-08-10 21:13:10 +03:00
Code Issues Projects Releases Wiki Activity

Merge pull request #78 from cobexer/fix-undefined-refs-and-bookmarklet

Browse Source 
fixed a few undefined references, fixed missing files in a few places
This commit is contained in:
Niklas von Hertzen 2012-03-14 03:37:05 -07:00
commit d7f4509253
6 changed files with 14 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
build.xml
View File

@ -75,6 +75,7 @@
<file name="Queue.js"/> <file name="Queue.js"/>
<file name="Renderer.js"/> <file name="Renderer.js"/>
<file name="Util.js"/> <file name="Util.js"/>
<file name="renderers/Canvas.js"/>
</sources> </sources>
</jscomp> </jscomp>
<delete file="${build.dir}/${JS_NAME_MIN}.tmp"></delete> <delete file="${build.dir}/${JS_NAME_MIN}.tmp"></delete>

2
src/Preload.js
View File

@ -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"){ 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 // 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); */ methods.loadImage(src); */
} }
} }

4
src/Util.js
View File

@ -40,7 +40,7 @@ html2canvas = function( elements, opts ) {
options = _html2canvas.Util.Extend(opts, options); 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; _html2canvas.logging = options.logging;
options.complete = function( images ) { options.complete = function( images ) {
@ -89,4 +89,4 @@ html2canvas = function( elements, opts ) {
html2canvas.log = h2clog; // for renderers html2canvas.log = h2clog; // for renderers
html2canvas.Renderer = { html2canvas.Renderer = {
Canvas: undefined // We are assuming this will be used Canvas: undefined // We are assuming this will be used
}; };

2
src/plugins/bookmarklet.js
View File

@ -13,6 +13,8 @@
'src/Preload', 'src/Preload',
'src/Queue', 'src/Queue',
'src/Renderer', 'src/Renderer',
'src/Util',
'src/renderers/Canvas',
'src/plugins/jquery.plugin.html2canvas' 'src/plugins/jquery.plugin.html2canvas'
], ],
relFiles = [ relFiles = [

12
src/renderers/Canvas.js
View File

@ -7,7 +7,7 @@
*/ */
html2canvas.Renderer.Canvas = function( options ) { _html2canvas.Renderer.Canvas = function( options ) {
options = options || {}; options = options || {};
@ -21,11 +21,11 @@ html2canvas.Renderer.Canvas = function( options ) {
if (canvas.getContext){ if (canvas.getContext){
html2canvas.log("html2canvas: Renderer: using canvas renderer"); h2clog("html2canvas: Renderer: using canvas renderer");
canvasReadyToDraw = true; canvasReadyToDraw = true;
} else if ( options.flashcanvas !== undefined ){ } else if ( options.flashcanvas !== undefined ){
usingFlashcanvas = true; usingFlashcanvas = true;
html2canvas.log("html2canvas: Renderer: canvas not available, using flashcanvas"); h2clog("html2canvas: Renderer: canvas not available, using flashcanvas");
var script = doc.createElement("script"); var script = doc.createElement("script");
script.src = options.flashcanvas; script.src = options.flashcanvas;
@ -52,7 +52,7 @@ html2canvas.Renderer.Canvas = function( options ) {
window.setTimeout( intervalFunc, 250 ); window.setTimeout( intervalFunc, 250 );
} else { } else {
html2canvas.log("html2canvas: Renderer: Can't track when flashcanvas is loaded"); h2clog("html2canvas: Renderer: Can't track when flashcanvas is loaded");
} }
} else { } else {
@ -62,7 +62,7 @@ html2canvas.Renderer.Canvas = function( options ) {
})(script, function(){ })(script, function(){
if (typeof window.FlashCanvas !== "undefined") { if (typeof window.FlashCanvas !== "undefined") {
html2canvas.log("html2canvas: Renderer: Flashcanvas initialized"); h2clog("html2canvas: Renderer: Flashcanvas initialized");
window.FlashCanvas.initElement( canvas ); window.FlashCanvas.initElement( canvas );
canvasReadyToDraw = true; canvasReadyToDraw = true;
@ -226,4 +226,4 @@ html2canvas.Renderer.Canvas = function( options ) {
return methods; return methods;
}; };

4
src/renderers/SVG.js
View File

@ -9,7 +9,7 @@
// WARNING THIS file is outdated, and hasn't been tested in quite a while // 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 || {}; options = options || {};
@ -203,4 +203,4 @@ html2canvas.Renderer.SVG = function( options ) {
return methods; return methods;
}; };