IE 11 fixes - use textContent instead of innerHTML

zurb · Sep 23, 2014 · 330d1a9 · 330d1a9
1 parent 13657f3
commit 330d1a9
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 9 deletions.
diff --git a/dist/js/pizza.js b/dist/js/pizza.js
@@ -402,7 +402,7 @@ $.extend(Pizza, {
           'text-anchor': 'end'
         });
 
-      text.innerHTML = ticks[i];
+      text.textContent = ticks[i];
 
       if (existing_group.length < 1) {
         line_g.appendChild(line);
@@ -503,7 +503,7 @@ $.extend(Pizza, {
           y = (data[i].y / max_y) * height;
 
       points += x + ',' + y + ' ';
-      this.set_attr(circle, {cx: x, cy: y,r: 0,fill: data[i.color],
+      this.set_attr(circle, {cx: x, cy: y,r: 0,fill: data[i].color,
         'data-value': data[i].x + ', ' + data[i].y,
         'data-tooltip': '',
         'title': data[i].x + ', ' + data[i].y,
@@ -658,7 +658,7 @@ $.extend(Pizza, {
       if (existing_group.length < 1) {
         text_g.appendChild(text);
         line_g.appendChild(line);
-        text.innerHTML = ticks[i];
+        text.textContent = ticks[i];
       }
 
       total_tick_height = line_height;
@@ -712,6 +712,7 @@ $.extend(Pizza, {
   }
 
 });
+
 $.extend(Pizza, {
   pie : function (legend) {
     // pie chart concept from JavaScript the 
@@ -787,13 +788,13 @@ $.extend(Pizza, {
         if (data[i].text) {
           var visible_text = this.parse_options(data[i].text, percent, data[i].value);
         } else {
-          var visible_text = Math.ceil(percent) + '%';
+          var visible_text = Math.round(percent) + '%';
         }
         var text = this.svg_obj('text');
 
         text.setAttribute('x', cx + (r + settings.percent_offset) * Math.sin(start_angle + (angles[i] / 2)));
         text.setAttribute('y', cy - (r + settings.percent_offset) * Math.cos(start_angle + (angles[i] / 2)));
-        text.innerHTML = visible_text;
+        text.textContent = visible_text;
       }
 
       text.setAttribute('text-anchor', 'middle');

diff --git a/dist/js/pizza.min.js b/dist/js/pizza.min.js
diff --git a/js/pizza/bar.js b/js/pizza/bar.js
@@ -156,7 +156,7 @@ $.extend(Pizza, {
           'text-anchor': 'end'
         });
 
-      text.innerHTML = ticks[i];
+      text.textContent = ticks[i];
 
       if (existing_group.length < 1) {
         line_g.appendChild(line);

diff --git a/js/pizza/line.js b/js/pizza/line.js
@@ -203,7 +203,7 @@ $.extend(Pizza, {
       if (existing_group.length < 1) {
         text_g.appendChild(text);
         line_g.appendChild(line);
-        text.innerHTML = ticks[i];
+        text.textContent = ticks[i];
       }
 
       total_tick_height = line_height;

diff --git a/js/pizza/pie.js b/js/pizza/pie.js
@@ -79,7 +79,7 @@ $.extend(Pizza, {
 
         text.setAttribute('x', cx + (r + settings.percent_offset) * Math.sin(start_angle + (angles[i] / 2)));
         text.setAttribute('y', cy - (r + settings.percent_offset) * Math.cos(start_angle + (angles[i] / 2)));
-        text.innerHTML = visible_text;
+        text.textContent = visible_text;
       }
 
       text.setAttribute('text-anchor', 'middle');