lib/pagelet_rails/concerns/options.rb in pagelet_rails-0.1.1 vs lib/pagelet_rails/concerns/options.rb in pagelet_rails-0.1.2

- old
+ new

@@ -6,11 +6,11 @@ helper_method :pagelet_options end def pagelet_options *args - set_pagelet_options *args + set_pagelet_options(*args) opts = self.class.pagelet_options class_default_opts = opts.fetch('default', {}) class_action_opts = opts.fetch(action_name, {}) @@ -45,10 +45,10 @@ module ClassMethods include Shared def pagelet_options *args - set_pagelet_options *args + set_pagelet_options(*args) if superclass && superclass.instance_variable_defined?(:@pagelet_options) parent = superclass.instance_variable_get :@pagelet_options parent.merge(@pagelet_options) else