@@ -24,7 +24,6 @@ module ActionView # :js_tags - wraps resulting javascript in javascript tags if true. Defaults to true. def chart(placeholder, series, options = {}, html_options = {}) html_options.reverse_merge!({ :js_tags => true }) - data, x_is_date, y_is_date = series_to_json(series) if x_is_date options[:xaxis] ||= {} @@ -40,7 +39,6 @@ module ActionView end private - def series_to_json(series) data_sets = [] x_is_date, y_is_date = false, false @@ -48,8 +46,10 @@ module ActionView set, data = {}, [] set[:label] = name first = values[:collection].first - x_is_date = first.send(values[:x]).acts_like?(:date) || first.send(values[:x]).acts_like?(:time) - y_is_date = first.send(values[:y]).acts_like?(:date) || first.send(values[:y]).acts_like?(:time) + if first + x_is_date = first.send(values[:x]).acts_like?(:date) || first.send(values[:x]).acts_like?(:time) + y_is_date = first.send(values[:y]).acts_like?(:date) || first.send(values[:y]).acts_like?(:time) + end values[:collection].each do |object| x_value, y_value = object.send(values[:x]), object.send(values[:y]) x = x_is_date ? x_value.to_time.to_i * 1000 : x_value.to_f lib/flotilla.rb 523428ea4c5a58400812effa84821d6cf6f33f54 Jerry Cheung jollyjerry@gmail.com http://github.com/joshuamiller/flotilla/commit/ba8eb5b1da311aa352fddcf17bc11d0809999614 ba8eb5b1da311aa352fddcf17bc11d0809999614 2008-09-10T01:08:30-07:00 2008-09-10T01:08:30-07:00 * added check to see if serie's collection is empty cfd3752e7f88d6fa6c3bca95cac1560368c68032 Jerry Cheung jollyjerry@gmail.com