remove ... from style ctor

This commit is contained in:
airstruck
2015-10-30 05:53:25 -04:00
parent 62ca5bf50a
commit b3b4f90b23
2 changed files with 4 additions and 4 deletions

View File

@@ -27,14 +27,14 @@ function Layout:setStyle (rules)
if type(rules) == 'function' then
rules = rules()
end
self.style = Style(rules or {}, 'id', 'style')
self.style = Style(rules or {}, { 'id', 'style' })
end
function Layout:setTheme (rules)
if type(rules) == 'function' then
rules = rules()
end
self.theme = Style(rules or {}, 'type')
self.theme = Style(rules or {}, { 'type' })
end
function Layout:show ()

View File

@@ -4,9 +4,9 @@ local Base = require(ROOT .. 'base')
local Style = Base:extend()
function Style:constructor (rules, ...)
function Style:constructor (rules, lookupNames)
self.rules = rules
self.lookupNames = { ... }
self.lookupNames = lookupNames
end
function Style:getProperty (object, property)