From 1d6acca8f3a56da0241c4687f2302e49ac6fcb0a Mon Sep 17 00:00:00 2001
From: Jason Follas <jfollas@gmail.com>
Date: Thu, 9 Aug 2012 22:39:34 -0400
Subject: [PATCH] Fixed flaw in Stage.toDataURL where JPEG layers were hiding
 lower layers due to the use of black instead of transparent.

---
 src/Stage.js          |  2 +-
 tests/js/unitTests.js | 33 ++++++++++++++++++++++++++++++++-
 2 files changed, 33 insertions(+), 2 deletions(-)

diff --git a/src/Stage.js b/src/Stage.js
index 2f24d9b1..24edc50a 100644
--- a/src/Stage.js
+++ b/src/Stage.js
@@ -303,7 +303,7 @@ Kinetic.Stage = Kinetic.Container.extend({
 
         function drawLayer(n) {
             var layer = layers[n];
-            var layerUrl = layer.getCanvas().toDataURL(mimeType, quality);
+            var layerUrl = layer.getCanvas().toDataURL();
             var imageObj = new Image();
             imageObj.onload = function() {
                 context.drawImage(imageObj, 0, 0);
diff --git a/tests/js/unitTests.js b/tests/js/unitTests.js
index de95233d..09123513 100644
--- a/tests/js/unitTests.js
+++ b/tests/js/unitTests.js
@@ -5524,5 +5524,36 @@ Test.prototype.tests = {
         });
         layer.add(borneo);
         stage.add(layer);
-    }
+    },
+	'JPEG toDataURL() Not Hiding Lower Layers with Black': function(containerId) {
+           var stage = new Kinetic.Stage({
+                container: containerId,
+                width: 578,
+                height: 200
+           });
+		   
+		   var layer1 = new Kinetic.Layer();
+		   var layer2 = new Kinetic.Layer();
+		   
+		   layer1.add(new Kinetic.Rect({x:10, y:10, width: 25, height: 15, fill: 'red'}));
+		   layer2.add(new Kinetic.Rect({x:50, y:50, width: 15, height: 25, fill: 'green'}));
+		   
+		   stage.add(layer1);
+		   stage.add(layer2);
+		   
+		   stage.toDataURL({
+				height: 100, 
+				width: 100, 
+				mimeType: 'image/jpeg', 
+				quality: 0.8, 
+				callback: function(url) {
+					var imageObj = new Image();
+					imageObj.onload = function() {
+						layer2.add(new Kinetic.Image({x: 200, y: 10, image: imageObj}));
+						layer2.draw();
+					};
+					imageObj.src = url;
+				}
+		   })
+	}
 };