Bug #12570: Unselect message when marking as unseen

horde · Sep 27, 2013 · 4159549 · 4159549
1 parent a6198bd
commit 4159549
Show file tree

Hide file tree

Showing 4 changed files with 36 additions and 0 deletions.
diff --git a/imp/js/dimpbase.js b/imp/js/dimpbase.js
@@ -3159,6 +3159,10 @@ var DimpBase = {
                         this.updateFlag(s, f, false);
                     }, this);
                 }
+
+                if (entry.deselect) {
+                    this.viewport.deselect(s);
+                }
             }, this);
         }, this);
     },

diff --git a/imp/lib/Ajax/Queue.php b/imp/lib/Ajax/Queue.php
@@ -114,6 +114,7 @@ class IMP_Ajax_Queue
      *
      * For flag data (key: 'flag'), an array of objects with these properties:
      *   - add: (array) The list of flags that were added.
+     *   - deselect: (boolean) If true, deselect the uids.
      *   - remove: (array) The list of flags that were removed.
      *   - uids: (string) Indices of the messages that have changed (IMAP
      *           sequence string; mboxes are base64url encoded).
@@ -336,9 +337,21 @@ public function flag($flags, $add, IMP_Indices $indices)
         $result = new stdClass;
         if (!empty($changed['add'])) {
             $result->add = array_map('strval', $changed['add']);
+            foreach ($changed['add'] as $val) {
+                if ($val->deselect(true)) {
+                    $result->deselect = true;
+                    break;
+                }
+            }
         }
         if (!empty($changed['remove'])) {
             $result->remove = array_map('strval', $changed['remove']);
+            foreach ($changed['remove'] as $val) {
+                if ($val->deselect(false)) {
+                    $result->deselect = true;
+                    break;
+                }
+            }
         }
 
         $result->buids = $indices->toArray();

diff --git a/imp/lib/Flag/Base.php b/imp/lib/Flag/Base.php
@@ -194,6 +194,18 @@ public function match($data)
         return false;
     }
 
+    /**
+     * Determine if the message should be deselected after changing.
+     *
+     * @param boolean $set  Was the flag set?
+     *
+     * @return boolean  True if messages should be deselected.
+     */
+    public function deselect($set)
+    {
+        return false;
+    }
+
     /**
      * Return the flag label.
      * Necessary evil as gettext strings can not be set directly to object

diff --git a/imp/lib/Flag/Imap/Seen.php b/imp/lib/Flag/Imap/Seen.php
@@ -42,4 +42,11 @@ protected function _getLabel()
         return _("Seen");
     }
 
+    /**
+     */
+    public function deselect($set)
+    {
+        return !$set;
+    }
+
 }