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

Merge fixes

Browse Source
This commit is contained in:
Insality 2020-11-03 23:25:59 +03:00
parent 90d8e6c57f
commit 2ef2a61dfa
1 changed files with 3 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
druid/system/druid_instance.lua
View File

@ -524,27 +524,15 @@ function DruidInstance.new_checkbox_group(self, nodes, callback, click_nodes)
end end
<<<<<<< HEAD
--- Create drag basic component
-- @function druid:new_drag
-- @tparam args ... drag init args
-- @treturn Component drag component
function Druid.new_drag(self, ...)
return Druid.create(self, drag, ...)
end
--- Create infinity list basic component --- Create infinity list basic component
-- @function druid:new_infinity_list -- @function druid:new_infinity_list
-- @tparam args ... drag init args -- @tparam args ... drag init args
-- @treturn Component drag component -- @treturn Component infinity list component
function Druid.new_infinity_list(self, ...) function DruidInstance.new_infinity_list(self, ...)
return Druid.create(self, infinity_list, ...) return DruidInstance.create(self, infinity_list, ...)
end end
return Druid
=======
--- Create radio_group component --- Create radio_group component
-- @tparam DruidInstance self -- @tparam DruidInstance self
-- @tparam node[] nodes Array of gui node -- @tparam node[] nodes Array of gui node
@ -583,4 +571,3 @@ end
return DruidInstance return DruidInstance
>>>>>>> develop