Skip to content

Commit

Permalink
a bug fixed
Browse files Browse the repository at this point in the history
  • Loading branch information
Yuri Leikind committed Jul 28, 2010
1 parent 2e624f8 commit 4748af0
Showing 1 changed file with 1 addition and 4 deletions.
5 changes: 1 addition & 4 deletions lib/helpers/wice_grid_misc_view_helpers.rb
Expand Up @@ -59,7 +59,6 @@ def scaffolded_grid(grid_obj, opts = {}) #:nodoc:
# but it's possible not to include them setting parameter +include_calendar+ to false:
# <%= include_wice_grid_assets(:include_calendar => false) %>
def include_wice_grid_assets(options = {})
Wice::JsAdaptor.init
opts = {:include_calendar => true, :load_on_demand => true}
options.assert_valid_keys(opts.keys)
opts.merge!(options)
Expand All @@ -68,7 +67,7 @@ def include_wice_grid_assets(options = {})
javascript_include_tag('wice_grid') +
stylesheet_link_tag('wice_grid') +
if opts[:include_calendar]
Wice::JsAdaptor.js_framework_specific_calendar_assets(self)
stylesheet_link_tag("calendarview.css") + javascript_include_tag("calendarview.js")
else
''
end
Expand All @@ -83,7 +82,6 @@ def include_wice_grid_assets(options = {})
# By default +names_of_wice_grid_javascripts+ returns all javascripts, but it's possible not to include calendar widget javascripts by
# setting parameter <tt>:include_calendar</tt> to +false+.
def names_of_wice_grid_javascripts(options = {})
Wice::JsAdaptor.init
opts = {:include_calendar => true}
options.assert_valid_keys(opts.keys)
opts.merge!(options)
Expand All @@ -100,7 +98,6 @@ def names_of_wice_grid_javascripts(options = {})
# By default +names_of_wice_grid_stylesheets+ returns all javascripts, but it's possible not to include calendar widget javascripts by
# setting parameter <tt>:include_calendar</tt> to +false+.
def names_of_wice_grid_stylesheets(options = {})
Wice::JsAdaptor.init
opts = {:include_calendar => true}
options.assert_valid_keys(opts.keys)
opts.merge!(options)
Expand Down

0 comments on commit 4748af0

Please sign in to comment.