proper selecting, expanding and rendering of packageViews

1 files changed, 10 insertions, 10 deletions

diff --git a/module/web/static/js/models/TreeCollection.js b/module/web/static/js/models/TreeCollection.js
index 27d2cefce..5949415c2 100644
--- a/module/web/static/js/models/TreeCollection.js
+++ b/module/web/static/js/models/TreeCollection.js
@@ -27,20 +27,20 @@ define(['jquery', 'backbone', 'underscore', 'models/Package', 'collections/FileL
         },
 
         // Parse the response and updates the collections
-        parse: function(resp, xhr) {
-            if (this.get('packages') === null)
-                this.set('packages', new PackageList(_.values(resp.packages)));
+        parse: function(resp) {
+            var ret = {};
+            if (!this.has('packages'))
+                ret.packages = new PackageList(_.values(resp.packages));
             else
-                this.packages.update(_.values(resp.packages));
+                this.get('files').update(_.values(resp.packages));
 
-            if (this.get('files') === null)
-                this.set('files', new FileList(_.values(resp.files)));
+            if (!this.has('files'))
+                ret.files = new FileList(_.values(resp.files));
             else
-                this.files.update(_.values(resp.files));
+                this.get('files').update(_.values(resp.files));
 
-            return {
-              root: new Package(resp.root)
-            };
+            ret.root = new Package(resp.root);
+            return ret;
         }
 
     });