lib/rails_blocks/names.rb in rails_blocks-0.7.7 vs lib/rails_blocks/names.rb in rails_blocks-0.7.8

- old
+ new

@@ -19,13 +19,13 @@ end private def classes(base_class, add_js, options = {}) classes = [base_class] - classes |= mods_classes(base_class, options[:mods]) unless options[:mods].nil? - classes |= mix_classes(options[:mix], options[:parent_block]) if options[:mix] - classes |= Array(options[:class]) if options[:class] + classes.concat mods_classes(base_class, options[:mods]) unless options[:mods].nil? + classes.concat mix_classes(options[:mix], options[:parent_block]) if options[:mix] + classes.concat Array(options[:class]) if options[:class] classes << RailsBlocks.config.js_class if options[:js] && add_js classes.uniq end def mix_classes(mixes, context_block = nil) @@ -40,10 +40,10 @@ end else raise RailsBlocks::BadMixError if mix[:b].nil? block_classes(mix[:b].to_s, mix) end - end.inject(&:|) + end.inject(&:concat) end def mods_classes(base_class, mods) mods.map do |key, value| next('') unless value \ No newline at end of file