Getting back into a working state

apache · Sep 15, 2015 · 359a81e · 359a81e
1 parent 0bc2e71
commit 359a81e
Show file tree

Hide file tree

Showing 8 changed files with 315 additions and 333 deletions.
diff --git a/panoramix/highchart.py b/panoramix/highchart.py
@@ -9,12 +9,17 @@ class BaseHighchart(object):
     target_div = 'chart'
 
     @property
-    def javascript_cmd(self):
+    def json(self):
         js = dumps(self.chart)
-        js = (
+        return (
             js.replace('"{{TOOLTIP_FORMATTER}}"', self.tooltip_formatter)
             .replace("\n", " ")
         )
+
+
+    @property
+    def javascript_cmd(self):
+        js = self.json
         if self.stockchart:
             return "new Highcharts.StockChart(%s);" % js
         return "new Highcharts.Chart(%s);" % js
@@ -83,7 +88,7 @@ def __init__(
         if sort_legend_y:
             if 'tooltip' not in chart:
                 chart['tooltip'] = {
-                    'formatter': "{{TOOLTIP_FORMATTER}}"
+                    #'formatter': "{{TOOLTIP_FORMATTER}}"
                 }
         if self.zoom:
             chart["zoomType"] = self.zoom