Fixed default color on svg interpretation: issue 63

jonobr1 · Jan 28, 2014 · 7480cd8 · 7480cd8
1 parent 7f17fd6
commit 7480cd8
Show file tree

Hide file tree

Showing 4 changed files with 38 additions and 20 deletions.
diff --git a/build/two.clean.js b/build/two.clean.js
@@ -399,6 +399,7 @@
         },
 
         polygon: function(node, open) {
+
           var points = node.getAttribute('points');
 
           var verts = [];
@@ -407,6 +408,7 @@
           });
 
           var poly = new Two.Polygon(verts, !open).noStroke();
+          poly.fill = 'black';
 
           return Two.Utils.applySvgAttributes(node, poly);
 
@@ -624,6 +626,7 @@
           points = _.compact(points);
 
           var poly = new Two.Polygon(points, closed, undefined, true).noStroke();
+          poly.fill = 'black';
 
           return Two.Utils.applySvgAttributes(node, poly);
 
@@ -646,6 +649,7 @@
 
           var circle = new Two.Polygon(points, true, true).noStroke();
           circle.translation.set(x, y);
+          circle.fill = 'black';
 
           return Two.Utils.applySvgAttributes(node, circle);
 
@@ -669,6 +673,7 @@
 
           var ellipse = new Two.Polygon(points, true, true).noStroke();
           ellipse.translation.set(x, y);
+          ellipse.fill = 'black';
 
           return Two.Utils.applySvgAttributes(node, ellipse);
 
@@ -693,6 +698,7 @@
 
           var rect = new Two.Polygon(points, true).noStroke();
           rect.translation.set(x + w2, y + h2);
+          rect.fill = 'black';
 
           return Two.Utils.applySvgAttributes(node, rect);
 

diff --git a/build/two.js b/build/two.js
@@ -1843,6 +1843,7 @@ var Backbone = Backbone || {};
         },
 
         polygon: function(node, open) {
+
           var points = node.getAttribute('points');
 
           var verts = [];
@@ -1851,6 +1852,7 @@ var Backbone = Backbone || {};
           });
 
           var poly = new Two.Polygon(verts, !open).noStroke();
+          poly.fill = 'black';
 
           return Two.Utils.applySvgAttributes(node, poly);
 
@@ -2068,6 +2070,7 @@ var Backbone = Backbone || {};
           points = _.compact(points);
 
           var poly = new Two.Polygon(points, closed, undefined, true).noStroke();
+          poly.fill = 'black';
 
           return Two.Utils.applySvgAttributes(node, poly);
 
@@ -2090,6 +2093,7 @@ var Backbone = Backbone || {};
 
           var circle = new Two.Polygon(points, true, true).noStroke();
           circle.translation.set(x, y);
+          circle.fill = 'black';
 
           return Two.Utils.applySvgAttributes(node, circle);
 
@@ -2113,6 +2117,7 @@ var Backbone = Backbone || {};
 
           var ellipse = new Two.Polygon(points, true, true).noStroke();
           ellipse.translation.set(x, y);
+          ellipse.fill = 'black';
 
           return Two.Utils.applySvgAttributes(node, ellipse);
 
@@ -2137,6 +2142,7 @@ var Backbone = Backbone || {};
 
           var rect = new Two.Polygon(points, true).noStroke();
           rect.translation.set(x + w2, y + h2);
+          rect.fill = 'black';
 
           return Two.Utils.applySvgAttributes(node, rect);