From 39dd4bdb759aa38547b7da4a95dae2540ce0aee9 Mon Sep 17 00:00:00 2001
From: Caleb Evans <calebevans.me@gmail.com>
Date: Thu, 19 Jul 2012 13:00:00 -0700
Subject: [PATCH] Added a supposed fix for working with patterns in IE9

---
 jcanvas.js     | 3 +++
 jcanvas.min.js | 6 +++---
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/jcanvas.js b/jcanvas.js
index a108172..fa888bf 100755
--- a/jcanvas.js
+++ b/jcanvas.js
@@ -978,6 +978,8 @@ $.fn.pattern = function(args) {
 				onload();
 			} else {
 				img.onload = onload;
+				// Image onload fix for IE9
+				img.src = img.src;
 			}
 			
 		}
@@ -1242,6 +1244,7 @@ $.fn.removeLayerGroup = function(name) {
 			// Remove layer if group name matches
 			if (layers[l].group === name) {
 				layers.splice(l, 1);
+				// Ensure no layers are skipped when one is removed
 				l -= 1;
 			}
 		}
diff --git a/jcanvas.min.js b/jcanvas.min.js
index 9c82dbc..9079a4a 100644
--- a/jcanvas.min.js
+++ b/jcanvas.min.js
@@ -24,11 +24,11 @@ e=s(this[k])){D(this[k],a,o);C(e,h);e.textBaseline=h.baseline;e.textAlign=h.alig
 f.sWidth===a&&f.width!==a&&(k.sWidth=f.sWidth=q.width),f.sHeight===a&&f.height!==a&&(k.sHeight=f.sHeight=q.height),f.sx===a&&(f.sx=f.cropFromCenter?q.width/2:0),f.sy===a&&(f.sy=f.cropFromCenter?q.height/2:0),f.cropFromCenter||(f.sx+=f.sWidth/2,f.sy+=f.sHeight/2),f.sx+f.sWidth/2>q.width&&(f.sx=q.width-f.sWidth/2),0>f.sx-f.sWidth/2&&(f.sx=f.sWidth/2),0>f.sy-f.sHeight/2&&(f.sy=f.sHeight/2),f.sy+f.sHeight/2>q.height&&(f.sy=q.height-f.sHeight/2),f.width!==a&&f.height===a)?k.height=f.height=f.width/y:f.width===
 a&&f.height!==a?k.width=f.width=f.height*y:f.width===a&&f.height===a&&(k.width=f.width=q.width,k.height=f.height=q.height));G(g,i,f,f.width,f.height);i.drawImage(q,f.sx-f.sWidth/2,f.sy-f.sHeight/2,f.sWidth,f.sHeight,f.x-f.width/2,f.y-f.height/2,f.width,f.height);f._event?(i.beginPath(),i.rect(f.x-f.width/2,f.y-f.height/2,f.width,f.height),i.restore(),F(b[g],i,k),i.closePath()):i.restore();f.load&&f.load.call(e,k)}}var b=this,i,l,g,f=u(new x,k),q,t,y;t=f.source.getContext;f.source.src||t?(q=f.source,
 f.width=q.width,f.height=q.height):f.source&&(q=new Q,q.src=f.source);for(l=0;l<b.length;l+=1)if(i=b[l],g=s(b[l]))D(b[l],k,r),C(g,f),q&&(q.complete||t?e(i,l,g)():(q.onload=e(i,l,g),q.src=q.src));return b};b.fn.pattern=function(b){function k(){g=h.createPattern(l,i.repeat);i.load&&i.load.call(e[0],g)}var e=this,h,i=u(new x,b),l,g;(h=s(e[0]))?"function"===typeof i.source?(l=O.createElement("canvas"),l.width=i.width,l.height=i.height,b=s(l),i.source.call(l,b),k()):(b=i.source.getContext,i.source.src||
-b?l=i.source:(l=new Q,l.src=i.source),l.complete||b?k():l.onload=k):g=a;return g};b.fn.gradient=function(b){var k,b=u(new x,b),e=[],h,i,l,g,f,q,t;if(k=s(this[0])){k=b.r1!==a||b.r2!==a?k.createRadialGradient(b.x1,b.y1,b.r1,b.x2,b.y2,b.r2):k.createLinearGradient(b.x1,b.y1,b.x2,b.y2);for(g=1;b["c"+g]!==w;g+=1)b["s"+g]!==w?e.push(b["s"+g]):e.push(a);h=e.length;e[0]===a&&(e[0]=0);e[h-1]===a&&(e[h-1]=1);for(g=0;g<h;g+=1){if(e[g]!==a){q=1;t=0;i=e[g];for(f=g+1;f<h;f+=1)if(e[f]!==a){l=e[f];break}else q+=1;
-i>l&&(e[f]=e[g])}else e[g]===a&&(t+=1,e[g]=i+t*((l-i)/q));k.addColorStop(e[g],b["c"+(g+1)])}}else k=a;return k};b.fn.setPixels=function k(b){var h,i,l,g=u(new x,b),f={},q,t,y,v;for(i=0;i<this.length;i+=1)if(h=this[i],l=s(h)){D(this[i],b,k);G(i,l,g,g.width,g.height);if(!g.x||!g.y||!g.width||!g.height)g.width=h.width,g.height=h.height,g.x=g.width/2,g.y=g.height/2;q=l.getImageData(g.x-g.width/2,g.y-g.height/2,g.width,g.height);t=q.data;v=t.length;f=[];if(g.each!==a)for(y=0;y<v;y+=4)f.r=t[y],f.g=t[y+
+b?l=i.source:(l=new Q,l.src=i.source),l.complete||b)?k():(l.onload=k,l.src=l.src):g=a;return g};b.fn.gradient=function(b){var k,b=u(new x,b),e=[],h,i,l,g,f,q,t;if(k=s(this[0])){k=b.r1!==a||b.r2!==a?k.createRadialGradient(b.x1,b.y1,b.r1,b.x2,b.y2,b.r2):k.createLinearGradient(b.x1,b.y1,b.x2,b.y2);for(g=1;b["c"+g]!==w;g+=1)b["s"+g]!==w?e.push(b["s"+g]):e.push(a);h=e.length;e[0]===a&&(e[0]=0);e[h-1]===a&&(e[h-1]=1);for(g=0;g<h;g+=1){if(e[g]!==a){q=1;t=0;i=e[g];for(f=g+1;f<h;f+=1)if(e[f]!==a){l=e[f];break}else q+=
+1;i>l&&(e[f]=e[g])}else e[g]===a&&(t+=1,e[g]=i+t*((l-i)/q));k.addColorStop(e[g],b["c"+(g+1)])}}else k=a;return k};b.fn.setPixels=function k(b){var h,i,l,g=u(new x,b),f={},q,t,y,v;for(i=0;i<this.length;i+=1)if(h=this[i],l=s(h)){D(this[i],b,k);G(i,l,g,g.width,g.height);if(!g.x||!g.y||!g.width||!g.height)g.width=h.width,g.height=h.height,g.x=g.width/2,g.y=g.height/2;q=l.getImageData(g.x-g.width/2,g.y-g.height/2,g.width,g.height);t=q.data;v=t.length;f=[];if(g.each!==a)for(y=0;y<v;y+=4)f.r=t[y],f.g=t[y+
 1],f.b=t[y+2],f.a=t[y+3],g.each.call(h,f),t[y]=f.r,t[y+1]=f.g,t[y+2]=f.b,t[y+3]=f.a;l.putImageData(q,g.x-g.width/2,g.y-g.height/2);l.restore()}return this};b.fn.getCanvasImage=function(b,e){var h=this[0];return h&&h.toDataURL?h.toDataURL("image/"+b,e):a};b.fn.getLayers=function(){var k=this[0],e;!k||!k.getContext?e=[]:(e=b.data(k,"jCanvas-layers"),e||(e=[],b.data(k,"jCanvas-layers",e)));return e};b.fn.getLayer=function(b){var e=this.getLayers(),a;if(!b||!b.layer){if("string"===typeof b)for(a=0;a<
 e.length;a+=1)if(e[a].name===b){b=a;break}b=e[b||0]}return b};b.fn.setLayer=function(a,e){var h,i,l;a||(e=a,a=0);for(h=0;h<this.length;h+=1){i=b(this[h]).getLayers();if("string"===typeof a)for(l=0;l<i.length;l+=1)i[l].name===a&&(a=l);u(i[a],e)}return this};b.fn.getLayerGroup=function(b){var a=this.getLayers(),h=[],i;for(i=0;i<a.length;i+=1)a[i].group===b&&h.push(a[i]);return h};b.fn.setLayerGroup=function(a,e){var h,i,l;for(h=0;h<this.length;h+=1){i=b(this[h]).getLayers();for(l=0;l<i.length;l+=1)i[l].group===
-a&&u(i[l],e)}return this};b.fn.removeLayerGroup=function(a){var e,h,i;for(e=0;e<this.length;e+=1){h=b(this[e]).getLayers();for(i=0;i<h.length;i+=1)h[i].group===a&&h.splice(i,1)}return this};b.fn.drawLayer=function(a){var e,h,i,l;for(e=0;e<this.length;e+=1)i=b(this[e]),h=s(this[e]),l=i.getLayer(a),V(i,h,l);return this};b.fn.drawLayers=function(a){var e,h,i,l,g,f;for(h=0;h<this.length;h+=1)if(e=b(this[h]),i=s(this[h])){i.clearRect(0,0,this[h].width,this[h].height);l=e.getLayers();for(f=0;f<l.length;f+=
+a&&u(i[l],e)}return this};b.fn.removeLayerGroup=function(a){var e,h,i;for(e=0;e<this.length;e+=1){h=b(this[e]).getLayers();for(i=0;i<h.length;i+=1)h[i].group===a&&(h.splice(i,1),i-=1)}return this};b.fn.drawLayer=function(a){var e,h,i,l;for(e=0;e<this.length;e+=1)i=b(this[e]),h=s(this[e]),l=i.getLayer(a),V(i,h,l);return this};b.fn.drawLayers=function(a){var e,h,i,l,g,f;for(h=0;h<this.length;h+=1)if(e=b(this[h]),i=s(this[h])){i.clearRect(0,0,this[h].width,this[h].height);l=e.getLayers();for(f=0;f<l.length;f+=
 1)g=l[f],a&&(g._fired=E),V(e,i,g)}return this};b.fn.addLayer=function(b){var a,h,b=b||{};for(a=0;a<this.length;a+=1)if(h=s(this[a]))b.layer=v,D(this[a],b);return this};b.fn.removeLayers=function(){var a,e;for(e=0;e<this.length;e+=1)a=b(this[e]).getLayers(),a.length=0;return this};b.fn.removeLayer=function(a){var e,h,i;for(e=0;e<this.length;e+=1){h=b(this[e]).getLayers();if("string"===typeof a)for(i=0;i<h.length;i+=1)if(h[i].name===a){a=i;break}h.splice(a,1)}return this};I=["width","height","opacity"];
 b.fn.animateLayer=function(){function k(b,a){return function(){W(a);b.drawLayers();g[4]&&g[4].call(b[0])}}function e(b,a){return function(e,f){W(a);b.drawLayers();g[5]&&g[5].call(b[0],e,f)}}var h,i,l,g=[].slice.call(arguments,0),f;"object"===typeof g[0]&&!g[0].layer&&g.unshift(0);"object"===typeof g[2]?(g.splice(2,0,g[2].duration||a),g.splice(3,0,g[3].easing||a),g.splice(4,0,g[4].complete||a),g.splice(5,0,g[5].step||a)):(g[2]===w?(g.splice(2,0,a),g.splice(3,0,a),g.splice(4,0,a)):"function"===typeof g[2]&&
 (g.splice(2,0,a),g.splice(3,0,a)),g[3]===w)?(g[3]=a,g.splice(4,0,a)):"function"===typeof g[3]&&g.splice(3,0,a);for(i=0;i<this.length;i+=1)if(h=b(this[i]),l=s(this[i]))if((l=h.getLayer(g[0]))&&l.method!==b.fn.draw)X(l),X(g[1]),f=Z(this[i]),f.x=[],f.y=[],b(l).animate(g[1],{duration:g[2],easing:b.easing[g[3]]?g[3]:a,complete:k(h,l),step:e(h,l)});return this};b.fn.delayLayer=function(a,e){var h,i,e=e||0;for(h=0;h<this.length;h+=1)i=b(this[h]).getLayer(a),b(i).delay(e);return this};b.fn.stopLayer=function(a,