component: fix instance events

meh · Jan 30, 2014 · a1034ed · a1034ed
1 parent cdb7134
commit a1034ed
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 6 deletions.
diff --git a/opal/lissio/application.rb b/opal/lissio/application.rb
@@ -39,6 +39,8 @@ def self.expose(what, options = {})
 	def_delegators :@router, :navigate, :route
 
 	def initialize
+		super()
+
 		@router = Lissio::Router.new(fragment: false)
 	end
 

diff --git a/opal/lissio/component.rb b/opal/lissio/component.rb
@@ -142,6 +142,7 @@ def self.css(&block)
 
 	def initialize(parent = nil)
 		@parent = parent
+		@events = Hash.new { |h, k| h[k] = [] }
 	end
 
 	def tag
@@ -166,8 +167,7 @@ def element
 		elem.add_class(*self.class.inheritance)
 		elem[:id] = tag[:id] if tag[:id]
 
-		# FIXME: when [2, *a] is fixed
-		[self.class.events, @events].compact.each {|events|
+		[self.class.events, @events].each {|events|
 			events.each {|name, blocks|
 				blocks.each {|selector, block|
 					if Symbol === block
@@ -202,8 +202,6 @@ def on(name, selector = nil, method = nil, &block)
 				end
 			end
 		else
-			@events ||= {}
-
 			if block
 				@events[name] << [selector, block]
 			elsif method

diff --git a/opal/lissio/component/alert.rb b/opal/lissio/component/alert.rb
@@ -8,6 +8,8 @@ def self.new!(message, options = {})
 	attr_reader :message, :options
 
 	def initialize(message, options = {})
+		super()
+
 		@message = message
 		@options = options
 	end

diff --git a/opal/lissio/component/autocomplete.rb b/opal/lissio/component/autocomplete.rb
@@ -58,7 +58,9 @@ def initialize(title, results, key, input, select)
 		end
 	end
 
-	def initialize(&block)
+	def initialize(parent = nil, &block)
+		super(parent)
+
 		@autocompleters = []
 
 		if block.arity.nonzero?

diff --git a/opal/lissio/component/container.rb b/opal/lissio/component/container.rb
@@ -21,7 +21,7 @@ def to_a
 		end
 	end
 
-	def initialize(parent, &block)
+	def initialize(parent = nil, &block)
 		super(parent)
 
 		if block

diff --git a/opal/lissio/component/tooltip.rb b/opal/lissio/component/tooltip.rb
@@ -12,6 +12,8 @@ class Tooltip < Lissio::Component
 	def initialize(*args, &block)
 		if Lissio::Component === args.first
 			super(args.shift)
+		else
+			super()
 		end
 
 		@options = DEFAULTS.merge(args.first)