resources consisting of an array of EObjects now also parsed

emfjson · Jun 11, 2014 · 76351f8 · 76351f8
1 parent 0cb94e2
commit 76351f8
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 8 deletions.
diff --git a/dist/ecore.js b/dist/ecore.js
@@ -1709,11 +1709,14 @@ Ecore.JSON = {
             return eObject;
         }
 
-        var parsed = parseObject(data);
-        if (parsed) {
-            model.add(parsed);
-            resolveReferences();
+        if (_.isArray(data)) {
+            _.each(data, function (object) {
+                model.add(parseObject(object));
+            });
+        } else {
+       	    model.add(parseObject(data));
         }
+        resolveReferences();
     },
 
     to: function(model) {

diff --git a/src/resource.js b/src/resource.js
@@ -131,11 +131,14 @@ Ecore.JSON = {
             return eObject;
         }
 
-        var parsed = parseObject(data);
-        if (parsed) {
-            model.add(parsed);
-            resolveReferences();
+        if (_.isArray(data)) {
+            _.each(data, function (object) {
+                model.add(parseObject(object));
+            });
+        } else {
+       	    model.add(parseObject(data));
         }
+        resolveReferences();
     },
 
     to: function(model) {