Skip to content

Commit b47347d

Browse files
cobexercobexer
committed
fixed a few undefined references, fixed missing files in a few places
1 parent 6cf3d36 commit b47347d

6 files changed

Lines changed: 14 additions & 11 deletions

File tree

‎build.xml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -75,6 +75,7 @@
7575
<file name="Queue.js"/>
7676
<file name="Renderer.js"/>
7777
<file name="Util.js"/>
78+
<file name="renderers/Canvas.js"/>
7879
</sources>
7980
</jscomp>
8081
<delete file="${build.dir}/${JS_NAME_MIN}.tmp"></delete>

‎src/Preload.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -168,7 +168,7 @@ _html2canvas.Preload = function( options ) {
168168
/*
169169
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"){
170170
// TODO add multi image background support
171-
src = html2canvas.Util.backgroundImage(background_image.split(",")[0]);
171+
src = _html2canvas.Util.backgroundImage(background_image.split(",")[0]);
172172
methods.loadImage(src); */
173173
}
174174
}

‎src/Util.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ html2canvas = function( elements, opts ) {
4040

4141
options = _html2canvas.Util.Extend(opts, options);
4242

43-
options.renderer = options.renderer || html2canvas.Renderer.Canvas( options );
43+
options.renderer = options.renderer || _html2canvas.Renderer.Canvas( options );
4444

4545
_html2canvas.logging = options.logging;
4646
options.complete = function( images ) {
@@ -89,4 +89,4 @@ html2canvas = function( elements, opts ) {
8989
html2canvas.log = h2clog; // for renderers
9090
html2canvas.Renderer = {
9191
Canvas: undefined // We are assuming this will be used
92-
};
92+
};

‎src/plugins/bookmarklet.js‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,8 @@
1313
'src/Preload',
1414
'src/Queue',
1515
'src/Renderer',
16+
'src/Util',
17+
'src/renderers/Canvas',
1618
'src/plugins/jquery.plugin.html2canvas'
1719
],
1820
relFiles = [

‎src/renderers/Canvas.js‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
*/
88

99

10-
html2canvas.Renderer.Canvas = function( options ) {
10+
_html2canvas.Renderer.Canvas = function( options ) {
1111

1212
options = options || {};
1313

@@ -21,11 +21,11 @@ html2canvas.Renderer.Canvas = function( options ) {
2121

2222

2323
if (canvas.getContext){
24-
html2canvas.log("html2canvas: Renderer: using canvas renderer");
24+
h2clog("html2canvas: Renderer: using canvas renderer");
2525
canvasReadyToDraw = true;
2626
} else if ( options.flashcanvas !== undefined ){
2727
usingFlashcanvas = true;
28-
html2canvas.log("html2canvas: Renderer: canvas not available, using flashcanvas");
28+
h2clog("html2canvas: Renderer: canvas not available, using flashcanvas");
2929
var script = doc.createElement("script");
3030
script.src = options.flashcanvas;
3131

@@ -52,7 +52,7 @@ html2canvas.Renderer.Canvas = function( options ) {
5252
window.setTimeout( intervalFunc, 250 );
5353

5454
} else {
55-
html2canvas.log("html2canvas: Renderer: Can't track when flashcanvas is loaded");
55+
h2clog("html2canvas: Renderer: Can't track when flashcanvas is loaded");
5656
}
5757

5858
} else {
@@ -62,7 +62,7 @@ html2canvas.Renderer.Canvas = function( options ) {
6262
})(script, function(){
6363

6464
if (typeof window.FlashCanvas !== "undefined") {
65-
html2canvas.log("html2canvas: Renderer: Flashcanvas initialized");
65+
h2clog("html2canvas: Renderer: Flashcanvas initialized");
6666
window.FlashCanvas.initElement( canvas );
6767

6868
canvasReadyToDraw = true;
@@ -226,4 +226,4 @@ html2canvas.Renderer.Canvas = function( options ) {
226226

227227
return methods;
228228

229-
};
229+
};

‎src/renderers/SVG.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99

1010
// WARNING THIS file is outdated, and hasn't been tested in quite a while
1111

12-
html2canvas.Renderer.SVG = function( options ) {
12+
_html2canvas.Renderer.SVG = function( options ) {
1313

1414
options = options || {};
1515

@@ -203,4 +203,4 @@ html2canvas.Renderer.SVG = function( options ) {
203203
return methods;
204204

205205

206-
};
206+
};

0 commit comments

Comments
 (0)