From e2a14399bd7955e2297f4fe61365a3d2d5f26d52 Mon Sep 17 00:00:00 2001 From: Fox Date: Wed, 30 Mar 2016 11:10:44 -0700 Subject: [PATCH] removed passing pop around unneccessarily --- demo/pop/elements/box.lua | 4 ++-- demo/pop/elements/element.lua | 2 +- demo/pop/elements/text.lua | 4 ++-- demo/pop/init.lua | 2 +- lib/pop/elements/box.lua | 4 ++-- lib/pop/elements/element.lua | 2 +- lib/pop/elements/text.lua | 4 ++-- lib/pop/init.lua | 2 +- src/pop/elements/box.moon | 4 ++-- src/pop/elements/element.moon | 2 +- src/pop/elements/text.moon | 4 ++-- src/pop/init.moon | 2 +- 12 files changed, 18 insertions(+), 18 deletions(-) diff --git a/demo/pop/elements/box.lua b/demo/pop/elements/box.lua index bd95152..3d60bb4 100644 --- a/demo/pop/elements/box.lua +++ b/demo/pop/elements/box.lua @@ -70,11 +70,11 @@ do _base_0.__index = _base_0 setmetatable(_base_0, _parent_0.__base) _class_0 = setmetatable({ - __init = function(self, pop, parent, background) + __init = function(self, parent, background) if background == nil then background = false end - _class_0.__parent.__init(self, pop, parent) + _class_0.__parent.__init(self, parent) self.background = background end, __base = _base_0, diff --git a/demo/pop/elements/element.lua b/demo/pop/elements/element.lua index 163d7a3..00fb75a 100644 --- a/demo/pop/elements/element.lua +++ b/demo/pop/elements/element.lua @@ -169,7 +169,7 @@ do } _base_0.__index = _base_0 _class_0 = setmetatable({ - __init = function(self, pop, parent) + __init = function(self, parent) self.parent = parent self.child = { } if parent then diff --git a/demo/pop/elements/text.lua b/demo/pop/elements/text.lua index ba1cd78..ac55175 100644 --- a/demo/pop/elements/text.lua +++ b/demo/pop/elements/text.lua @@ -98,7 +98,7 @@ do _base_0.__index = _base_0 setmetatable(_base_0, _parent_0.__base) _class_0 = setmetatable({ - __init = function(self, pop, parent, text, color) + __init = function(self, parent, text, color) if text == nil then text = "" end @@ -110,7 +110,7 @@ do 255 } end - _class_0.__parent.__init(self, pop, parent) + _class_0.__parent.__init(self, parent) self.font = graphics.newFont(14) self:setText(text) self.color = color diff --git a/demo/pop/init.lua b/demo/pop/init.lua index 3e8b968..86b21e3 100644 --- a/demo/pop/init.lua +++ b/demo/pop/init.lua @@ -63,7 +63,7 @@ pop.create = function(element, parent, ...) if parent == nil then parent = pop.screen end - element = pop.elements[element](pop, parent, ...) + element = pop.elements[element](parent, ...) if parent then insert(parent.child, element) end diff --git a/lib/pop/elements/box.lua b/lib/pop/elements/box.lua index bd95152..3d60bb4 100644 --- a/lib/pop/elements/box.lua +++ b/lib/pop/elements/box.lua @@ -70,11 +70,11 @@ do _base_0.__index = _base_0 setmetatable(_base_0, _parent_0.__base) _class_0 = setmetatable({ - __init = function(self, pop, parent, background) + __init = function(self, parent, background) if background == nil then background = false end - _class_0.__parent.__init(self, pop, parent) + _class_0.__parent.__init(self, parent) self.background = background end, __base = _base_0, diff --git a/lib/pop/elements/element.lua b/lib/pop/elements/element.lua index 163d7a3..00fb75a 100644 --- a/lib/pop/elements/element.lua +++ b/lib/pop/elements/element.lua @@ -169,7 +169,7 @@ do } _base_0.__index = _base_0 _class_0 = setmetatable({ - __init = function(self, pop, parent) + __init = function(self, parent) self.parent = parent self.child = { } if parent then diff --git a/lib/pop/elements/text.lua b/lib/pop/elements/text.lua index ba1cd78..ac55175 100644 --- a/lib/pop/elements/text.lua +++ b/lib/pop/elements/text.lua @@ -98,7 +98,7 @@ do _base_0.__index = _base_0 setmetatable(_base_0, _parent_0.__base) _class_0 = setmetatable({ - __init = function(self, pop, parent, text, color) + __init = function(self, parent, text, color) if text == nil then text = "" end @@ -110,7 +110,7 @@ do 255 } end - _class_0.__parent.__init(self, pop, parent) + _class_0.__parent.__init(self, parent) self.font = graphics.newFont(14) self:setText(text) self.color = color diff --git a/lib/pop/init.lua b/lib/pop/init.lua index 3e8b968..86b21e3 100644 --- a/lib/pop/init.lua +++ b/lib/pop/init.lua @@ -63,7 +63,7 @@ pop.create = function(element, parent, ...) if parent == nil then parent = pop.screen end - element = pop.elements[element](pop, parent, ...) + element = pop.elements[element](parent, ...) if parent then insert(parent.child, element) end diff --git a/src/pop/elements/box.moon b/src/pop/elements/box.moon index c70b496..79abe03 100644 --- a/src/pop/elements/box.moon +++ b/src/pop/elements/box.moon @@ -5,8 +5,8 @@ path = sub ..., 1, len(...) - len "/box" element = require "#{path}/element" class box extends element - new: (pop, parent, background=false) => - super pop, parent + new: (parent, background=false) => + super parent @background = background diff --git a/src/pop/elements/element.moon b/src/pop/elements/element.moon index 9a4265b..f67942f 100644 --- a/src/pop/elements/element.moon +++ b/src/pop/elements/element.moon @@ -2,7 +2,7 @@ import graphics from love import floor from math class element - new: (pop, parent) => + new: (parent) => @parent = parent @child = {} diff --git a/src/pop/elements/text.moon b/src/pop/elements/text.moon index fc7e6af..fd90d29 100644 --- a/src/pop/elements/text.moon +++ b/src/pop/elements/text.moon @@ -12,8 +12,8 @@ class text extends element else return pop.create("text", parent, ...) - new: (pop, parent, text="", color={255,255,255,255}) => - super pop, parent + new: (parent, text="", color={255,255,255,255}) => + super parent @font = graphics.newFont 14 @setText text diff --git a/src/pop/init.moon b/src/pop/init.moon index c688ae2..a93d21b 100644 --- a/src/pop/init.moon +++ b/src/pop/init.moon @@ -49,7 +49,7 @@ pop.load = -> -- creates an element with specified parent (parent can be false) pop.create = (element, parent=pop.screen, ...) -> - element = pop.elements[element](pop, parent, ...) + element = pop.elements[element](parent, ...) if parent insert parent.child, element