Permalink
Browse files

todo update proxy

  • Loading branch information...
1 parent 3ad49ef commit 6ef6c79f24739bf3f2c8869e8cf4a4f21c97d461 @niklasvh committed Mar 1, 2012
Showing with 3 additions and 36 deletions.
  1. +2 −1 readme.md
  2. +1 −35 src/Preload.js
View
@@ -38,7 +38,8 @@ For more information and examples, please visit the <a href="http://html2canvas.
### Changelog ###
v0.33 -
-* Added support for CORS images and option to create canvas as tainted (<a href="#">niklasvh</a>)
+
+* Added support for CORS images and option to create canvas as tainted (<a href="https://github.com/niklasvh/html2canvas/commit/3ad49efa0032cde25c6ed32a39e35d1505d3b2ef">niklasvh</a>)
* Improved minification saved ~1K! (<a href="https://github.com/cobexer/html2canvas/commit/b82be022b2b9240bd503e078ac980bde2b953e43">cobexer</a>)
* Added integrated support for Flashcanvas (<a href="https://github.com/niklasvh/html2canvas/commit/e9257191519f67d74fd5e364d8dee3c0963ba5fc">niklasvh</a>)
* Fixed a variety of legacy IE bugs (<a href="https://github.com/niklasvh/html2canvas/commit/b65357c55d0701017bafcd357bc654b54d458f8f">niklasvh</a>)
View
@@ -66,6 +66,7 @@ html2canvas.Preload = function(element, opts){
}
}
+ // TODO modify proxy to serve images with CORS enabled, where available
function proxyGetImage(url, img, imageObj){
var callback_name,
scriptUrl = options.proxy,
@@ -110,41 +111,6 @@ html2canvas.Preload = function(element, opts){
imageObj.script = script;
window.document.body.appendChild(script);
- /*
-
- // enable xhr2 requests where available (no need for base64 / json)
-
- $.ajax({
- data:{
- xhr2:false,
- url:url
- },
- url: options.proxy,
- dataType: "jsonp",
- success: function(a){
-
- if (a.substring(0,6) === "error:"){
- images.splice(getIndex(images, url), 2);
- start();
- }else{
- img.onload = function(){
- imagesLoaded+=1;
- start();
-
- };
- img.src = a;
- }
-
-
- },
- error: function(){
- images.splice(getIndex(images, url), 2);
- start();
- }
-
-
- });
- */
}
function getImages (el) {

0 comments on commit 6ef6c79

Please sign in to comment.