Item & Node: corrections in the order of merging tables of parameters and default parameters
This commit is contained in:
@@ -193,7 +193,7 @@ end
|
|||||||
---@param defaultDef Item.ItemDefinition
|
---@param defaultDef Item.ItemDefinition
|
||||||
---@return Item
|
---@return Item
|
||||||
function Item:getExtended(defaultDef)
|
function Item:getExtended(defaultDef)
|
||||||
defaultDef = defMerge(self.defaultDef, defaultDef)
|
defaultDef = defMerge(defaultDef, self.defaultDef)
|
||||||
|
|
||||||
---@type Item
|
---@type Item
|
||||||
local ChildClass = extend(self, {
|
local ChildClass = extend(self, {
|
||||||
|
|||||||
@@ -35,7 +35,7 @@ end
|
|||||||
---@param defaultDef Node.NodeDefinition
|
---@param defaultDef Node.NodeDefinition
|
||||||
---@return Node
|
---@return Node
|
||||||
function Node:getExtended(defaultDef)
|
function Node:getExtended(defaultDef)
|
||||||
defaultDef = defMerge(self.defaultDef, defaultDef)
|
defaultDef = defMerge(defaultDef, self.defaultDef)
|
||||||
|
|
||||||
---@type Node
|
---@type Node
|
||||||
local ChildClass = Class.extend(self, {
|
local ChildClass = Class.extend(self, {
|
||||||
|
|||||||
Reference in New Issue
Block a user