Rename helper.get_node -> helper.node

druid/base/blocker.lua

@@ -12,7 +12,7 @@ M.interest = {
 
 
 function M.init(self, node)
-	self.node = helper.get_node(node)
+	self.node = helper.node(node)
 	self.event = const.ACTION_TOUCH
 end
 

druid/base/button.lua

@@ -23,9 +23,9 @@ M.DEFAULT_ACTIVATION_TIME = 0.2
 
 
 function M.init(self, node, callback, params, anim_node, event)
-	self.node = helper.get_node(node)
+	self.node = helper.node(node)
 	self.event = const.ACTION_TOUCH
-	self.anim_node = anim_node and helper.get_node(anim_node) or self.node
+	self.anim_node = anim_node and helper.node(anim_node) or self.node
 	self.scale_from = gui.get_scale(self.anim_node)
 	self.scale_to = self.scale_from + b_settings.SCALE_CHANGE
 	self.scale_hover_to = self.scale_from + b_settings.HOVER_SCALE
@@ -207,7 +207,7 @@ end
 --- Set additional node, what need to be clicked on button click
 -- Used, if need setup, what button can be clicked only in special zone
 function M.set_click_zone(self, zone)
-	self.click_zone = helper.get_node(zone)
+	self.click_zone = helper.node(zone)
 end
 
 

druid/base/checkbox.lua

@@ -38,8 +38,8 @@ end
 
 
 function M.init(self, node, callback, click_node)
-	self.node = helper.get_node(node)
+	self.node = helper.node(node)
-	self.click_node = helper.get_node(click_node)
+	self.click_node = helper.node(click_node)
 	self.callback = callback
 
 	self.button = self.parent:new_button(self.click_node or self.node, on_click, self)

druid/base/grid.lua

@@ -8,13 +8,13 @@ local M = {}
 
 
 function M.init(self, parent, element, in_row)
-	self.parent = helper.get_node(parent)
+	self.parent = helper.node(parent)
 	self.nodes = {}
 
 	self.offset = vmath.vector3(0)
 	self.anchor = vmath.vector3(0.5, 0, 0)
 	self.in_row = in_row or 1
-	self.node_size = gui.get_size(helper.get_node(element))
+	self.node_size = gui.get_size(helper.node(element))
 	self.border = vmath.vector4(0)
 	self.border_offset = vmath.vector3(0)
 end

druid/base/progress.lua

@@ -25,7 +25,7 @@ function M.init(self, name, key, init_value)
 	self.prop = hash("scale."..key)
 	self.key = key
 
-	self.node = helper.get_node(name)
+	self.node = helper.node(name)
 	self.scale = gui.get_scale(self.node)
 	self.size = gui.get_size(self.node)
 	self.max_size = self.size[self.key]

druid/base/scroll.lua

@@ -20,8 +20,8 @@ M.current_scroll = nil
 
 
 function M.init(self, scroll_parent, input_zone, border)
-	self.node = helper.get_node(scroll_parent)
+	self.node = helper.node(scroll_parent)
-	self.input_zone = helper.get_node(input_zone)
+	self.input_zone = helper.node(input_zone)
 	self.zone_size = gui.get_size(self.input_zone)
 	self.soft_size = settings.SOFT_ZONE_SIZE
 

druid/base/slider.lua

@@ -18,7 +18,7 @@ end
 
 
 function M.init(self, node, end_pos, callback)
-	self.node = helper.get_node(node)
+	self.node = helper.node(node)
 
 	self.start_pos = gui.get_position(self.node)
 	self.pos = gui.get_position(self.node)

druid/base/text.lua

@@ -14,7 +14,7 @@ M.interest = {
 
 function M.init(self, node, value, is_locale, max_width)
 	self.max_width = max_width
-	self.node = helper.get_node(node)
+	self.node = helper.node(node)
 	self.start_scale = gui.get_scale(self.node)
 	self.scale = self.start_scale
 	self.last_color = gui.get_color(self.node)

druid/base/timer.lua

@@ -14,7 +14,7 @@ local empty = function() end
 
 
 function M.init(self, node, seconds_from, seconds_to, callback)
-	self.node = helper.get_node(node)
+	self.node = helper.node(node)
 	seconds_from = math.max(seconds_from, 0)
 	seconds_to = math.max(seconds_to or 0, 0)
 	callback = callback or empty

druid/helper.lua

@@ -1,6 +1,8 @@
 --- Druid helper module
 -- @module helper
 
+local const = require("druid.const")
+
 local M = {}
 
 --- Text node or icon node can be nil
@@ -80,8 +82,8 @@ end
 
 
 local STRING = "string"
-function M.get_node(node_or_name)
+function M.node(node_or_name)
-	if type(node_or_name) == STRING then
+	if type(node_or_name) == const.STRING then
 		return gui.get_node(node_or_name)
 	end
 	return node_or_name