fix js manifest

[pettanr/pettanr.git] / app / assets / javascripts / manifest_base / manifest_base.js.coffee

diff --git a/app/assets/javascripts/manifest_base/manifest_base.js.coffee b/app/assets/javascripts/manifest_base/manifest_base.js.coffee
index 68505c7..3b418c9 100644 (file)
--- a/app/assets/javascripts/manifest_base/manifest_base.js.coffee
+++ b/app/assets/javascripts/manifest_base/manifest_base.js.coffee
@@ -5,7 +5,7 @@ class ManifestBase
       require_dependency path + name.to_s\r
   \r
   @module_message: (module_names, my_module_names = []) ->\r
-    (module_names + my_module_names).join(' > ')\r
+    module_names.concat(my_module_names).join(' > ')\r
   \r
   @alert_message: (message, location) ->\r
     confirm('invalid manifest?:' + message + " for " + message)\r
@@ -18,17 +18,17 @@ class ManifestBase
   \r
   @load_name_values: (_self, jsons, module_name, klass) ->\r
     hash = {}\r
-    _.each jsons[module_name], (_name, _json) ->\r
+    _.each jsons[module_name], (_json, _name) ->\r
       hash[_name] = new klass(_self, _name, _json, module_name)\r
     hash\r
   \r
   @load_type_args: (_self, jsons, module_name, klass) ->\r
-    klass.factory_type_args(_self, jsons[module_name], module_name)\r
+    klass.factory_type_args(_self, jsons[module_name], module_name, klass)\r
   \r
   @load_type_name_args: (_self, jsons, module_name, klass) ->\r
     hash = {}\r
-    _.each jsons[module_name], (_name, _json) ->\r
-      hash[_name] = new klass.factory(_self, _name, _json, module_name)\r
+    _.each jsons[module_name], (_json, _name) ->\r
+      hash[_name] = new klass.factory(_self, _name, _json, module_name, klass)\r
     hash\r
   \r
   @load_names: (_self, json, module_name, klass) ->\r