size plot in given units or default pixels

Guidecase · Sep 28, 2012 · 7599e09 · 7599e09
1 parent d908baa
commit 7599e09
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/jqplot-rails.gemspec b/jqplot-rails.gemspec
@@ -2,7 +2,7 @@ $:.push File.expand_path("../lib", __FILE__)
 
 Gem::Specification.new do |s|
   s.name         = "jqplot-rails"
-  s.version      = '1.0.1'
+  s.version      = '1.0.2'
   s.platform     = Gem::Platform::RUBY  
   s.description  = "JQPlot"
   s.summary      = "This gem provides the JQPlot plugin assets to Rails apps."

diff --git a/lib/jqplot-rails/action_view/helpers/jqplot_helper.rb b/lib/jqplot-rails/action_view/helpers/jqplot_helper.rb
@@ -5,8 +5,10 @@ module JQPlotHelper
 
       def jqplot(height, width, data_series, options={})
       	dom_id = SecureRandom.hex(12)
+        height = height.is_a?(String) ? height : "#{height}px"
+        width = width.is_a?(String) ? width : "#{width}px"
         tag "div", :data => {:series => data_series, :options => options, :role => 'jqplot'}, 
-        	         :id => dom_id, :style => "height:#{height}px;width:#{width}px"
+        	         :id => dom_id, :style => "height:#{height};width:#{width}"
       end
   	end
   end