Remove LEGACY_INTERFACE

ngiger · Dec 2, 2013 · 1957f01 · 1957f01
1 parent 0e15fb2
commit 1957f01
Show file tree

Hide file tree

Showing 5 changed files with 4 additions and 10 deletions.
diff --git a/lib/htmlgrid/composite.rb b/lib/htmlgrid/composite.rb
@@ -42,7 +42,6 @@ class Hash
 module HtmlGrid
 	class AbstractComposite < Component
 		LABELS = false
-		LEGACY_INTERFACE = true
 		SYMBOL_MAP = {}
 		CSS_MAP = {}
 		CSS_ID_MAP = {}
@@ -62,9 +61,6 @@ def create(component, model=@model)
 			elsif(component.is_a? Symbol)
 				if(self.respond_to?(component, true))
 					args = [model]
-					if(self::class::LEGACY_INTERFACE)
-						args.push(@session)
-					end
 					self.send(component, *args)
 				elsif(klass = symbol_map[component])
 					klass.new(component, model, @session, self)

diff --git a/lib/htmlgrid/template.rb b/lib/htmlgrid/template.rb
@@ -32,7 +32,6 @@ module TemplateMethods
 		FOOT = nil
 		HEAD = nil
 		META_TAGS = []
-		LEGACY_INTERFACE = true
 		CSS_FILES = []
 		JAVASCRIPTS = []
 		def css_link(context, path=@lookandfeel.resource(:css))

diff --git a/test/test_composite.rb b/test/test_composite.rb
@@ -51,10 +51,10 @@ def init
 		@barcount=0
 		super
 	end
-	def foo(model, lookandfeel)
+	def foo(model)
 		"Foo"
 	end
-	def baz(model, lookandfeel)
+	def baz(model)
 		@barcount += 1
 		"Baz#{@barcount}"
 	end

diff --git a/test/test_label.rb b/test/test_label.rb
@@ -81,8 +81,8 @@ class StubLabelComposite < HtmlGrid::Composite
 			[0,1]	=>	:named_component,
 		}
 		LABELS = true
-		def named_component(model, session)
-			@named_component ||= StubLabelComponent.new(model, session, self)
+		def named_component(model)
+			@named_component ||= StubLabelComponent.new(model, self)
 		end
 	end
 	def	setup

diff --git a/test/test_template.rb b/test/test_template.rb
@@ -69,7 +69,6 @@ class Template < HtmlGrid::Template
 	COMPONENTS = {
 		[0,0]	=>	:foo,	
 	}
-	LEGACY_INTERFACE = false
 	def foo(model)
 		'foo'
 	end