lib/cyberarm_engine/ui/theme.rb in cyberarm_engine-0.7.1 vs lib/cyberarm_engine/ui/theme.rb in cyberarm_engine-0.8.0
- old
+ new
@@ -11,10 +11,10 @@
def theme_defaults(options)
raise "Error" unless self.class.ancestors.include?(CyberarmEngine::Element)
_theme = THEME
_theme = _theme.merge(options[:theme]) if options[:theme]
- options.delete(:theme)
+ _theme.delete(:theme) if options[:theme]
hash = {}
class_names = self.class.ancestors
class_names = class_names[0..class_names.index(CyberarmEngine::Element)].map! {|c| c.to_s.split("::").last.to_sym}.reverse!
\ No newline at end of file