Partydeck/Druid-Extension
3
0
Fork 0
mirror of https://github.com/Insality/druid synced 2025-09-27 18:12:21 +02:00
Code Issues Packages Projects Releases Wiki Activity

move settings node from factory to component (#8)

Browse Source
This commit is contained in:
Maxim Tuprikov
2019-03-29 00:51:37 +03:00
committed by GitHub
parent 12f5f22b69
commit 7395f029e0
6 changed files with 25 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
druid/druid.lua
View File

@@ -7,8 +7,6 @@ local M = {}
local log = settings.log
local _factory = {}
local STRING = "string"
M.comps = {
button = require("druid.base.button"),
android_back = require("druid.base.android_back"),
@@ -26,8 +24,8 @@ end
function M.register(name, module)
-- TODO: Find better solution to creating elements?
_factory["new_" .. name] = function(factory, node_or_name, ...)
return _factory.new(factory, module, node_or_name, ...)
_factory["new_" .. name] = function(factory, ...)
return _factory.new(factory, module, ...)
end
log("Register component", name)
end
@@ -54,19 +52,9 @@ local function input_init(factory)
end
local function create(module, factory, name)
local function create(module, factory)
local instance = setmetatable({}, {__index = module})
instance.parent = factory
if name then
if type(name) == STRING then
instance.name = name
instance.node = gui.get_node(name)
else
--name already is node
instance.name = nil
instance.node = name
end
end
factory[#factory + 1] = instance
local register_to = module.interest or {}
@@ -84,8 +72,8 @@ local function create(module, factory, name)
end
function _factory.new(factory, module, node_or_name, ...)
local instance = create(module, factory, node_or_name)
function _factory.new(factory, module, ...)
local instance = create(module, factory)
if instance.init then
instance:init(...)