lib/chartkick/helper.rb in chartkick-1.0.0 vs lib/chartkick/helper.rb in chartkick-1.0.1

@@ -20,15 +20,16 @@
       options = options.dup
       element_id = options.delete(:id) || "chart-#{@chartkick_chart_id += 1}"
       height = options.delete(:height) || "300px"
 
       # don't quote font-family names due to rails escaping
-      html = content_tag :div, :id => element_id, :style => "height: #{height}; text-align: center; color: #999; line-height: #{height}; font-size: 14px; font-family: Lucida Grande, Lucida Sans Unicode, Verdana, Arial, Helvetica, sans-serif;" do
+      div_tag = content_tag :div, :id => element_id, :style => "height: #{height}; text-align: center; color: #999; line-height: #{height}; font-size: 14px; font-family: Lucida Grande, Lucida Sans Unicode, Verdana, Arial, Helvetica, sans-serif;" do
         concat "Loading..."
       end
-      html += javascript_tag do
+      script_tag = javascript_tag do
         concat "new Chartkick.#{klass}(#{element_id.to_json}, #{data_source.to_json}, #{options.to_json});".html_safe
       end
+      div_tag + script_tag
     end
 
   end
 end