Merge branch 'v06' of git.sourceforge.jp:/gitroot/pettanr/pettanr into v06

[pettanr/pettanr.git] / app / assets / javascripts / peta / root.js.coffee

diff --git a/app/assets/javascripts/peta/root.js.coffee b/app/assets/javascripts/peta/root.js.coffee
index f6d2445..766c038 100644 (file)
--- a/app/assets/javascripts/peta/root.js.coffee
+++ b/app/assets/javascripts/peta/root.js.coffee
@@ -2,21 +2,20 @@ class Peta.Root extends Peta.ElementNestableContent
   \r
   parts_element: () ->\r
     r = []\r
-    _this = this\r
-    _.each @my_class().child_models(), (k) ->\r
-      l = _this.element_items(k)\r
-      r = r.concat(l)\r
+    _.each @my_class().child_models(), (k) =>\r
+      l = @element_items(k)\r
+      r = r.concat(l || [])\r
     r\r
   \r
   zorderd_elements: () ->\r
     res = []\r
-    _.each @parts_element, (e) ->\r
+    _.each @parts_element(), (e) =>\r
       res[e.get('z')-1] = e\r
     res\r
   \r
   scenario_elements: () ->\r
     res = []\r
-    _.each @parts_element(), (e) ->\r
+    _.each @parts_element(), (e) =>\r
       res[e.get('t')] = e\r
     res\r
   \r