diff --git a/Nasal/canvas/api/group.nas b/Nasal/canvas/api/group.nas index 110cbdcbb..7bc99fa6e 100644 --- a/Nasal/canvas/api/group.nas +++ b/Nasal/canvas/api/group.nas @@ -5,7 +5,10 @@ # var Group = { new: func(ghost) { - return { parents: [Group, Element.new(ghost)] }; + var obj = { + parents: [Group, Element.new(ghost)], + }; + return obj; }, # Create a child of given type with specified id. @@ -94,8 +97,9 @@ var Group = { if (typeof(first) == "vector") color = first; } - foreach(var c; children) - c.setColor(color); + foreach(var c; children) { + c.setColor(color); + } }, # Get first child with given id (breadth-first search) @@ -129,13 +133,15 @@ var Group = { # Create element from existing node _wrapElement: func(node) { - return me._element_factories[node.getName()](me._getChild(node._g)); + var factory = me._getFactory(node.getName()); + return factory(me._getChild(node._g)); }, _getFactory: func(type) { var factory = me._element_factories[type]; - if (factory == nil) - debug.dump("canvas.Group.createChild(): unknown type ("~type~")"); + if (factory == nil) { + logprint(DEV_ALERT, "canvas.Group.createChild(): unknown type ("~type~")"); + } return factory; } }; diff --git a/Nasal/canvas/api/image.nas b/Nasal/canvas/api/image.nas index 1bf4ffeae..7687f9879 100644 --- a/Nasal/canvas/api/image.nas +++ b/Nasal/canvas/api/image.nas @@ -5,7 +5,10 @@ # var Image = { new: func(ghost) { - return {parents: [Image, Element.new(ghost)]}; + var obj = { + parents: [Image, Element.new(ghost)], + }; + return obj; }, # Set image file to be used diff --git a/Nasal/canvas/api/map.nas b/Nasal/canvas/api/map.nas index b95607a73..d076c785b 100644 --- a/Nasal/canvas/api/map.nas +++ b/Nasal/canvas/api/map.nas @@ -8,13 +8,16 @@ var Map = { df_controller: nil, new: func(ghost) { - return { parents: [Map, Group.new(ghost)], layers:{}, - controller:nil } - .setController(); + var obj = { + parents: [Map, Group.new(ghost)], + layers: {}, + controller: nil, + }; + return obj.setController(); }, del: func() { - #print("canvas.Map.del()"); + logprint(_API_dbg_level, "canvas.Map.del()"); if (me.controller != nil) me.controller.del(me); foreach (var k; keys(me.layers)) { diff --git a/Nasal/canvas/api/path.nas b/Nasal/canvas/api/path.nas index 3c9eb1bf2..1e317c24b 100644 --- a/Nasal/canvas/api/path.nas +++ b/Nasal/canvas/api/path.nas @@ -63,13 +63,14 @@ var Path = { # new: func(ghost) { - return { + var obj = { parents: [Path, Element.new(ghost)], _first_cmd: 0, _first_coord: 0, _last_cmd: -1, _last_coord: -1 }; + return obj; }, # Remove all existing path data