diff --git a/.gitignore b/.gitignore index 842e2cf..30e1e90 100644 --- a/.gitignore +++ b/.gitignore @@ -11,5 +11,6 @@ image.jpg /.settings/ node_modules/ .envrc +server.js tests/selenium.js *.sublime-workspace diff --git a/Makefile b/Makefile deleted file mode 100644 index e4b4c32..0000000 --- a/Makefile +++ /dev/null @@ -1,7 +0,0 @@ -build: - ant - -install: - brew install https://raw.github.com/Homebrew/homebrew-dupes/master/ant.rb - -.PHONY: install build \ No newline at end of file diff --git a/html2canvas.sublime-project b/html2canvas.sublime-project deleted file mode 100644 index c7fb30c..0000000 --- a/html2canvas.sublime-project +++ /dev/null @@ -1,57 +0,0 @@ -{ - "folders": - [ - { - "path": ".", - "folder_exclude_patterns": [".svn", ".git", ".hg", "CVS", "node_modules"], - "file_exclude_patterns": ["*.sublime-workspace"] - } - ], - "settings": - { - // The number of spaces a tab is considered equal to - "tab_size": 4, - - // Set to true to insert spaces when tab is pressed - "translate_tabs_to_spaces": true, - - // If translate_tabs_to_spaces is true, use_tab_stops will make tab and - // backspace insert/delete up to the next tabstop - "use_tab_stops": false, - - // Set to false to disable detection of tabs vs. spaces on load - "detect_indentation": false, - - // Set to true to removing trailing white space on save - "trim_trailing_white_space_on_save": true, - - // Set to true to ensure the last line of the file ends in a newline - // character when saving - "ensure_newline_at_eof_on_save": false, - - // Linting - "jshint_options": { - "eqeqeq": false, - - "laxbreak": true, - "undef": true, - "newcap": true, - "noarg": true, - "strict": false, - "trailing": true, - "onecase": true, - - "boss": true, - "eqnull": true, - - "onevar": false, - - "evil": true, - "regexdash": true, - "browser": true, - "wsh": true, - "trailing": true, - "sub": true - } - } -} diff --git a/src/LICENSE b/src/LICENSE deleted file mode 100644 index 458faef..0000000 --- a/src/LICENSE +++ /dev/null @@ -1,7 +0,0 @@ -/** - @license html2canvas @VERSION@ - Copyright (c) 2011 Niklas von Hertzen. All rights reserved. - http://www.twitter.com/niklasvh - - Released under MIT License - */ \ No newline at end of file diff --git a/src/Parse.js b/src/Parse.js index e78e29c..f346183 100644 --- a/src/Parse.js +++ b/src/Parse.js @@ -1,15 +1,3 @@ -/* - html2canvas @VERSION@ - Copyright (c) 2011 Niklas von Hertzen. All rights reserved. - http://www.twitter.com/niklasvh - - Released under MIT License - */ - -/* - * New function for traversing elements - */ - _html2canvas.Parse = function ( images, options ) { window.scroll(0,0); @@ -111,17 +99,6 @@ _html2canvas.Parse = function ( images, options ) { } - /* - var rootStack = new this.storageContext($(document).width(),$(document).height()); - rootStack.opacity = this.getCSS(this.element,"opacity"); - var stack = this.newElement(this.element,rootStack); - - - this.parseElement(this.element,stack); - */ - - - var getCSS = _html2canvas.Util.getCSS; function getCSSInt(element, attribute) { @@ -350,12 +327,12 @@ _html2canvas.Parse = function ( images, options ) { if (range.getBoundingClientRect()) { bounds = range.getBoundingClientRect(); - }else{ + } else { bounds = {}; } } - }else{ + } else { // it isn't supported, so let's wrap it inside an element instead and get the bounds there // IE 9 bug diff --git a/src/renderers/Canvas.js b/src/renderers/Canvas.js index 30cfe23..c123886 100644 --- a/src/renderers/Canvas.js +++ b/src/renderers/Canvas.js @@ -157,7 +157,7 @@ _html2canvas.Renderer.Canvas = function( options ) { } } else if (renderItem.name === "drawImage") { - if (renderItem['arguments'][8] > 0 && renderItem['arguments'][7]){ + if (renderItem['arguments'][8] > 0 && renderItem['arguments'][7] > 0) { if ( hasCTX && options.taintTest ) { if ( safeImages.indexOf( renderItem['arguments'][ 0 ].src ) === -1 ) { testctx.drawImage( renderItem['arguments'][ 0 ], 0, 0 ); diff --git a/version.txt b/version.txt deleted file mode 100644 index fb6beee..0000000 --- a/version.txt +++ /dev/null @@ -1 +0,0 @@ -v0.34 \ No newline at end of file