Commit Graph

265 Commits

Author SHA1 Message Date
Obexer Christoph
50f5f53e2b cleanup jquery.plugin.html2canvas.js; correctly pass the logging option 2011-12-21 22:59:44 +01:00
Obexer Christoph
2fdab0d753 disable logging by default 2011-12-17 20:05:20 +01:00
Obexer Christoph
0d8937435d fix crash if an img tag has no src, fix undefined variables 2011-12-17 19:50:27 +01:00
Niklas von Hertzen
433d7ce81c Merge pull request #40 from cobexer/unify-tests
Unify tests: moved common code into tests/test.js; run tests from source instead from built version
2011-12-11 12:47:41 -08:00
Obexer Christoph
4dba62e2fd convert all tests to use tests/test.js
all tests now run from the source files directly instead of the built
verion in build/.
2011-12-11 18:12:20 +01:00
Obexer Christoph
2e494bde23 moved common code into tests/test.js 2011-12-11 18:06:57 +01:00
Niklas von Hertzen
753ab77ef6 Merge pull request #37 from gatapia/patch-2
Fix for gradient parsing (when step positions are specified)
2011-12-07 06:13:35 -08:00
Niklas von Hertzen
0d24b9a734 Merge pull request #38 from gatapia/patch-3
Fix demo screenshots.html with head element contains attributes
2011-12-07 06:12:56 -08:00
Guido Tapia
98c2bd638e Update screenshots.html 2011-12-07 10:48:06 +11:00
Guido Tapia
0d370d09fb This fixes an exception when trying to parse gradient like: 'rgb(254, 254, 254) 0%, rgb(236, 236, 236) 100%'
Note: This does not parse the % which would be good to delineate steps correctly, just a fix for an Exception.
2011-12-07 09:53:40 +11:00
Niklas von Hertzen
88174fe136 IE fix 2011-11-27 04:33:41 +02:00
Niklas von Hertzen
1c6469d29b IE origin fix 2011-11-26 21:29:46 +02:00
Niklas von Hertzen
ab5055ffad Added canvas image test 2011-11-26 20:38:55 +02:00
Niklas von Hertzen
501f559783 Merge pull request #31 from cobexer/add-render-canvas-support
add support to render a canvas element to the screenshot
2011-11-26 10:18:37 -08:00
Niklas von Hertzen
f75456cc88 Merge pull request #33 from cobexer/fix-jpeg-export
clear canvas before rendering to allow jpeg export
2011-11-26 10:17:35 -08:00
Niklas von Hertzen
961f6caf21 Merge pull request #34 from cobexer/rewrite-image-handling
rewrote image handling from using an array to an object
2011-11-26 10:15:40 -08:00
Niklas von Hertzen
097a4e58d7 Merge pull request #35 from cobexer/small-fixes
Small fixes
2011-11-26 10:14:00 -08:00
Obexer Christoph
73763c8114 rewrote image handling from using an array to an object
The image loading done in Preload.js used an array to store
image src and image object as 2 consecutive entries in that
array. Using the src as an index in a hash allows direct
instead of a linear search and also allows to store more data.

 * improved cleanup of images loaded with the proxy

 * this also adds a timeout for the image loading phase, after that
   running image requests are aborted and the rendering is started
2011-11-26 18:09:25 +01:00
Obexer Christoph
1f7314747e instead of scrolling the view on every Bounds() call, do it only once 2011-11-26 18:06:56 +01:00
Obexer Christoph
4f49bd6e9b accessing nodeType may throw an exception 2011-11-26 18:06:56 +01:00
Obexer Christoph
217a75c0f6 fix permission denied access on inner iFrame (crossDomain) 2011-11-26 18:06:55 +01:00
Obexer Christoph
62fa6038e7 fix script error in html2canvas.Util.getCSS 2011-11-26 18:06:55 +01:00
Obexer Christoph
66d328d1e3 make sure the image used for the detection of the underline is positioned correctly 2011-11-26 18:06:55 +01:00
Obexer Christoph
2ec7fda1f1 replaced external image http://html2canvas.hertzen.com/images/8.jpg with data URI 2011-11-26 18:06:55 +01:00
Obexer Christoph
044b612d6e clear canvas before rendering to allow jpeg export
* normally when exporting jpeg any pixel that was transparent
   becomes black, make them white
 * check for window.console.log before use (avoid crash)
 * html2canvas.Parse: fix missing call to html2canvas.Util.Extend for the
   given options
2011-11-26 17:38:57 +01:00
Obexer Christoph
4aba46e247 fix origin check in IE 2011-11-26 17:38:11 +01:00
Obexer Christoph
91ac445fdf add support to render a canvas element to the screenshot 2011-11-26 17:34:19 +01:00
Niklas von Hertzen
2a3d6a0a35 Merge pull request #30 from cobexer/build-improvements
Build improvements
2011-11-16 01:10:07 -08:00
Obexer Christoph
03495f851d drop obsolete files from the build folder 2011-11-16 00:36:44 +01:00
Obexer Christoph
16c74d1f8c Improve build system: read version from version.txt, fix build without compiler
* read the version from version.txt
 * set default target to build
 * added dependencies to all targets
 * allow the build to run without a local copy of the closure compiler
 * updated license header with @VERSION@ which will be replaced during the build
 * added the license header to all files (that one will be stripped out by the closure compiler)
2011-11-16 00:36:06 +01:00
Niklas von Hertzen
74c7373362 Merge pull request #29 from gatapia/patch-1
It is possible for image tags not to have a 'src' (or background-image) ...
2011-11-15 04:12:37 -08:00
Guido Tapia
7ee7d7fa67 It is possible for image tags not to have a 'src' (or background-image) attribute specified. This case currently crashes html2canvas. I know its an edge case but it bit me. I set the image src programatically much later (element is actually not visible at the time I call html2canvas). 2011-11-15 16:07:05 +11:00
Niklas von Hertzen
962d5b8e8d Merge pull request #25 from kilokeith/width_fix
Fixed a width/height issue that caused smaller elements to render full bo
2011-10-15 02:14:20 -07:00
Keith Hoffmann
2ca4b88702 Fixed a width/height issue that caused smaller elements to render full body width. 2011-10-14 00:47:17 -05:00
Niklas von Hertzen
ff635115dc Enabled list-style-type's for position inside 2011-09-13 17:25:51 +03:00
Niklas von Hertzen
a75f41c076 Merge remote branch 'upstream/master' 2011-09-13 17:09:42 +03:00
Niklas von Hertzen
6dfb5299c9 Added list support 2011-09-13 17:09:33 +03:00
Niklas von Hertzen
a89b83cb11 Merge pull request #17 from cthackers/master
webkit-gradient fix
2011-09-13 02:04:35 -07:00
The Brain
52150b09cd Fixed webkit-gradient regular expr 2011-09-13 09:59:12 +03:00
The Brain
61f71c1839 sync 2011-09-13 09:49:09 +03:00
Niklas von Hertzen
6fe3218b50 Added some support for CSS gradients (by cthackers) 2011-09-12 23:50:43 +03:00
Niklas von Hertzen
f0112ff3ab merged from dev 2011-09-12 21:39:28 +03:00
Niklas von Hertzen
27ee971bba merged from dev 2011-09-12 21:35:37 +03:00
The Brain
5ba5ef571c Added support for background linear gradients on mozilla and webkit 2011-09-12 13:44:39 +03:00
The Brain
180cd38265 Fixed regular expression for chrome 2011-09-12 11:22:17 +03:00
The Brain
958cfdf4eb Added support for base64 encoded images as sources 2011-09-12 11:02:15 +03:00
Niklas von Hertzen
07c0c13cc1 Merge pull request #11 from oleksiy-nesterov/master
Base 64
2011-09-05 09:41:43 -07:00
Oleksiy Nesterov
7145d9303d Edited src/Images.js via GitHub 2011-08-23 05:53:07 +03:00
Niklas von Hertzen
1c44b94817 Added support for some list-style-type's with list-style-position: inside 2011-08-11 22:43:42 +03:00
Niklas von Hertzen
6fe937eb66 fixed IE 9 text issues 2011-08-11 16:19:42 +03:00