Changeset ab10d6f in github

Timestamp:

May 14, 2010 6:52:53 AM (3 years ago)

Author:

alecpl <alec@…>

Branches:

master, HEAD, courier-fix, dev-browser-capabilities, pdo, release-0.6, release-0.7, release-0.8

Children:

a4a270b

Parents:

349cbff

Message:

• Fix marking/deleting of all messages in search result (#1486736)

File:

• program/js/app.js (modified) (5 diffs)

program/js/app.js

@@ -2328 +2328 @@
 
     // also send search request to get the right messages 
-    if (this.env.search_request) 
+    if (this.env.search_request)
       add_url += '&_search='+this.env.search_request;
 
@@ -2405 +2405 @@
       this.set_message(a_uids[i], 'unread', (flag=='unread' ? true : false));
 
-    this.http_post('mark', '_uid='+this.uids_to_list(a_uids)+'&_flag='+flag);
+    var url = '_uid='+this.uids_to_list(a_uids)+'&_flag='+flag;
+
+    // also send search request to get the right messages
+    if (this.env.search_request)
+      url += '&_search='+this.env.search_request;
+
+    this.http_post('mark', url);
 
     for (var i=0; i<a_uids.length; i++)
@@ -2418 +2424 @@
       this.set_message(a_uids[i], 'flagged', (flag=='flagged' ? true : false));
 
-    this.http_post('mark', '_uid='+this.uids_to_list(a_uids)+'&_flag='+flag);
+    var url = '_uid='+this.uids_to_list(a_uids)+'&_flag='+flag;
+
+    // also send search request to get the right messages
+    if (this.env.search_request)
+      url += '&_search='+this.env.search_request;
+
+    this.http_post('mark', url);
   };
 
@@ -2457 +2469 @@
       this.set_message(a_uids[i], 'deleted', false);
 
-    this.http_post('mark', '_uid='+this.uids_to_list(a_uids)+'&_flag=undelete');
+    var url = '_uid='+this.uids_to_list(a_uids)+'&_flag=undelete';
+
+    // also send search request to get the right messages
+    if (this.env.search_request)
+      url += '&_search='+this.env.search_request;
+
+    this.http_post('mark', url);
     return true;
   };
@@ -2501 +2519 @@
 
     if (this.env.skip_deleted) {
-      // also send search request to get the right messages 
-      if (this.env.search_request) 
-        add_url += '&_search='+this.env.search_request;
       if (this.env.display_next && this.env.next_uid)
         add_url += '&_next_uid='+this.env.next_uid;
     }
+
+    // also send search request to get the right messages
+    if (this.env.search_request)
+      add_url += '&_search='+this.env.search_request;
 
     this.http_post('mark', '_uid='+this.uids_to_list(a_uids)+'&_flag=delete'+add_url);