Skip to content

Commit

Permalink
todo update proxy
Browse files Browse the repository at this point in the history
  • Loading branch information
niklasvh committed Mar 1, 2012
1 parent 3ad49ef commit 6ef6c79
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 36 deletions.
3 changes: 2 additions & 1 deletion readme.md
Original file line number Diff line number Diff line change
Expand Up @@ -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>)
Expand Down
36 changes: 1 addition & 35 deletions src/Preload.js
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down Expand Up @@ -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) {
Expand Down

0 comments on commit 6ef6c79

Please sign in to comment.