Fix to stop font_options being written to when a copy is required

alexyoung · Nov 8, 2011 · a2119ea · a2119ea
1 parent 9cc980d
commit a2119ea
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 10 deletions.
diff --git a/README.textile b/README.textile
@@ -9,7 +9,7 @@ Raphael is the only dependency.
 
 h3. News
 
-* [2011-11-08] 0.3.4: Added <code>bar_labels</code> option that displays values above the standard bar graphs
+* [2011-11-08] 0.3.4.1: Added <code>bar_labels</code> option that displays values above the standard bar graphs
 * [2011-09-30] 0.3.3: Added <code>label_step</code> and <code>label_count</code> options so numerical labels can be controlled
 * [2011-08-30] 0.3.2: No longer extending native prototypes
 * [2011-08-24] 0.3.1: Bug fix for LineGraph, migrated tests to QUnit, moved Jakefile.js to Makefile

diff --git a/docs/index.html b/docs/index.html
@@ -435,7 +435,7 @@ <h2></h2>
 <td class="code">
 <pre><code>(<span class="keyword">function</span>(<span class="variable">global</span>) {
   <span class="keyword">var</span> <span class="class">Ico</span> = {
-    <span class="class">VERSION</span>: <span class="string">'0.3.4'</span>,</code></pre>
+    <span class="class">VERSION</span>: <span class="string">'0.3.4.1'</span>,</code></pre>
 </td>
 </tr>
 <tr class="code">

diff --git a/ico.js b/ico.js
@@ -9,7 +9,7 @@
  */
 (function(global) {
   var Ico = {
-    VERSION: '0.3.4',
+    VERSION: '0.3.4.1',
 
     /**
      * Rounds a float to the specified number of decimal places.
@@ -631,7 +631,8 @@ Helpers.extend(Ico.BaseGraph.prototype, {
         y = this.options.height - this.y_padding_bottom + y_offset(start_offset),
         pathString = '',
         i,
-        font_options = this.font_options;
+        font_options = {};
+    Helpers.extend(font_options, this.font_options);
     Helpers.extend(font_options, extra_font_options || {});
 
     for (i = 0; i < labels.length; i++) {
@@ -747,8 +748,8 @@ Helpers.extend(Ico.BarGraph.prototype, {
       return;
     }
 
-    var i, length = this.flat_data.length, x, y, label, font_options;
-    font_options = this.font_options;
+    var i, length = this.flat_data.length, x, y, label, font_options = {};
+    Helpers.extend(font_options, this.font_options);
     font_options['text-anchor'] = 'center';
 
     for (i = 0; i < length; i++) {

diff --git a/src/graphs/bar.js b/src/graphs/bar.js
@@ -88,8 +88,8 @@ Helpers.extend(Ico.BarGraph.prototype, {
       return;
     }
 
-    var i, length = this.flat_data.length, x, y, label, font_options;
-    font_options = this.font_options;
+    var i, length = this.flat_data.length, x, y, label, font_options = {};
+    Helpers.extend(font_options, this.font_options);
     font_options['text-anchor'] = 'center';
 
     for (i = 0; i < length; i++) {

diff --git a/src/graphs/base.js b/src/graphs/base.js
@@ -365,7 +365,8 @@ Helpers.extend(Ico.BaseGraph.prototype, {
         y = this.options.height - this.y_padding_bottom + y_offset(start_offset),
         pathString = '',
         i,
-        font_options = this.font_options;
+        font_options = {};
+    Helpers.extend(font_options, this.font_options);
     Helpers.extend(font_options, extra_font_options || {});
 
     for (i = 0; i < labels.length; i++) {

diff --git a/src/start.js b/src/start.js
@@ -9,7 +9,7 @@
  */
 (function(global) {
   var Ico = {
-    VERSION: '0.3.4',
+    VERSION: '0.3.4.1',
 
     /**
      * Rounds a float to the specified number of decimal places.