From ed5d29f4b3c57235594931d33dde7cccaf7cd58b Mon Sep 17 00:00:00 2001
From: thomascube <thomas@roundcube.net>
Date: Thu, 25 May 2006 14:25:04 -0400
Subject: [PATCH] Finalized GoogieSpell integration
---
program/js/app.js | 462 ++++++++++++++++++++++++++++++++++++++++++++++-----------
1 files changed, 374 insertions(+), 88 deletions(-)
diff --git a/program/js/app.js b/program/js/app.js
index 4e9a8bf..98a30d3 100644
--- a/program/js/app.js
+++ b/program/js/app.js
@@ -7,12 +7,12 @@
| Licensed under the GNU GPL |
| |
+-----------------------------------------------------------------------+
- | Author: Thomas Bruederli <roundcube@gmail.com> |
+ | Authors: Thomas Bruederli <roundcube@gmail.com> |
+ | Charles McNulty <charles@charlesmcnulty.com> |
+-----------------------------------------------------------------------+
$Id$
*/
-
// Constants
var CONTROL_KEY = 1;
var SHIFT_KEY = 2;
@@ -28,6 +28,8 @@
this.gui_objects = new Object();
this.commands = new Object();
this.selection = new Array();
+ this.last_selected = 0;
+ this.in_message_list = false;
// create public reference to myself
rcube_webmail_client = this;
@@ -117,11 +119,11 @@
{
msg_list_frame.onmousedown = function(e){return rcube_webmail_client.click_on_list(e);};
this.init_messagelist(msg_list);
- this.enable_command('markread', true);
+ this.enable_command('toggle_status', true);
}
// enable mail commands
- this.enable_command('list', 'compose', 'add-contact', true);
+ this.enable_command('list', 'compose', 'add-contact', 'search', 'reset-search', true);
if (this.env.action=='show')
{
@@ -140,7 +142,11 @@
}
if (this.env.action=='compose')
+ {
this.enable_command('add-attachment', 'send-attachment', 'send', true);
+ if (this.env.spellcheck)
+ this.enable_command('spellcheck', true);
+ }
if (this.env.messagecount)
this.enable_command('select-all', 'select-none', 'sort', 'expunge', true);
@@ -231,11 +237,11 @@
this.enable_command('logout', true);
// disable browser's contextmenus
- document.oncontextmenu = function(){ return false; }
+ // document.oncontextmenu = function(){ return false; }
// load body click event
document.onmousedown = function(){ return rcube_webmail_client.reset_click(); };
- document.onkeydown = function(e){ return rcube_webmail_client.use_arrow_keys(e, msg_list_frame); };
+ document.onkeydown = function(e){ return rcube_webmail_client.key_pressed(e, msg_list_frame); };
// flag object as complete
@@ -248,63 +254,86 @@
// start interval for keep-alive/recent_check signal
if (this.kepp_alive_interval && this.task=='mail' && this.gui_objects.messagelist)
this.kepp_alive_int = setInterval(this.ref+'.check_for_recent()', this.kepp_alive_interval);
- else
+ else if (this.task!='login')
this.kepp_alive_int = setInterval(this.ref+'.send_keep_alive()', this.kepp_alive_interval);
};
// reset last clicked if user clicks on anything other than the message table
- this.reset_click = function()
- {
- this.in_message_list = false;
- };
+ this.reset_click = function() {
+ this.in_message_list = false;
+ for (var n=0; n<this.selection.length; n++) {
+ id = this.selection[n];
+ if (this.list_rows[id].obj) {
+ this.set_classname(this.list_rows[id].obj, 'selected', false);
+ this.set_classname(this.list_rows[id].obj, 'unfocused', true);
+ }
+ }
+ };
this.click_on_list = function(e)
{
if (!e)
e = window.event;
+ for (var n=0; n<this.selection.length; n++) {
+ id = this.selection[n];
+ if (this.list_rows[id].obj) {
+ this.set_classname(this.list_rows[id].obj, 'selected', true);
+ this.set_classname(this.list_rows[id].obj, 'unfocused', false);
+ }
+ }
+
this.in_message_list = true;
e.cancelBubble = true;
- if (e.stopPropagation) e.stopPropagation();
};
- // reset last clicked if user clicks on anything other than the message table
- this.use_arrow_keys = function(e, msg_list_frame) {
+ this.key_pressed = function(e, msg_list_frame) {
if (this.in_message_list != true)
return true;
-
var keyCode = document.layers ? e.which : document.all ? event.keyCode : document.getElementById ? e.keyCode : 0;
var mod_key = this.get_modifier(e);
+ switch (keyCode) {
+ case 13:
+ this.command('show','',this);
+ break;
+ case 40:
+ case 38:
+ return this.use_arrow_key(keyCode, mod_key, msg_list_frame);
+ break;
+ case 46:
+ return this.use_delete_key(keyCode, mod_key, msg_list_frame);
+ break;
+ default:
+ return true;
+ }
+ return true;
+ }
+
+ this.use_arrow_key = function(keyCode, mod_key, msg_list_frame) {
var scroll_to = 0;
-
- var last_selected_row = this.list_rows[this.last_selected];
-
if (keyCode == 40) { // down arrow key pressed
- var new_row = last_selected_row.obj.nextSibling;
- while (new_row && new_row.nodeType != 1) {
- new_row = new_row.nextSibling;
- }
+ new_row = this.get_next_row();
if (!new_row) return false;
scroll_to = (Number(new_row.offsetTop) + Number(new_row.offsetHeight)) - Number(msg_list_frame.offsetHeight);
} else if (keyCode == 38) { // up arrow key pressed
- var new_row = last_selected_row.obj.previousSibling;
- while (new_row && new_row.nodeType != 1) {
- new_row = new_row.previousSibling;
- }
+ new_row = this.get_prev_row();
if (!new_row) return false;
scroll_to = new_row.offsetTop;
- } else {return false};
+ } else {return true;}
- if (mod_key != CONTROL_KEY)
- this.select_row(new_row.uid,mod_key);
+ this.select_row(new_row.uid,mod_key,true);
if (((Number(new_row.offsetTop)) < (Number(msg_list_frame.scrollTop))) ||
((Number(new_row.offsetTop) + Number(new_row.offsetHeight)) > (Number(msg_list_frame.scrollTop) + Number(msg_list_frame.offsetHeight)))) {
msg_list_frame.scrollTop = scroll_to;
}
-
return false;
};
+
+ this.use_delete_key = function(keyCode, mod_key, msg_list_frame){
+ this.command('delete','',this);
+ return false;
+ }
// get all message rows from HTML table and init each row
this.init_messagelist = function(msg_list)
@@ -318,8 +347,12 @@
for(var r=0; r<msg_list.tBodies[0].childNodes.length; r++)
{
row = msg_list.tBodies[0].childNodes[r];
+ while (row && (row.nodeType != 1 || row.style.display == 'none')) {
+ row = row.nextSibling;
+ r++;
+ }
//row = msg_list.tBodies[0].rows[r];
- this.init_message_row(row);
+ if (row) this.init_message_row(row);
}
}
@@ -340,6 +373,7 @@
this.message_rows[uid] = {id:row.id, obj:row,
classname:row.className,
+ deleted:this.env.messages[uid] ? this.env.messages[uid].deleted : null,
unread:this.env.messages[uid] ? this.env.messages[uid].unread : null,
replied:this.env.messages[uid] ? this.env.messages[uid].replied : null};
@@ -355,7 +389,7 @@
{
msg_icon.id = 'msgicn_'+uid;
msg_icon._row = row;
- msg_icon.onmousedown = function(e) { rcube_webmail_client.command('markread', this); };
+ msg_icon.onmousedown = function(e) { rcube_webmail_client.command('toggle_status', this); };
// get message icon and save original icon src
this.message_rows[uid].icon = msg_icon;
@@ -574,7 +608,11 @@
// misc list commands
case 'list':
if (this.task=='mail')
+ {
+ if (this.env.search_request<0 || (this.env.search_request && props != this.env.mailbox))
+ this.reset_qsearch();
this.list_mailbox(props);
+ }
else if (this.task=='addressbook')
this.list_contacts();
break;
@@ -712,9 +750,7 @@
case 'delete':
// mail task
- if (this.task=='mail' && this.env.trash_mailbox && String(this.env.mailbox).toLowerCase()!=String(this.env.trash_mailbox).toLowerCase())
- this.move_messages(this.env.trash_mailbox);
- else if (this.task=='mail')
+ if (this.task=='mail')
this.delete_messages();
// addressbook task
else if (this.task=='addressbook')
@@ -731,7 +767,7 @@
this.move_messages(props);
break;
- case 'markread':
+ case 'toggle_status':
if (props && !props._row)
break;
@@ -742,9 +778,10 @@
{
uid = props._row.uid;
this.dont_select = true;
-
// toggle read/unread
- if (!this.message_rows[uid].unread)
+ if (this.message_rows[uid].deleted) {
+ flag = 'undelete';
+ } else if (!this.message_rows[uid].unread)
flag = 'unread';
}
@@ -831,15 +868,23 @@
}
else if (props)
url += '&_to='+props;
-
+
// don't know if this is necessary...
url = url.replace(/&_framed=1/, "");
this.set_busy(true);
// need parent in case we are coming from the contact frame
- parent.window.location.href = url;
- break;
+ if (this.env.framed)
+ parent.location.href = url;
+ else
+ location.href = url;
+ break;
+
+ case 'spellcheck':
+ if (this.env.spellcheck && this.env.spellcheck.spellCheck)
+ this.env.spellcheck.spellCheck(this.env.spellcheck.check_link);
+ break;
case 'send':
if (!this.gui_objects.messageform)
@@ -904,6 +949,22 @@
this.add_contact(props);
break;
+ // mail quicksearch
+ case 'search':
+ if (!props && this.gui_objects.qsearchbox)
+ props = this.gui_objects.qsearchbox.value;
+ if (props)
+ this.qsearch(escape(props), this.env.mailbox);
+ break;
+
+ // reset quicksearch
+ case 'reset-search':
+ var s = this.env.search_request;
+ this.reset_qsearch();
+
+ if (s)
+ this.list_mailbox(this.env.mailbox);
+ break;
// ldap search
case 'ldappublicsearch':
@@ -956,7 +1017,7 @@
// set command enabled or disabled
this.enable_command = function()
{
- var args = this.enable_command.arguments;
+ var args = arguments;
if(!args.length) return -1;
var command;
@@ -968,6 +1029,7 @@
this.commands[command] = enable;
this.set_button(command, (enable ? 'act' : 'pas'));
}
+ return true;
};
@@ -1070,10 +1132,10 @@
return false;
// selects currently unselected row
- if (!this.in_selection_before)
+ if (!this.in_selection_before && !this.list_rows[id].clicked)
{
var mod_key = this.get_modifier(e);
- this.select_row(id,mod_key);
+ this.select_row(id,mod_key,false);
}
if (this.selection.length)
@@ -1090,6 +1152,7 @@
// onmouseup-handler of message list row
this.click_row = function(e, id)
{
+ var mod_key = this.get_modifier(e);
// don't do anything (another action processed before)
if (this.dont_select)
@@ -1099,15 +1162,14 @@
}
// unselects currently selected row
- if (!this.drag_active && this.in_selection_before==id) {
- var mod_key = this.get_modifier(e);
- this.select_row(id,mod_key);
- }
+ if (!this.drag_active && this.in_selection_before==id && !this.list_rows[id].clicked)
+ this.select_row(id,mod_key,false);
+
this.drag_start = false;
this.in_selection_before = false;
// row was double clicked
- if (this.task=='mail' && this.list_rows && this.list_rows[id].clicked)
+ if (this.task=='mail' && this.list_rows && this.list_rows[id].clicked && this.in_selection(id))
{
this.show_message(id);
return false;
@@ -1175,6 +1237,27 @@
/********* (message) list functionality *********/
/*********************************************************/
+ // get next and previous rows that are not hidden
+ this.get_next_row = function(){
+ if (!this.list_rows) return false;
+ var last_selected_row = this.list_rows[this.last_selected];
+ var new_row = last_selected_row.obj.nextSibling;
+ while (new_row && (new_row.nodeType != 1 || new_row.style.display == 'none')) {
+ new_row = new_row.nextSibling;
+ }
+ return new_row;
+ }
+
+ this.get_prev_row = function(){
+ if (!this.list_rows) return false;
+ var last_selected_row = this.list_rows[this.last_selected];
+ var new_row = last_selected_row.obj.previousSibling;
+ while (new_row && (new_row.nodeType != 1 || new_row.style.display == 'none')) {
+ new_row = new_row.previousSibling;
+ }
+ return new_row;
+ }
+
// highlight/unhighlight a row
this.highlight_row = function(id, multiple)
{
@@ -1193,7 +1276,7 @@
if (!this.in_selection(id)) // select row
{
this.selection[this.selection.length] = id;
- this.set_classname(this.list_rows[id].obj, 'selected', true);
+ this.set_classname(this.list_rows[id].obj, 'selected', true);
}
else // unselect row
{
@@ -1202,6 +1285,7 @@
var a_post = this.selection.slice(p+1, this.selection.length);
this.selection = a_pre.concat(a_post);
this.set_classname(this.list_rows[id].obj, 'selected', false);
+ this.set_classname(this.list_rows[id].obj, 'unfocused', false);
}
selected = (this.selection.length==1);
}
@@ -1221,7 +1305,7 @@
// selects or unselects the proper row depending on the modifier key pressed
- this.select_row = function(id,mod_key) {
+ this.select_row = function(id,mod_key,with_mouse) {
if (!mod_key) {
this.shift_start = id;
this.highlight_row(id, false);
@@ -1232,7 +1316,8 @@
break; }
case CONTROL_KEY: {
this.shift_start = id;
- this.highlight_row(id, true);
+ if (!with_mouse)
+ this.highlight_row(id, true);
break;
}
case CONTROL_SHIFT_KEY: {
@@ -1245,7 +1330,9 @@
}
}
}
- this.last_selected = id;
+ if (this.last_selected != 0) { this.set_classname(this.list_rows[this.last_selected].obj, 'focused', false);}
+ this.last_selected = id;
+ this.set_classname(this.list_rows[id].obj, 'focused', true);
};
this.shift_select = function(id, control) {
@@ -1271,9 +1358,10 @@
this.clear_selection = function()
{
for(var n=0; n<this.selection.length; n++)
- if (this.list_rows[this.selection[n]])
+ if (this.list_rows[this.selection[n]]) {
this.set_classname(this.list_rows[this.selection[n]].obj, 'selected', false);
-
+ this.set_classname(this.list_rows[this.selection[n]].obj, 'unfocused', false);
+ }
this.selection = new Array();
};
@@ -1298,9 +1386,11 @@
// reset selection first
this.clear_selection();
- for (var n in this.list_rows)
+ for (var n in this.list_rows) {
if (!filter || this.list_rows[n][filter]==true)
- this.highlight_row(n, true);
+ this.highlight_row(n, true);
+ }
+ return true;
};
@@ -1350,6 +1440,7 @@
// list messages of a specific mailbox
this.list_mailbox = function(mbox, page, sort)
{
+ this.last_selected = 0;
var add_url = '';
var target = window;
@@ -1368,6 +1459,10 @@
this.env.current_page = page;
this.clear_selection();
}
+
+ // also send search request to get the right messages
+ if (this.env.search_request)
+ add_url += '&_search='+this.env.search_request;
if (this.env.mailbox!=mbox)
this.select_mailbox(mbox);
@@ -1458,6 +1553,7 @@
// send request to server
var url = '_mbox='+escape(mbox);
this.http_request('purge', url+add_url, lock);
+ return true;
};
@@ -1484,6 +1580,10 @@
if (this.message_rows[id].obj)
this.message_rows[id].obj.style.display = 'none';
}
+ next_row = this.get_next_row();
+ prev_row = this.get_prev_row();
+ new_row = (next_row) ? next_row : prev_row;
+ if (new_row) this.select_row(new_row.uid,false,false);
}
var lock = false;
@@ -1499,10 +1599,7 @@
this.http_request('moveto', '_uid='+a_uids.join(',')+'&_mbox='+escape(this.env.mailbox)+'&_target_mbox='+escape(mbox)+'&_from='+(this.env.action ? this.env.action : ''), lock);
};
-
- // delete selected messages from the current mailbox
- this.delete_messages = function()
- {
+ this.permanently_remove_messages = function() {
// exit if no mailbox specified or if selection is empty
if (!(this.selection.length || this.env.uid))
return;
@@ -1524,10 +1621,46 @@
this.message_rows[id].obj.style.display = 'none';
}
}
+ next_row = this.get_next_row();
+ prev_row = this.get_prev_row();
+ new_row = (next_row) ? next_row : prev_row;
+ if (new_row) this.select_row(new_row.uid,false,false);
// send request to server
this.http_request('delete', '_uid='+a_uids.join(',')+'&_mbox='+escape(this.env.mailbox)+'&_from='+(this.env.action ? this.env.action : ''));
- };
+ }
+
+
+ // delete selected messages from the current mailbox
+ this.delete_messages = function()
+ {
+ // exit if no mailbox specified or if selection is empty
+ if (!(this.selection.length || this.env.uid))
+ return;
+ // if there is a trash mailbox defined and we're not currently in it:
+ if (this.env.trash_mailbox && String(this.env.mailbox).toLowerCase()!=String(this.env.trash_mailbox).toLowerCase())
+ this.move_messages(this.env.trash_mailbox);
+ // if there is a trash mailbox defined but we *are* in it:
+ else if (this.env.trash_mailbox && String(this.env.mailbox).toLowerCase() == String(this.env.trash_mailbox).toLowerCase())
+ this.permanently_remove_messages();
+ // if there isn't a defined trash mailbox and the config is set to flag for deletion
+ else if (!this.env.trash_mailbox && this.env.flag_for_deletion) {
+ flag = 'delete';
+ this.mark_message(flag);
+ if(this.env.action=="show"){
+ this.command('nextmessage','',this);
+ } else if (this.selection.length == 1) {
+ next_row = this.get_next_row();
+ prev_row = this.get_prev_row();
+ new_row = (next_row) ? next_row : prev_row;
+ if (new_row) this.select_row(new_row.uid,false,false);
+ }
+ // if there isn't a defined trash mailbox and the config is set NOT to flag for deletion
+ }else if (!this.env.trash_mailbox && !this.env.flag_for_deletion) {
+ this.permanently_remove_messages();
+ }
+ return;
+ };
// set a specific flag to one or more messages
@@ -1546,13 +1679,22 @@
{
id = this.selection[n];
a_uids[a_uids.length] = id;
-
- // 'remove' message row from list (just hide it)
- if (this.message_rows[id].obj)
- this.message_rows[id].obj.style.display = 'none';
}
}
+ switch (flag) {
+ case 'read':
+ case 'unread':
+ this.toggle_read_status(flag,a_uids);
+ break;
+ case 'delete':
+ case 'undelete':
+ this.toggle_delete_status(a_uids);
+ break;
+ }
+ };
+ // set class to read/unread
+ this.toggle_read_status = function(flag, a_uids) {
// mark all message rows as read/unread
var icn_src;
for (var i=0; i<a_uids.length; i++)
@@ -1585,12 +1727,98 @@
this.message_rows[uid].icon.src = icn_src;
}
}
+ this.http_request('mark', '_uid='+a_uids.join(',')+'&_flag='+flag);
+ }
+
+ // mark all message rows as deleted/undeleted
+ this.toggle_delete_status = function(a_uids) {
+ if (this.env.read_when_deleted) {
+ this.toggle_read_status('read',a_uids);
+ }
+ // if deleting message from "view message" don't bother with delete icon
+ if (this.env.action == "show")
+ return false;
- // send request to server
- this.http_request('mark', '_uid='+a_uids.join(',')+'&_flag='+flag);
- };
+ if (a_uids.length==1){
+ if(this.message_rows[a_uids[0]].classname.indexOf('deleted') < 0 ){
+ this.flag_as_deleted(a_uids)
+ } else {
+ this.flag_as_undeleted(a_uids)
+ }
+ return true;
+ }
+
+ var all_deleted = true;
+
+ for (var i=0; i<a_uids.length; i++) {
+ uid = a_uids[i];
+ if (this.message_rows[uid]) {
+ if (this.message_rows[uid].classname.indexOf('deleted')<0) {
+ all_deleted = false;
+ break;
+ }
+ }
+ }
+
+ if (all_deleted)
+ this.flag_as_undeleted(a_uids);
+ else
+ this.flag_as_deleted(a_uids);
+
+ return true;
+ }
+ this.flag_as_undeleted = function(a_uids){
+ // if deleting message from "view message" don't bother with delete icon
+ if (this.env.action == "show")
+ return false;
+ var icn_src;
+
+ for (var i=0; i<a_uids.length; i++) {
+ uid = a_uids[i];
+ if (this.message_rows[uid]) {
+ this.message_rows[uid].deleted = false;
+
+ if (this.message_rows[uid].classname.indexOf('deleted') > 0) {
+ this.message_rows[uid].classname = this.message_rows[uid].classname.replace(/\s*deleted/, '');
+ this.set_classname(this.message_rows[uid].obj, 'deleted', false);
+ }
+ if (this.message_rows[uid].unread && this.env.unreadicon)
+ icn_src = this.env.unreadicon;
+ else if (this.message_rows[uid].replied && this.env.repliedicon)
+ icn_src = this.env.repliedicon;
+ else if (this.env.messageicon)
+ icn_src = this.env.messageicon;
+ if (this.message_rows[uid].icon && icn_src)
+ this.message_rows[uid].icon.src = icn_src;
+ }
+ }
+ this.http_request('mark', '_uid='+a_uids.join(',')+'&_flag=undelete');
+ return true;
+ }
+
+ this.flag_as_deleted = function(a_uids) {
+ // if deleting message from "view message" don't bother with delete icon
+ if (this.env.action == "show")
+ return false;
+
+ for (var i=0; i<a_uids.length; i++) {
+ uid = a_uids[i];
+ if (this.message_rows[uid]) {
+ this.message_rows[uid].deleted = true;
+
+ if (this.message_rows[uid].classname.indexOf('deleted')<0) {
+ this.message_rows[uid].classname += ' deleted';
+ this.set_classname(this.message_rows[uid].obj, 'deleted', true);
+ }
+ if (this.message_rows[uid].icon && this.env.deletedicon)
+ this.message_rows[uid].icon.src = this.env.deletedicon;
+ }
+ }
+ this.http_request('mark', '_uid='+a_uids.join(',')+'&_flag=delete');
+ return true;
+ }
/*********************************************************/
/********* message compose methods *********/
@@ -1704,6 +1932,7 @@
input_message.value = message;
this.env.identity = id;
+ return true;
};
@@ -1731,6 +1960,8 @@
// clear upload form
if (!a && this.gui_objects.attachmentform && this.gui_objects.attachmentform!=this.gui_objects.messageform)
this.gui_objects.attachmentform.reset();
+
+ return true;
};
@@ -1780,6 +2011,7 @@
// set reference to the form object
this.gui_objects.attachmentform = form;
+ return true;
};
@@ -1793,6 +2025,7 @@
var li = document.createElement('LI');
li.innerHTML = name;
this.gui_objects.attachmentlist.appendChild(li);
+ return true;
};
@@ -1801,8 +2034,32 @@
{
if (value)
this.http_request('addcontact', '_address='+value);
+
+ return true;
};
+ // send remote request to search mail
+ this.qsearch = function(value, mbox)
+ {
+ if (value && mbox)
+ {
+ this.clear_message_list();
+ this.set_busy(true, 'searching');
+ this.http_request('search', '_search='+value+'&_mbox='+mbox, true);
+ }
+ return true;
+ };
+
+ // reset quick-search form
+ this.reset_qsearch = function()
+ {
+ if (this.gui_objects.qsearchbox)
+ this.gui_objects.qsearchbox.value = '';
+
+ this.env.search_request = null;
+ return true;
+ };
+
/*********************************************************/
/********* keyboard live-search methods *********/
@@ -1843,6 +2100,7 @@
highlight.removeAttribute('id');
//highlight.removeAttribute('class');
this.set_classname(highlight, 'selected', false);
+ this.set_classname(highlight, 'unfocused', false);
}
if (next)
@@ -2102,6 +2360,7 @@
this.set_busy(true);
target.location.href = this.env.comm_path+'&_action='+action+'&_cid='+cid+add_url;
}
+ return true;
};
@@ -2138,6 +2397,7 @@
// send request to server
this.http_request('delete', '_cid='+a_cids.join(',')+'&_from='+(this.env.action ? this.env.action : ''));
+ return true;
};
@@ -2148,10 +2408,11 @@
return false;
var row = this.contact_rows[cid].obj;
- for (var c=0; c<cols_arr.length; c++)
+ for (var c=0; c<cols_arr.length; c++){
if (row.cells[c])
row.cells[c].innerHTML = cols_arr[c];
-
+ }
+ return true;
};
@@ -2172,6 +2433,8 @@
if (action == 'ldappublicsearch')
target.location.href = this.env.comm_path+'&_action='+action+add_url;
+
+ return true;
};
// add ldap contacts to address book
@@ -2209,7 +2472,7 @@
this.load_identity = function(id, action)
{
if (action=='edit-identity' && (!id || id==this.env.iid))
- return;
+ return false;
var add_url = '';
var target = window;
@@ -2225,6 +2488,7 @@
this.set_busy(true);
target.location.href = this.env.comm_path+'&_action='+action+'&_iid='+id+add_url;
}
+ return true;
};
@@ -2249,9 +2513,10 @@
// if (this.env.framed && id)
this.set_busy(true);
- location.href = this.env.comm_path+'&_action=delete-identity&_iid='+id;
+ location.href = this.env.comm_path+'&_action=delete-identity&_iid='+id;
// else if (id)
// this.http_request('delete-identity', '_iid='+id);
+ return true;
};
@@ -2574,8 +2839,10 @@
var current_li = document.getElementById('rcmbx'+s_current);
var mbox_li = document.getElementById('rcmbx'+s_mbox);
- if (current_li)
+ if (current_li) {
this.set_classname(current_li, 'selected', false);
+ this.set_classname(current_li, 'unfocused', false);
+ }
if (mbox_li)
this.set_classname(mbox_li, 'selected', true);
}
@@ -2594,7 +2861,8 @@
var rowcount = tbody.rows.length;
var even = rowcount%2;
- this.env.messages[uid] = {replied:flags.replied?1:0,
+ this.env.messages[uid] = {deleted:flags.deleted?1:0,
+ replied:flags.replied?1:0,
unread:flags.unread?1:0};
var row = document.createElement('TR');
@@ -2604,8 +2872,9 @@
if (this.in_selection(uid))
row.className += ' selected';
- var icon = flags.unread && this.env.unreadicon ? this.env.unreadicon :
- (flags.replied && this.env.repliedicon ? this.env.repliedicon : this.env.messageicon);
+ var icon = flags.deleted && this.env.deletedicon ? this.env.deletedicon:
+ (flags.unread && this.env.unreadicon ? this.env.unreadicon :
+ (flags.replied && this.env.repliedicon ? this.env.repliedicon : this.env.messageicon));
var col = document.createElement('TD');
col.className = 'icon';
@@ -2681,10 +2950,10 @@
}
// set unread count to window title
- if (set_title && document.title)
+ reg = /^\([0-9]+\)\s+/i;
+ if (set_title && count && document.title)
{
var doc_title = String(document.title);
- reg = /^\([0-9]+\)\s+/i;
if (count && doc_title.match(reg))
document.title = doc_title.replace(reg, '('+count+') ');
@@ -2692,6 +2961,11 @@
document.title = '('+count+') '+doc_title;
else
document.title = doc_title.replace(reg, '');
+ }
+ // remove unread count from window title
+ else if (document.title)
+ {
+ document.title = document.title.replace(reg, '');
}
};
@@ -2849,8 +3123,11 @@
this.http_response = function(request_obj)
{
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.set_busy(false);
@@ -2930,6 +3207,8 @@
};
+/* deprecated methods
+
// check if Shift-key is pressed on event
this.check_shiftkey = function(e)
{
@@ -2959,22 +3238,29 @@
else
return false;
}
+*/
-
-// returns modifier key (constants defined at top of file)
+ // returns modifier key (constants defined at top of file)
this.get_modifier = function(e)
{
var opcode = 0;
- if (e = e || window.event)
- {
+ e = e || window.event;
+
+ if (bw.mac && e)
+ {
+ opcode += (e.metaKey && CONTROL_KEY) + (e.shiftKey && SHIFT_KEY);
+ return opcode;
+ }
+ if (e)
+ {
opcode += (e.ctrlKey && CONTROL_KEY) + (e.shiftKey && SHIFT_KEY);
- return opcode;
- }
+ return opcode;
+ }
if (e.cancelBubble)
- {
+ {
e.cancelBubble = true;
e.returnValue = false;
- }
+ }
else if (e.preventDefault)
e.preventDefault();
}
--
Gitblit v1.9.1