Merge pull request #165 from alexmww/ticket-164

add hasOwnProperty check; fix attr for scatter and polyline graphTypes

Author: mauriciopoppe

src/graph-types/interval.ts

@@ -89,14 +89,21 @@ export default function interval (chart: Chart) {
         .attr('fill', 'none')
 
       // enter + update
-      innerSelection.merge(innerSelectionEnter)
+      const selection = innerSelection.merge(innerSelectionEnter)
         .attr('stroke-width', minWidthHeight)
         .attr('stroke', utils.color(d, index) as any)
         .attr('opacity', closed ? 0.5 : 1)
         .attr('d', function (d: Interval[][]) {
           return line(d, closed)
         })
-        .attr(d.attr)
+
+      if (d.attr) {
+        for (let k in d.attr) {
+          if(d.attr.hasOwnProperty(k)) {
+            selection.attr(k, d.attr[k])
+          }
+        }
+      }
 
       innerSelection.exit().remove()
     })

src/graph-types/polyline.ts

@@ -79,7 +79,9 @@ export default function polyline (chart: Chart) {
 
           if (d.attr) {
             for (let k in d.attr) {
-              path.attr(k, d.attr[k])
+              if(d.attr.hasOwnProperty(k)) {
+                path.attr(k, d.attr[k])
+              }
             }
           }
         })

src/graph-types/scatter.ts

@@ -34,14 +34,21 @@ export default function scatter (chart: Chart) {
       const innerSelectionEnter = innerSelection.enter()
         .append('circle')
 
-      innerSelection.merge(innerSelectionEnter)
+      const selection = innerSelection.merge(innerSelectionEnter)
         .attr('fill', d3Hsl(color.toString()).brighter(1.5).hex())
         .attr('stroke', color)
         .attr('opacity', 0.7)
         .attr('r', 1)
         .attr('cx', function (d) { return xScale(d[0]) })
-        .attr('cy', function (d) { return yScale(d[1]) })
-        .attr(d.attr)
+        .attr('cy', function (d) { return yScale(d[1]) });
+
+      if (d.attr) {
+        for (let k in d.attr) {
+          if(d.attr.hasOwnProperty(k)) {
+            selection.attr(k, d.attr[k])
+          }
+        }
+      }
 
       innerSelection.exit().remove()
     })