From 4ca10b8d511d85a4d575af355b0a6739d5a05958 Mon Sep 17 00:00:00 2001
From: thomascube <thomas@roundcube.net>
Date: Fri, 15 Aug 2008 17:47:31 -0400
Subject: [PATCH] Enable spellchecker for HTML editor
---
program/js/app.js | 254 +++++++++++++++++++++++++++++++++++++++++---------
1 files changed, 205 insertions(+), 49 deletions(-)
diff --git a/program/js/app.js b/program/js/app.js
index 2cbd27b..c82ebf9 100644
--- a/program/js/app.js
+++ b/program/js/app.js
@@ -136,7 +136,7 @@
this.message_list.addEventListener('dragend', function(o){ p.drag_active = false; });
this.message_list.init();
- this.enable_command('toggle_status', true);
+ this.enable_command('toggle_status', 'toggle_flag', true);
if (this.gui_objects.mailcontframe)
{
@@ -185,7 +185,7 @@
{
if (this.gui_objects.remoteobjectsmsg)
this.gui_objects.remoteobjectsmsg.style.display = 'block';
- this.enable_command('load-images', true);
+ this.enable_command('load-images', 'always-load', true);
}
if (this.env.action=='compose')
@@ -195,6 +195,8 @@
{
this.env.spellcheck.spelling_state_observer = function(s){ ref.set_spellcheck_state(s); };
this.set_spellcheck_state('ready');
+ if (rcube_find_object('_is_html').value == '1')
+ this.display_spellcheck_controls(false);
}
if (this.env.drafts_mailbox)
this.enable_command('savedraft', true);
@@ -203,7 +205,10 @@
if (this.env.messagecount)
this.enable_command('select-all', 'select-none', 'expunge', true);
- if (this.env.messagecount && (this.env.mailbox==this.env.trash_mailbox || this.env.mailbox==this.env.junk_mailbox))
+ if (this.env.messagecount
+ && (this.env.mailbox == this.env.trash_mailbox || this.env.mailbox == this.env.junk_mailbox
+ || this.env.mailbox.match('^' + RegExp.escape(this.env.trash_mailbox) + RegExp.escape(this.env.delimiter))
+ || this.env.mailbox.match('^' + RegExp.escape(this.env.junk_mailbox) + RegExp.escape(this.env.delimiter))))
this.enable_command('purge', true);
this.set_page_buttons();
@@ -370,6 +375,7 @@
row.deleted = this.env.messages[uid].deleted ? true : false;
row.unread = this.env.messages[uid].unread ? true : false;
row.replied = this.env.messages[uid].replied ? true : false;
+ row.flagged = this.env.messages[uid].flagged ? true : false;
}
// set eventhandler to message icon
@@ -379,6 +385,24 @@
row.icon.id = 'msgicn_'+row.uid;
row.icon._row = row.obj;
row.icon.onmousedown = function(e) { p.command('toggle_status', this); };
+ }
+
+ // global variable 'flagged_col' may be not defined yet
+ if (!this.env.flagged_col && this.env.coltypes)
+ {
+ var found;
+ if((found = find_in_array('flag', this.env.coltypes)) >= 0)
+ this.set_env('flagged_col', found+1);
+ }
+
+ // set eventhandler to flag icon, if icon found
+ if (this.env.flagged_col && (row.flagged_icon = row.obj.cells[this.env.flagged_col].childNodes[0])
+ && row.flagged_icon.nodeName=='IMG')
+ {
+ var p = this;
+ row.flagged_icon.id = 'flaggedicn_'+row.uid;
+ row.flagged_icon._row = row.obj;
+ row.flagged_icon.onmousedown = function(e) { p.command('toggle_flag', this); };
}
};
@@ -705,6 +729,31 @@
this.mark_message(flag, uid);
break;
+ case 'toggle_flag':
+ if (props && !props._row)
+ break;
+
+ var uid;
+ var flag = 'flagged';
+
+ if (props._row.uid)
+ {
+ uid = props._row.uid;
+ this.message_list.dont_select = true;
+ // toggle flagged/unflagged
+ if (this.message_list.rows[uid].flagged)
+ flag = 'unflagged';
+ }
+ this.mark_message(flag, uid);
+ break;
+
+ case 'always-load':
+ if (this.env.uid && this.env.sender) {
+ this.add_contact(urlencode(this.env.sender));
+ window.setTimeout(function(){ ref.command('load-images'); }, 300);
+ break;
+ }
+
case 'load-images':
if (this.env.uid)
this.show_message(this.env.uid, true, this.env.action=='preview');
@@ -808,11 +857,13 @@
break;
case 'spellcheck':
- if (this.env.spellcheck && this.env.spellcheck.spellCheck && this.spellcheck_ready)
- {
+ if (window.tinyMCE && tinyMCE.get('compose-body')) {
+ tinyMCE.execCommand('mceSpellCheck', true);
+ }
+ else if (this.env.spellcheck && this.env.spellcheck.spellCheck && this.spellcheck_ready) {
this.env.spellcheck.spellCheck(this.env.spellcheck.check_link);
this.set_spellcheck_state('checking');
- }
+ }
break;
case 'savedraft':
@@ -1235,8 +1286,8 @@
if (!show && window.frames[this.env.contentframe])
{
if (window.frames[this.env.contentframe].location.href.indexOf(this.env.blankpage)<0)
- window.frames[this.env.contentframe].location.href = this.env.blankpage;
- }
+ window.frames[this.env.contentframe].location.href = this.env.blankpage;
+ }
else if (!bw.safari)
frm.style.display = show ? 'block' : 'none';
}
@@ -1397,13 +1448,13 @@
lock = true;
this.set_busy(true, 'movingmessage');
}
- else
+ else if (!this.env.flag_for_deletion)
this.show_contentframe(false);
// Hide message command buttons until a message is selected
this.enable_command('reply', 'reply-all', 'forward', 'delete', 'mark', 'print', false);
- this._with_selected_messages('moveto', lock, add_url);
+ this._with_selected_messages('moveto', lock, add_url, (this.env.flag_for_deletion ? false : true));
};
// delete selected messages from the current mailbox
@@ -1453,29 +1504,49 @@
return;
this.show_contentframe(false);
- this._with_selected_messages('delete', false, '&_from='+(this.env.action ? this.env.action : ''));
+ this._with_selected_messages('delete', false, '&_from='+(this.env.action ? this.env.action : ''), true);
};
// Send a specifc request with UIDs of all selected messages
// @private
- this._with_selected_messages = function(action, lock, add_url)
- {
+ this._with_selected_messages = function(action, lock, add_url, remove)
+ {
var a_uids = new Array();
if (this.env.uid)
a_uids[0] = this.env.uid;
else
- {
+ {
var selection = this.message_list.get_selection();
+ var rows = this.message_list.rows;
var id;
for (var n=0; n<selection.length; n++)
{
id = selection[n];
a_uids[a_uids.length] = id;
- this.message_list.remove_row(id, (n == selection.length-1));
+ if (remove)
+ this.message_list.remove_row(id, (n == selection.length-1));
+ else
+ {
+ rows[id].deleted = true;
+
+ if (rows[id].classname.indexOf('deleted')<0)
+ {
+ rows[id].classname += ' deleted';
+ this.set_classname(rows[id].obj, 'deleted', true);
+ }
+ if (this.env.read_when_deleted)
+ {
+ rows[id].classname = rows[id].classname.replace(/\s*unread/, '');
+ this.set_classname(rows[id].obj, 'unread', false);
+ }
+
+ if (rows[id].icon && this.env.deletedicon)
+ rows[id].icon.src = this.env.deletedicon;
}
}
+ }
// also send search request to get the right messages
if (this.env.search_request)
@@ -1483,7 +1554,7 @@
// send request to server
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
@@ -1501,7 +1572,7 @@
{
for (var n=0; n<selection.length; n++)
{
- a_uids[a_uids.length] = selection[n];
+ a_uids[a_uids.length] = selection[n];
}
}
@@ -1512,12 +1583,14 @@
{
id = a_uids[n];
if ((flag=='read' && this.message_list.rows[id].unread)
- || (flag=='unread' && !this.message_list.rows[id].unread)
+ || (flag=='unread' && !this.message_list.rows[id].unread)
|| (flag=='delete' && !this.message_list.rows[id].deleted)
- || (flag=='undelete' && this.message_list.rows[id].deleted))
- {
- r_uids[r_uids.length] = id;
- }
+ || (flag=='undelete' && this.message_list.rows[id].deleted)
+ || (flag=='flagged' && !this.message_list.rows[id].flagged)
+ || (flag=='unflagged' && this.message_list.rows[id].flagged))
+ {
+ r_uids[r_uids.length] = id;
+ }
}
// nothing to do
@@ -1533,6 +1606,10 @@
case 'delete':
case 'undelete':
this.toggle_delete_status(r_uids);
+ break;
+ case 'flagged':
+ case 'unflagged':
+ this.toggle_flagged_status(flag, a_uids);
break;
}
};
@@ -1568,7 +1645,7 @@
}
if (rows[uid].icon && icn_src
- && !(rows[uid].replied && this.env.repliedicon)
+ && !(rows[uid].replied && this.env.repliedicon)
&& !(rows[uid].deleted && this.env.deletedicon))
rows[uid].icon.src = icn_src;
}
@@ -1589,17 +1666,43 @@
parent.rcmail.set_classname(rows[uid].obj, 'unread', false);
if (rows[uid].replied && parent.rcmail.env.repliedicon)
- icn_src = parent.rcmail.env.repliedicon;
+ icn_src = parent.rcmail.env.repliedicon;
else if (rows[uid].deleted && parent.rcmail.env.deletedicon)
- icn_src = parent.rcmail.env.deletedicon;
+ icn_src = parent.rcmail.env.deletedicon;
else if (parent.rcmail.env.messageicon)
icn_src = parent.rcmail.env.messageicon;
- if (rows[uid].icon && icn_src)
+ if (rows[uid].icon && icn_src)
rows[uid].icon.src = icn_src;
}
}
+
+ // set image to flagged or unflagged
+ this.toggle_flagged_status = function(flag, a_uids)
+ {
+ // mark all message rows as flagged/unflagged
+ var icn_src;
+ var rows = this.message_list.rows;
+ for (var i=0; i<a_uids.length; i++)
+ {
+ uid = a_uids[i];
+ if (rows[uid])
+ {
+ rows[uid].flagged = (flag=='flagged' ? true : false);
+
+ if (rows[uid].flagged && this.env.flaggedicon)
+ icn_src = this.env.flaggedicon;
+ else if (this.env.unflaggedicon)
+ icn_src = this.env.unflaggedicon;
+
+ if (rows[uid].flagged_icon && icn_src)
+ rows[uid].flagged_icon.src = icn_src;
+ }
+ }
+
+ this.http_post('mark', '_uid='+a_uids.join(',')+'&_flag='+flag);
+ };
// mark all message rows as deleted/undeleted
this.toggle_delete_status = function(a_uids)
@@ -1685,16 +1788,21 @@
rows[uid].deleted = true;
if (rows[uid].classname.indexOf('deleted')<0)
- {
+ {
rows[uid].classname += ' deleted';
this.set_classname(rows[uid].obj, 'deleted', true);
}
-
- if (rows[uid].icon && this.env.deletedicon)
+ if (this.env.read_when_deleted)
+ {
+ rows[uid].classname = rows[uid].classname.replace(/\s*unread/, '');
+ this.set_classname(rows[uid].obj, 'unread', false);
+ }
+
+ if (rows[uid].icon && this.env.deletedicon)
rows[uid].icon.src = this.env.deletedicon;
- if (rows[uid].unread)
- r_uids[r_uids.length] = uid;
+ if (rows[uid].unread)
+ r_uids[r_uids.length] = uid;
}
}
@@ -1723,7 +1831,7 @@
if (rows[uid])
{
rows[uid].unread = false;
- rows[uid].read = true;
+ rows[uid].read = true;
rows[uid].classname = rows[uid].classname.replace(/\s*unread/, '');
this.set_classname(rows[uid].obj, 'unread', false);
@@ -1795,17 +1903,27 @@
}
// check for empty body
- if ((input_message.value == '' &&
- (!window.tinyMCE || tinyMCE.get('compose-body').getContent() == '')) &&
- !confirm(this.get_label('nobodywarning')))
+ if ((!window.tinyMCE || !tinyMCE.get('compose-body')) && input_message.value == '' && !confirm(this.get_label('nobodywarning')))
{
input_message.focus();
+ return false;
+ }
+ else if (window.tinyMCE && tinyMCE.get('compose-body') && !tinyMCE.get('compose-body').getContent() && !confirm(this.get_label('nobodywarning')))
+ {
+ tinyMCE.get('compose-body').focus();
return false;
}
return true;
};
+ this.display_spellcheck_controls = function(vis)
+ {
+ if (this.env.spellcheck) {
+ this.env.spellcheck.check_link.style.visibility = vis ? 'visible' : 'hidden';
+ this.env.spellcheck.switch_lan_pic.style.visibility = vis ? 'visible' : 'hidden';
+ }
+ };
this.set_spellcheck_state = function(s)
{
@@ -1838,9 +1956,9 @@
var input_cc = rcube_find_object('_cc');
var input_bcc = rcube_find_object('_bcc');
var input_subject = rcube_find_object('_subject');
- var input_message = rcube_find_object('_message');
-
+ var editor, input_message;
var str = '';
+
if (input_to && input_to.value)
str += input_to.value+':';
if (input_cc && input_cc.value)
@@ -1849,8 +1967,14 @@
str += input_bcc.value+':';
if (input_subject && input_subject.value)
str += input_subject.value+':';
- if (input_message && input_message.value)
+
+ if (editor = tinyMCE.get('compose-body'))
+ str += editor.getContent();
+ else
+ {
+ input_message = rcube_find_object('_message');
str += input_message.value;
+ }
if (save)
this.cmp_hash = str;
@@ -2089,10 +2213,10 @@
};
- this.sent_successfully = function(msg)
+ this.sent_successfully = function(type, msg)
{
this.list_mailbox();
- this.display_message(msg, 'confirmation', true);
+ this.display_message(msg, type, true);
}
@@ -2733,7 +2857,7 @@
if (this.name_input.__parent)
newname = this.name_input.__parent + this.env.delimiter + newname;
- this.http_post('rename-folder', '_folder_oldname='+urlencode(this.env.subscriptionrows[this.edit_folder][0])+'&_folder_newname='+urlencode(newname));
+ this.http_post('rename-folder', '_folder_oldname='+urlencode(this.env.subscriptionrows[this.edit_folder][0])+'&_folder_newname='+urlencode(newname), true);
}
}
// escape
@@ -2764,7 +2888,6 @@
// add a new folder to the subscription list by cloning a folder row
this.add_folder_row = function(name, display_name, replace, before)
{
- name = name.replace('\\',"");
if (!this.gui_objects.subscriptionlist)
return false;
@@ -3213,9 +3336,12 @@
cell.id = 'rcmHead'+col;
}
-
- if (col == 'subject' && this.message_list)
+ else if (col == 'subject' && this.message_list)
this.message_list.subject_col = n+1;
+ else if (col == 'flag' && this.env.unflaggedicon)
+ {
+ cell.innerHTML = '<img src="'+this.env.unflaggedicon+'" alt="" />';
+ }
}
};
@@ -3231,7 +3357,8 @@
this.env.messages[uid] = {deleted:flags.deleted?1:0,
replied:flags.replied?1:0,
- unread:flags.unread?1:0};
+ unread:flags.unread?1:0,
+ flagged:flags.flagged?1:0};
var row = document.createElement('TR');
row.id = 'rcmrow'+uid;
@@ -3246,7 +3373,7 @@
var col = document.createElement('TD');
col.className = 'icon';
- col.innerHTML = icon ? '<img src="'+icon+'" alt="" border="0" />' : '';
+ col.innerHTML = icon ? '<img src="'+icon+'" alt="" />' : '';
row.appendChild(col);
// add each submitted col
@@ -3255,13 +3382,23 @@
var c = this.coltypes[n];
col = document.createElement('TD');
col.className = String(c).toLowerCase();
- col.innerHTML = cols[c];
+
+ if (c=='flag')
+ {
+ if (flags.flagged && this.env.flaggedicon)
+ col.innerHTML = '<img src="'+this.env.flaggedicon+'" alt="" />';
+ else if(this.env.unflaggedicon)
+ col.innerHTML = '<img src="'+this.env.unflaggedicon+'" alt="" />';
+ }
+ else
+ col.innerHTML = cols[c];
+
row.appendChild(col);
}
col = document.createElement('TD');
col.className = 'icon';
- col.innerHTML = attachment && this.env.attachmenticon ? '<img src="'+this.env.attachmenticon+'" alt="" border="0" />' : '';
+ col.innerHTML = attachment && this.env.attachmenticon ? '<img src="'+this.env.attachmenticon+'" alt="" />' : '';
row.appendChild(col);
this.message_list.insert_row(row, attop);
@@ -3278,6 +3415,13 @@
this.set_page_buttons();
};
+
+ // replace content of mailboxname display
+ this.set_mailboxname = function(content)
+ {
+ if (this.gui_objects.mailboxname && content)
+ this.gui_objects.mailboxname.innerHTML = content;
+ };
// replace content of quota display
this.set_quota = function(content)
@@ -3377,6 +3521,14 @@
tinyMCE.execCommand('mceRemoveControl', true, textAreaId);
}
};
+
+
+ this.toggle_prefer_html = function(checkbox)
+ {
+ var addrbook_show_images;
+ if (addrbook_show_images = document.getElementById('rcmfd_addrbook_show_images'))
+ addrbook_show_images.disabled = !checkbox.checked;
+ }
@@ -3524,7 +3676,11 @@
case 'check-recent':
case 'getunread':
this.enable_command('show', 'expunge', 'select-all', 'select-none', 'sort', (this.env.messagecount > 0));
- this.enable_command('purge', (this.env.messagecount && (this.env.mailbox==this.env.trash_mailbox || this.env.mailbox==this.env.junk_mailbox)));
+ var mailboxtest = (this.env.mailbox == this.env.trash_mailbox || this.env.mailbox == this.env.junk_mailbox
+ || this.env.mailbox.match('^' + RegExp.escape(this.env.trash_mailbox) + RegExp.escape(this.env.delimiter))
+ || this.env.mailbox.match('^' + RegExp.escape(this.env.junk_mailbox) + RegExp.escape(this.env.delimiter))) ? true : false;
+
+ this.enable_command('purge', (this.env.messagecount && mailboxtest));
break;
--
Gitblit v1.9.1