Labels do not need to be in the form "labels" : {"labels" : ....} for…

… anything other than XAxis .. that I can tell
wallerdev · Jul 31, 2008 · 71f6398 · 71f6398
1 parent 4949747
commit 71f6398
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 11 deletions.
diff --git a/lib/open_flash_chart.rb b/lib/open_flash_chart.rb
@@ -58,17 +58,6 @@ def set_colours(colour, grid_colour)
     @grid_colour = grid_colour
   end
 
-  # for some reason the json that needs to be produced is like this:
-  # "x_axis": { "offset": false, "labels": { "labels": [ "Jan", "Feb", "Mar", "Apr", "May", "Jun", "Jul", "Aug", "Sep", "Oct", "Nov", "Dec" ] } } 
-  # note the "labels":{"labels": ....}
-  def set_labels(labels)
-    @labels = {:labels => labels}
-  end
-
-  def labels=(labels)
-    @labels = {:labels => labels}
-  end
-
   def set_tooltip(tip)
     if tip.is_a?(Tooltip)
       #we have a style for our chart's tooltips

diff --git a/lib/x_axis.rb b/lib/x_axis.rb
@@ -2,4 +2,14 @@ class XAxis < OpenFlashChart
   def set_3d(v)
     @threed = v
   end
+
+  # for some reason the json that needs to be produced is like this:
+  # "x_axis": { "offset": false, "labels": { "labels": [ "Jan", "Feb", "Mar", "-  # note the "labels":{"labels": ....}
+  def set_labels(labels)
+    @labels = {:labels => labels}
+  end
+
+  def labels=(labels)
+    @labels = {:labels => labels}
+  end
 end