Merge branch 'master' of https://github.com/Cervajz/google_visualr in…

…to Cervajz-master

Conflicts:
	lib/google_visualr/base_chart.rb

lib/google_visualr/base_chart.rb

@@ -16,6 +16,10 @@ def chart_name
       class_name
     end
 
+    def chart_function_name(element_id)
+      "draw_#{element_id.gsub('-', '_')}"
+    end
+
     def options
       @options
     end
@@ -32,20 +36,22 @@ def add_listener(event, callback)
     #
     # Parameters:
     #  *div_id            [Required] The ID of the DIV element that the Google Chart should be rendered in.
+
     def to_js(element_id)
       js  = "\n<script type='text/javascript'>"
-      js << "\n  google.load('visualization','1', {packages: ['#{package_name}'], callback: function() {"
+      js << "\n  google.load('visualization','1', {packages: ['#{package_name}']});"
+      js << "\n  google.setOnLoadCallback(#{chart_function_name(element_id)});"
+      js << "\n  function #{chart_function_name(element_id)}() {"
       js << "\n    #{@data_table.to_js}"
       js << "\n    var chart = new google.visualization.#{chart_name}(document.getElementById('#{element_id}'));"
       @listeners.each do |listener|
         js << "\n    google.visualization.events.addListener(chart, '#{listener[:event]}', #{listener[:callback]});"
       end
       js << "\n    chart.draw(data_table, #{js_parameters(@options)});"
-      js << "\n  }});"
+      js << "\n  };"
       js << "\n</script>"
       js
     end
-
   end
 
 end