Merge branch 'release/1.0.11'

Conflicts: package/raphael-fusioncharts.js package/raphael-min.js package/raphael.js
fusioncharts · Mar 20, 2014 · c13b7e7 · c13b7e7
2 parents 2281c3a + 0b75469
commit c13b7e7
Show file tree

Hide file tree

Showing 4 changed files with 70 additions and 66 deletions.
diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
     "name": "redraphael",
     "filename": "raphael",
-    "version": "1.0.10",
+    "version": "1.0.11",
     "rversion": "2.1.0",
     "description": "RedRaphael",
     "main": "index.js",

diff --git a/package/raphael-fusioncharts.js b/package/raphael-fusioncharts.js
@@ -16,7 +16,7 @@ window.FusionCharts && window.FusionCharts.register('module', ['private', 'vendo
 
 
 /**!
- * RedRaphael 1.0.9 - JavaScript Vector Library
+ * RedRaphael 1.0.11 - JavaScript Vector Library
  * Copyright (c) 2012-2013 FusionCharts Technologies <http://www.fusioncharts.com>
  *
  * Raphael 2.1.0
@@ -8419,7 +8419,7 @@ window.FusionCharts && window.FusionCharts.register('module', ['private', 'vendo
         if (fillpos || _.fillsize) {
             var fill = o.getElementsByTagName(fillString);
             fill = fill && fill[0];
-            fill.parentNode && fill.parentNode.removeChild(fill);
+            o.removeChild(fill);
             if (fillpos) {
                 c = compensation(deg, m.x(fillpos[0], fillpos[1]), m.y(fillpos[0], fillpos[1]));
                 fill.position = c.dx * y + S + c.dy * y;
@@ -8619,7 +8619,7 @@ window.FusionCharts && window.FusionCharts.register('module', ['private', 'vendo
             if (fill.on && params.fill) {
                 var isURL = Str(params.fill).match(R._ISURL);
                 if (isURL) {
-                    fill.parentNode && fill.parentNode.removeChild(fill);
+                    fill.parentNode == node && node.removeChild(fill);
                     fill.rotate = true;
                     fill.src = isURL[1];
                     fill.type = "tile";
@@ -8804,7 +8804,7 @@ window.FusionCharts && window.FusionCharts.register('module', ['private', 'vendo
         }
         o = o.shape || o.node;
         if (dots.length) {
-            fill.parentNode && fill.parentNode.removeChild(fill);
+            fill.parentNode == o && o.removeChild(fill);
             fill.on = true;
             fill.method = "none";
             fill.color = dots[0].color;
@@ -8841,10 +8841,10 @@ window.FusionCharts && window.FusionCharts.register('module', ['private', 'vendo
     Element = function(node, vml, group) {
         var o = this,
             parent = group || vml,
-			skew;
+            skew;
 
-		parent.canvas && parent.canvas.appendChild(node);
-		skew = createNode("skew");
+        parent.canvas && parent.canvas.appendChild(node);
+        skew = createNode("skew");
         skew.on = true;
         node.appendChild(skew);
         o.skew = skew;
@@ -9037,9 +9037,6 @@ window.FusionCharts && window.FusionCharts.register('module', ['private', 'vendo
         paper.__set__ && paper.__set__.exclude(o);
         eve.unbind("raphael.*.*." + o.id);
 
-        shape && shape.parentNode.removeChild(shape);
-        node.parentNode && node.parentNode.removeChild(node);
-
         while (i = o.followers.pop()) {
             i.el.remove();
         }
@@ -9053,6 +9050,11 @@ window.FusionCharts && window.FusionCharts.register('module', ['private', 'vendo
             }
         }
 
+        shape && shape.parentNode.removeChild(shape);
+        node.clipRect && o.node.clipRect.parentNode.removeChild(node.clipRect);
+        node.clipRect = null;
+        node.parentNode && node.parentNode.removeChild(node);
+
         o.removeData();
         delete paper._elementsById[o.id];
         R._tear(o, o.parent);
@@ -9253,12 +9255,12 @@ window.FusionCharts && window.FusionCharts.register('module', ['private', 'vendo
         el.coordsize = zoom + S + zoom;
         el.coordorigin = vml.coordorigin;
 
-		var p = new Element(el, vml, group);
+        var p = new Element(el, vml, group);
         p.type = attrs.type || "path";
-		p.path = [];
+        p.path = [];
         p.Path = E;
 
-		attrs.type && (delete attrs.type);
+        attrs.type && (delete attrs.type);
         setFillAndStroke(p, attrs);
 
         return p;
@@ -9267,24 +9269,24 @@ window.FusionCharts && window.FusionCharts.register('module', ['private', 'vendo
     R._engine.rect = function(vml, attrs, group) {
         var path = R._rectPath(attrs.x, attrs.y, attrs.w, attrs.h, attrs.r);
 
-		attrs.path = path;
-		attrs.type = "rect";
+        attrs.path = path;
+        attrs.type = "rect";
 
-		var res = vml.path(attrs, group),
+        var res = vml.path(attrs, group),
         a = res.attrs;
         res.X = a.x;
         res.Y = a.y;
         res.W = a.width;
         res.H = a.height;
         a.path = path;
 
-		return res;
+        return res;
     };
     R._engine.ellipse = function(vml, attrs, group) {
-		attrs.type = "ellipse";
+        attrs.type = "ellipse";
 
-		var res = vml.path(attrs, group),
-			a = res.attrs;
+        var res = vml.path(attrs, group),
+            a = res.attrs;
         res.X = a.x - a.rx;
         res.Y = a.y - a.ry;
         res.W = a.rx * 2;
@@ -9296,7 +9298,7 @@ window.FusionCharts && window.FusionCharts.register('module', ['private', 'vendo
         attrs.type = "circle";
 
         var res = vml.path(attrs, group),
-			a = res.attrs;
+            a = res.attrs;
 
         res.X = a.x - a.r;
         res.Y = a.y - a.r;
@@ -9306,21 +9308,21 @@ window.FusionCharts && window.FusionCharts.register('module', ['private', 'vendo
     R._engine.image = function(vml, attrs, group) {
         var path = R._rectPath(attrs.x, attrs.y, attrs.w, attrs.h);
 
-		attrs.path = path;
-		attrs.type = "image";
-		attrs.stroke = "none";
+        attrs.path = path;
+        attrs.type = "image";
+        attrs.stroke = "none";
         var res = vml.path(attrs, group),
-			a = res.attrs,
-			node = res.node,
-			fill = node.getElementsByTagName(fillString)[0];
+            a = res.attrs,
+            node = res.node,
+            fill = node.getElementsByTagName(fillString)[0];
 
-		a.src = attrs.src;
+        a.src = attrs.src;
         res.X = a.x = x;
         res.Y = a.y = y;
         res.W = a.width = w;
         res.H = a.height = h;
 
-		fill.parentNode && fill.parentNode.removeChild(fill);
+        fill.parentNode == node && node.removeChild(fill);
         fill.rotate = true;
         fill.src = a.src;
         fill.type = "tile";
@@ -9332,8 +9334,8 @@ window.FusionCharts && window.FusionCharts.register('module', ['private', 'vendo
     };
     R._engine.text = function(vml, attrs, group) {
         var el = createNode("shape"),
-			path = createNode("path"),
-			o = createNode("textpath");
+            path = createNode("path"),
+            o = createNode("textpath");
         x = attrs.x || 0;
         y = attrs.y || 0;
         text = attrs.text;

diff --git a/package/raphael-min.js b/package/raphael-min.js
diff --git a/package/raphael.js b/package/raphael.js
@@ -1,5 +1,5 @@
 /**!
- * RedRaphael 1.0.9 - JavaScript Vector Library
+ * RedRaphael 1.0.11 - JavaScript Vector Library
  * Copyright (c) 2012-2013 FusionCharts Technologies <http://www.fusioncharts.com>
  *
  * Raphael 2.1.0
@@ -8402,7 +8402,7 @@
         if (fillpos || _.fillsize) {
             var fill = o.getElementsByTagName(fillString);
             fill = fill && fill[0];
-            fill.parentNode && fill.parentNode.removeChild(fill);
+            o.removeChild(fill);
             if (fillpos) {
                 c = compensation(deg, m.x(fillpos[0], fillpos[1]), m.y(fillpos[0], fillpos[1]));
                 fill.position = c.dx * y + S + c.dy * y;
@@ -8602,7 +8602,7 @@
             if (fill.on && params.fill) {
                 var isURL = Str(params.fill).match(R._ISURL);
                 if (isURL) {
-                    fill.parentNode && fill.parentNode.removeChild(fill);
+                    fill.parentNode == node && node.removeChild(fill);
                     fill.rotate = true;
                     fill.src = isURL[1];
                     fill.type = "tile";
@@ -8787,7 +8787,7 @@
         }
         o = o.shape || o.node;
         if (dots.length) {
-            fill.parentNode && fill.parentNode.removeChild(fill);
+            fill.parentNode == o && o.removeChild(fill);
             fill.on = true;
             fill.method = "none";
             fill.color = dots[0].color;
@@ -8824,10 +8824,10 @@
     Element = function(node, vml, group) {
         var o = this,
             parent = group || vml,
-			skew;
+            skew;
 
-		parent.canvas && parent.canvas.appendChild(node);
-		skew = createNode("skew");
+        parent.canvas && parent.canvas.appendChild(node);
+        skew = createNode("skew");
         skew.on = true;
         node.appendChild(skew);
         o.skew = skew;
@@ -9020,9 +9020,6 @@
         paper.__set__ && paper.__set__.exclude(o);
         eve.unbind("raphael.*.*." + o.id);
 
-        shape && shape.parentNode.removeChild(shape);
-        node.parentNode && node.parentNode.removeChild(node);
-
         while (i = o.followers.pop()) {
             i.el.remove();
         }
@@ -9036,6 +9033,11 @@
             }
         }
 
+        shape && shape.parentNode.removeChild(shape);
+        node.clipRect && o.node.clipRect.parentNode.removeChild(node.clipRect);
+        node.clipRect = null;
+        node.parentNode && node.parentNode.removeChild(node);
+
         o.removeData();
         delete paper._elementsById[o.id];
         R._tear(o, o.parent);
@@ -9236,12 +9238,12 @@
         el.coordsize = zoom + S + zoom;
         el.coordorigin = vml.coordorigin;
 
-		var p = new Element(el, vml, group);
+        var p = new Element(el, vml, group);
         p.type = attrs.type || "path";
-		p.path = [];
+        p.path = [];
         p.Path = E;
 
-		attrs.type && (delete attrs.type);
+        attrs.type && (delete attrs.type);
         setFillAndStroke(p, attrs);
 
         return p;
@@ -9250,24 +9252,24 @@
     R._engine.rect = function(vml, attrs, group) {
         var path = R._rectPath(attrs.x, attrs.y, attrs.w, attrs.h, attrs.r);
 
-		attrs.path = path;
-		attrs.type = "rect";
+        attrs.path = path;
+        attrs.type = "rect";
 
-		var res = vml.path(attrs, group),
+        var res = vml.path(attrs, group),
         a = res.attrs;
         res.X = a.x;
         res.Y = a.y;
         res.W = a.width;
         res.H = a.height;
         a.path = path;
 
-		return res;
+        return res;
     };
     R._engine.ellipse = function(vml, attrs, group) {
-		attrs.type = "ellipse";
+        attrs.type = "ellipse";
 
-		var res = vml.path(attrs, group),
-			a = res.attrs;
+        var res = vml.path(attrs, group),
+            a = res.attrs;
         res.X = a.x - a.rx;
         res.Y = a.y - a.ry;
         res.W = a.rx * 2;
@@ -9279,7 +9281,7 @@
         attrs.type = "circle";
 
         var res = vml.path(attrs, group),
-			a = res.attrs;
+            a = res.attrs;
 
         res.X = a.x - a.r;
         res.Y = a.y - a.r;
@@ -9289,21 +9291,21 @@
     R._engine.image = function(vml, attrs, group) {
         var path = R._rectPath(attrs.x, attrs.y, attrs.w, attrs.h);
 
-		attrs.path = path;
-		attrs.type = "image";
-		attrs.stroke = "none";
+        attrs.path = path;
+        attrs.type = "image";
+        attrs.stroke = "none";
         var res = vml.path(attrs, group),
-			a = res.attrs,
-			node = res.node,
-			fill = node.getElementsByTagName(fillString)[0];
+            a = res.attrs,
+            node = res.node,
+            fill = node.getElementsByTagName(fillString)[0];
 
-		a.src = attrs.src;
+        a.src = attrs.src;
         res.X = a.x = x;
         res.Y = a.y = y;
         res.W = a.width = w;
         res.H = a.height = h;
 
-		fill.parentNode && fill.parentNode.removeChild(fill);
+        fill.parentNode == node && node.removeChild(fill);
         fill.rotate = true;
         fill.src = a.src;
         fill.type = "tile";
@@ -9315,8 +9317,8 @@
     };
     R._engine.text = function(vml, attrs, group) {
         var el = createNode("shape"),
-			path = createNode("path"),
-			o = createNode("textpath");
+            path = createNode("path"),
+            o = createNode("textpath");
         x = attrs.x || 0;
         y = attrs.y || 0;
         text = attrs.text;