Context Navigation

← Previous Changeset
Next Changeset →

Changeset bf2f39e in github

Timestamp:

Sep 29, 2008 9:02:02 AM (5 years ago)

Author:

alecpl <alec@…>

Branches:

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

Children:

Parents:

Message:

#1485290: Fix unread counter when displaying cached massage in preview panel
remove some empty lines in app.js

Files:

: 3 edited

CHANGELOG (modified) (1 diff)
program/js/app.js (modified) (99 diffs)
program/steps/mail/show.inc (modified) (1 diff)

Legend:

: Unmodified
: Added
: Removed

CHANGELOG

rffae15e5	rbf2f39e
8	8	in MS Outlook/OE (#1485320)
9	9	- Added "advanced options" feature in User Preferences
	10	- Fix unread counter when displaying cached massage in preview panel (#1485290)
10	11
11	12	2008/09/25 (alec)

program/js/app.js

-                      r07d3670
+                      rbf2f39e
     };
   // add a localized label to the client environment
   this.add_label = function(key, value)
 …
     this.labels[key] = value;
     };
   // add a button to the button list
 …
+      }
     // enable basic commands
     this.enable_command('logout', true);
 …
     // start keep-alive interval
     this.start_keepalive();
     // execute all foreign onload scripts
 …
+      }
     };
   // start interval for keep-alive/recent_check signal
 …
+    }
   this.init_message_row = function(row)
+  {
 …
+      }
   };
   // init message compose form: set focus and eventhandlers
 …
   /*********************************************************/
   /*********       client command interface        *********/
   /*********************************************************/
   // execute a specific command on the web client
   this.command = function(command, props, obj)
 …
       return false;
+      }
    // check input before leaving compose step
 …
     };
   // set command enabled or disabled
   this.enable_command = function()
 …
       return true;
     };
   // lock/unlock interface
 …
     };
   // return a localized string
   this.get_label = function(name)
 …
     };
   // switch to another application task
   this.switch_task = function(task)
 …
     };
   this.get_task_url = function(task, url)
+    {
 …
     };
   // called when a request timed out
   this.request_timed_out = function()
 …
   /*********        event handling methods         *********/
   /*********************************************************/
   this.doc_mouse_up = function(e)
 …
     };
   this.msglist_select = function(list)
+    {
 …
     };
   this.msglist_dbl_click = function(list)
+    {
 …
       this.show_message(uid, false, false);
     };
   this.msglist_keypress = function(list)
 …
     };
   this.msglist_get_preview = function()
+  {
 …
       this.show_contentframe(false);
   };
   this.check_droptarget = function(id)
 …
   this.show_message = function(id, safe, preview)
+    {
+    if (!id) return;
     var add_url = '';
     var action = preview ? 'preview': 'show';
     var target = window;
     if (preview && this.env.contentframe && window.frames && window.frames[this.env.contentframe])
+      {
 …
     if (this.env.search_request)
       add_url += '&_search='+this.env.search_request;
+    if (id)
+      {
+      var url = '&_action='+action+'&_uid='+id+'&_mbox='+urlencode(this.env.mailbox)+add_url;
+      if (action == 'preview' && String(target.location.href).indexOf(url) >= 0)
+        this.show_contentframe(true);
+      else
+        {
+        this.set_busy(true, 'loading');
+        target.location.href = this.env.comm_path+url;
+        }
+      }
+    };
+    var url = '&_action='+action+'&_uid='+id+'&_mbox='+urlencode(this.env.mailbox)+add_url;
+    if (action == 'preview' && String(target.location.href).indexOf(url) >= 0)
+      this.show_contentframe(true);
+    else
+      {
+      this.set_busy(true, 'loading');
+      target.location.href = this.env.comm_path+url;
+      // mark as read and change mbox unread counter
+      if (action == 'preview' && this.message_list && this.message_list.rows[id] && this.message_list.rows[id].unread)
+        {
+        this.set_message(id, 'unread', false);
+        if (this.env.unread_counts[this.env.mailbox])
+          {
+          this.env.unread_counts[this.env.mailbox] -= 1;
+          this.set_unread_count(this.env.mailbox, this.env.unread_counts[this.env.mailbox], this.env.mailbox == 'INBOX');
+          }
+        }
+      }
+    };
   this.show_contentframe = function(show)
 …
       this.set_busy(false);
     };
   // list a specific page
 …
     };
   // list messages of a specific mailbox
   this.list_mailbox = function(mbox, page, sort)
 …
     };
   // send remote request to load message list
   this.list_mailbox_remote = function(mbox, page, add_url)
 …
     this.http_request('list', url+add_url, true);
     };
   this.expunge_mailbox = function(mbox)
 …
     this.http_post('expunge', url+add_url, lock);
     };
   this.purge_mailbox = function(mbox)
 …
   };
   // delete the selected messages permanently
   this.permanently_remove_messages = function()
 …
     this.http_post(action, '_uid='+a_uids.join(',')+'&_mbox='+urlencode(this.env.mailbox)+add_url, lock);
   };
   // set a specific flag to one or more messages
 …
   };
   this.flag_as_undeleted = function(a_uids)
+  {
 …
   };
   this.flag_as_deleted = function(a_uids)
+  {
 …
     return true;
   };
   // flag as read without mark request (called from backend)
 …
   /*********************************************************/
   // checks the input fields before sending a message
   this.check_compose_input = function()
 …
     };
   this.set_draft_id = function(id)
+    {
 …
     this.busy = false;
     };
   this.compose_field_hash = function(save)
 …
     };
   this.change_identity = function(obj)
+    {
 …
     };
   this.show_attachment_form = function(a)
+    {
 …
     };
   // upload attachment file
   this.upload_file = function(form)
 …
     return true;
     };
   // add file name to attachment list
 …
     return true;
     };
   this.sent_successfully = function(type, msg)
 …
     };
   this.insert_recipient = function(id)
+  {
 …
       this.ksearch_input.setSelectionRange(cpos, cpos);
   };
   // address search processor
 …
     };
   this.ksearch_blur = function(e, obj)
+    {
 …
       this.ksearch_pane.show(0);
     };
 …
         this.command('delete');
     };
   this.contactlist_select = function(list)
 …
     };
   this.list_contacts = function(src, page)
+    {
 …
     };
   // send remote request to load contacts list
   this.list_contacts_remote = function(src, page)
 …
     };
   // load contact record
   this.load_contact = function(cid, action, framed)
 …
   // copy a contact to the specified target (group or directory)
   this.copy_contact = function(cid, to)
+  {
+    {
     if (!cid)
       cid = this.contact_list.get_selection().join(',');
 …
     if (to != this.env.source && cid && this.env.address_sources[to] && !this.env.address_sources[to].readonly)
       this.http_post('copy', '_cid='+urlencode(cid)+'&_source='+urlencode(this.env.source)+'&_to='+urlencode(to));
   };
+    };
 …
     };
   // update a contact record in the list
   this.update_contact_row = function(cid, cols_arr)
 …
     };
   this.delete_identity = function(id)
+    {
 …
     return true;
     };
   this.focus_subscription = function(id)
 …
+    }
   this.unfocus_subscription = function(id)
+    {
 …
         this.set_classname(this.subscription_list.frame, 'droptarget', false);
+    }
   this.subscription_select = function(list)
 …
     };
   this.subscription_move_folder = function(list)
+    {
 …
     };
   // tell server to create and subscribe a new mailbox
   this.create_folder = function(name)
 …
       form.elements['_folder_name'].focus();
     };
   // start renaming the mailbox name.
 …
     };
   // remove the input field and write the current mailbox name to the table cell
   this.reset_folder_rename = function()
 …
     this.edit_folder = null;
     };
   // handler for keyboard events on the input field
 …
     };
   // delete a specific mailbox with all its messages
   this.delete_folder = function(id)
 …
+      }
     };
   // add a new folder to the subscription list by cloning a folder row
 …
     };
   // replace an existing table row with a new folder line
   this.replace_folder_row = function(oldfolder, newfolder, display_name, before)
 …
     };
   // remove the table row of a specific mailbox from the table
   // (the row will not be removed, just hidden)
 …
     };
   this.subscribe_folder = function(folder)
+    {
 …
     };
   this.unsubscribe_folder = function(folder)
+    {
 …
     };
   // helper method to find a specific mailbox row ID
   this.get_folder_row_id = function(folder)
 …
   /*********************************************************/
   // eable/disable buttons for page shifting
   this.set_page_buttons = function()
 …
     this.enable_command('firstpage', (this.env.current_page > 1));
+    }
   // set button to a specific state
 …
     };
   // set/unset a specific class name
   this.set_classname = function(obj, classname, set)
 …
       obj.className += ' '+classname;
     };
   // write to the document/window title
 …
+  }
   // display a system message
   this.display_message = function(msg, type, hold)
 …
     };
   // make a message row disapear
   this.hide_message = function()
 …
+      }
     };
   // mark a mailbox as selected and set environment variable
 …
     return null;
   };
   // for reordering column array, Konqueror workaround
 …
     };
   // replace content of row count display
   this.set_rowcount = function(text)
 …
     };
   // replace content of mailboxname display
   this.set_mailboxname = function(content)
 …
       this.gui_objects.quotadisplay.innerHTML = content;
     };
   // update the mailboxlist
 …
     this.set_unread_count_display(mbox, set_title);
+    }
   // update the mailbox count display
 …
     };
   this.toggle_editor = function(checkbox, textAreaId)
+    {
 …
     };
   this.toggle_prefer_html = function(checkbox)
+    {
 …
+    }
   // display fetched raw headers
   this.set_headers = function(content)
 …
     };
   // display all-headers row and fetch raw message headers
   this.load_headers = function(elem)
 …
+      }
+    }
   // hide all-headers row
 …
     };
   this.http_sockets = new Array();
 …
     };
   // send a http request to the server
   this.http_request = function(action, querystring, lock)
 …
+    {
     var ctype = request_obj.get_header('Content-Type');
+    if (ctype){
+    if (ctype)
+      {
       ctype = String(ctype).toLowerCase();
       var ctype_array=ctype.split(";");
       ctype = ctype_array[0];
+    }
+      }
     if (request_obj.__lock)
 …
           this.enable_command('export', (this.contact_list && this.contact_list.rowcount > 0));
         break;
+    }
+      }
     request_obj.reset();
     };
   // handle HTTP request errors
 …
+    {
     //alert('Error sending request: '+request_obj.url+' => HTTP '+request_obj.xmlhttp.status);
     if (request_obj.__lock)
       this.set_busy(false);
 …
     };
   // use an image to send a keep-alive siganl to the server
   this.send_keep_alive = function()
 …
     };
   // send periodic request to check for recent messages
   this.check_for_recent = function()
 …
     };
   this.set_caret2start = function(obj)
+    {
 …
     obj.focus();
     };
   // set all fields of a form disabled
 …
   }  // end object rcube_webmail
 …
   this.xmlhttp = null;
   // reset object properties
   this.reset = function()
 …
+    }
   // create HTMLHTTP object
   this.build = function()
 …
     this.xmlhttp.send(null);
     };
   this.POST = function(url, body, contentType)
 …
     this.xmlhttp.send(req_body);
     };
   // handle onreadystatechange event

program/steps/mail/show.inc

-                      r25c35c8
+                      rbf2f39e
   // mark message as read
   if (!$MESSAGE->headers->seen)
+  {
+    $marked = $IMAP->set_flag($MESSAGE->uid, 'SEEN');
+    if($RCMAIL->action == 'preview' && $marked != -1)
+    {
+      $OUTPUT->command('parent.set_unread_count', $mbox_name, $IMAP->messagecount($mbox_name, 'UNSEEN'), ($mbox_name == 'INBOX'));
+      $OUTPUT->command('parent.set_message', $MESSAGE->uid, 'unread', false);
+    }
+  }
+    $IMAP->set_flag($MESSAGE->uid, 'SEEN');
   // give message uid to the client

Note: See TracChangeset for help on using the changeset viewer.

Download in other formats: