Bug #13644: Keep track of subfolder loaded status on the browser

horde · Apr 23, 2015 · 0473ab5 · 0473ab5
1 parent 2c70705
commit 0473ab5
Showing 1 changed file with 13 additions and 3 deletions.
diff --git a/imp/js/dimpbase.js b/imp/js/dimpbase.js
@@ -3491,9 +3491,10 @@ var DimpBase = {
         }
 
         if (mode == 'tog' || mode == 'expall') {
-            subs.each(function(s) {
-                if (!s.visible() && !s.childElements().size()) {
-                    need.set(this.flist.getMbox(s.previous()).value(), 1);
+            subs.invoke('previous').each(function(s) {
+                var s2 = this.flist.getMbox(s);
+                if (!s2.loaded()) {
+                    need.set(s2.value(), 1);
                 }
             }, this);
 
@@ -4369,6 +4370,10 @@ var IMP_Flist_Mbox = Class.create({
     {
         var elt;
 
+        if (e) {
+            this.data.load = true;
+        }
+
         if (this.data.fake) {
             return this.data.fake.expand(e);
         } else if (!Object.isUndefined(e)) {
@@ -4479,6 +4484,11 @@ var IMP_Flist_Mbox = Class.create({
         return 'mbox';
     },
 
+    loaded: function()
+    {
+        return !!this.data.load;
+    },
+
     nc: function()
     {
         return !!this.data.nc;