Merge remote-tracking branch 'michelson/master' into devel

adamof · Aug 26, 2012 · 253d3bc · 253d3bc
2 parents 8662976 + 6a44d90
commit 253d3bc
Showing 1 changed file with 48 additions and 25 deletions.
diff --git a/lib/lazy_high_charts/layout_helper.rb b/lib/lazy_high_charts/layout_helper.rb
@@ -27,22 +27,37 @@ def build_html_output(type, placeholder, object, &block)
       options_collection =  [ generate_json_from_hash(object.options) ]
 
       options_collection << %|"series": #{object.data.to_json}|
-
-      graph =<<-EOJS
-      <script type="text/javascript">
-      (function() {
-        var onload = window.onload;
-        window.onload = function(){
-          if (typeof onload == "function") onload();
-          var options, chart;
-          options = { #{options_collection.join(',')} };
-          #{capture(&block) if block_given?}
-          chart = new Highcharts.#{type}(options);
-        };
-      })()
-      </script>
+
+      core_js =<<-EOJS
+        var options, chart;
+        options = { #{options_collection.join(',')} };
+        #{capture(&block) if block_given?}
+        chart = new Highcharts.#{type}(options);
       EOJS
 
+      if defined?(request) && request.respond_to?(:xhr?) && request.xhr?
+        graph =<<-EOJS
+        <script type="text/javascript">
+        (function() {
+          #{core_js}
+        })()
+        </script>
+        EOJS
+      else
+        graph =<<-EOJS
+        <script type="text/javascript">
+        (function() {
+          var onload = window.onload;
+          window.onload = function(){
+            if (typeof onload == "function") onload();
+            #{core_js}
+          };
+        })()
+        </script>
+        EOJS
+      end
+
+
       if defined?(raw)
         return raw(graph) 
       else
@@ -52,21 +67,29 @@ def build_html_output(type, placeholder, object, &block)
     end
 
     private
-    
-    def generate_json_from_hash hash  
+
+    def generate_json_from_hash hash
       hash.each_pair.map do |key, value|
         k = key.to_s.camelize.gsub!(/\b\w/) { $&.downcase }
-        if value.is_a? Hash
-          %|"#{k}": { #{generate_json_from_hash(value)} }|
-        else
-          if value.respond_to?(:js_code) && value.js_code?
-            %|"#{k}": #{value}|
-          else
-            %|"#{k}": #{value.to_json}|
-          end
-        end
+        %|"#{k}": #{generate_json_from_value value}|
       end.flatten.join(',')
     end
+
+    def generate_json_from_value value
+      if value.is_a? Hash
+        %|{ #{generate_json_from_hash value} }|
+      elsif value.is_a? Array
+        %|[ #{generate_json_from_array value} ]|
+      elsif value.respond_to?(:js_code) && value.js_code?
+        value
+      else
+        value.to_json
+      end
+    end
+
+    def generate_json_from_array array
+      array.map{|value| generate_json_from_value(value)}.join(",")
+    end
 
   end
 end