From 5c024015f02ed5b0b772f8fff5bfe8aa6dab1d93 Mon Sep 17 00:00:00 2001
From: alecpl <alec@alec.pl>
Date: Wed, 23 Jun 2010 04:02:37 -0400
Subject: [PATCH] - Fix quota indicator position on Opera 10.10
---
program/js/app.js | 285 ++++++++++++++++++++++++++++++++++++---------------------
1 files changed, 180 insertions(+), 105 deletions(-)
diff --git a/program/js/app.js b/program/js/app.js
index 7cf6efc..666726c 100644
--- a/program/js/app.js
+++ b/program/js/app.js
@@ -166,7 +166,7 @@
this.message_list = new rcube_list_widget(this.gui_objects.messagelist, {
multiselect:true, multiexpand:true, draggable:true, keyboard:true,
- column_movable:this.env.col_movable, column_fixed:0, dblclick_time:this.dblclick_time
+ column_movable:this.env.col_movable, dblclick_time:this.dblclick_time
});
this.message_list.row_init = function(o){ p.init_message_row(o); };
this.message_list.addEventListener('dblclick', function(o){ p.msglist_dbl_click(o); });
@@ -199,9 +199,11 @@
if (this.env.trash_mailbox && this.env.mailbox != this.env.trash_mailbox)
this.set_alttext('delete', 'movemessagetotrash');
+ this.env.message_commands = ['show', 'reply', 'reply-all', 'forward', 'moveto', 'copy', 'delete',
+ 'open', 'mark', 'edit', 'viewsource', 'download', 'print', 'load-attachment', 'load-headers'];
+
if (this.env.action=='show' || this.env.action=='preview') {
- this.enable_command('show', 'reply', 'reply-all', 'forward', 'moveto', 'copy', 'delete',
- 'open', 'mark', 'edit', 'viewsource', 'download', 'print', 'load-attachment', 'load-headers', true);
+ this.enable_command(this.env.message_commands, this.env.uid);
if (this.env.next_uid) {
this.enable_command('nextmessage', 'lastmessage', true);
@@ -241,7 +243,7 @@
this.init_messageform();
}
// show printing dialog
- else if (this.env.action == 'print')
+ else if (this.env.action == 'print' && this.env.uid)
window.print();
// get unread count for each mailbox
@@ -1047,21 +1049,25 @@
return obj ? false : true;
};
- // set command enabled or disabled
+ // set command(s) enabled or disabled
this.enable_command = function()
{
- var args = arguments, len = args.length;
- if (!len)
- return -1;
+ var args = Array.prototype.slice.call(arguments),
+ enable = args.pop(), cmd;
- var command, enable = args[len-1];
-
- for (var n=0, len=len-1; n<len; n++) {
- command = args[n];
- this.commands[command] = enable;
- this.set_button(command, (enable ? 'act' : 'pas'));
+ for (var n=0; n<args.length; n++) {
+ cmd = args[n];
+ // argument of type array
+ if (typeof cmd === 'string') {
+ this.commands[cmd] = enable;
+ this.set_button(cmd, (enable ? 'act' : 'pas'));
+ }
+ // push array elements into commands array
+ else {
+ for (var i in cmd)
+ args.push(cmd[i]);
+ }
}
- return true;
};
// lock/unlock interface
@@ -1237,7 +1243,11 @@
var boffset = bw.ie ? -document.documentElement.scrollTop : this.initialBodyScrollTop;
var moffset = this.initialListScrollTop-this.gui_objects.folderlist.parentNode.scrollTop;
var toffset = -moffset-boffset;
- var li, div, pos, mouse;
+ var li, div, pos, mouse, check, oldclass,
+ layerclass = 'draglayernormal';
+
+ if (this.contact_list && this.contact_list.draglayer)
+ oldclass = this.contact_list.draglayer.attr('class');
mouse = rcube_event.get_mouse_pos(e);
pos = this.env.folderlist_coords;
@@ -1250,6 +1260,8 @@
this.env.folder_coords[this.env.last_folder_target].on = 0;
this.env.last_folder_target = null;
}
+ if (layerclass != oldclass && this.contact_list && this.contact_list.draglayer)
+ this.contact_list.draglayer.attr('class', layerclass);
return;
}
@@ -1257,7 +1269,7 @@
for (var k in this.env.folder_coords) {
pos = this.env.folder_coords[k];
if (mouse.x >= pos.x1 && mouse.x < pos.x2 && mouse.y >= pos.y1 && mouse.y < pos.y2){
- if (this.check_droptarget(k)) {
+ if ((check = this.check_droptarget(k))) {
li = this.get_folder_li(k);
div = $(li.getElementsByTagName('div')[0]);
@@ -1280,6 +1292,7 @@
$(li).addClass('droptarget');
this.env.folder_coords[k].on = 1;
this.env.last_folder_target = k;
+ layerclass = 'draglayer' + (check > 1 ? 'copy' : 'normal');
} else { // Clear target, otherwise drag end will trigger move into last valid droptarget
this.env.last_folder_target = null;
}
@@ -1289,6 +1302,9 @@
this.env.folder_coords[k].on = 0;
}
}
+
+ if (layerclass != oldclass && this.contact_list && this.contact_list.draglayer)
+ this.contact_list.draglayer.attr('class', layerclass);
}
};
@@ -1398,9 +1414,12 @@
var selected = list.get_single_selection() != null;
+ this.enable_command(this.env.message_commands, selected);
// Hide certain command buttons when Drafts folder is selected
- this.enable_command('reply', 'reply-all', 'forward', this.env.mailbox == this.env.drafts_mailbox ? false : selected);
- this.enable_command('show', 'print', 'open', 'edit', 'download', 'viewsource', selected);
+ if (selected && this.env.mailbox == this.env.drafts_mailbox) {
+ this.enable_command('reply', 'reply-all', 'forward', false);
+ }
+ // Multi-message commands
this.enable_command('delete', 'moveto', 'copy', 'mark', (list.selection.length > 0 ? true : false));
// reset all-pages-selection
@@ -1476,13 +1495,13 @@
if (this.env.messages[row.uid])
this.env.messages[row.uid].expanded = row.expanded;
};
-
+
this.msglist_set_coltypes = function(list)
{
var i, found, name, cols = list.list.tHead.rows[0].cells;
-
+
this.env.coltypes = [];
-
+
for (i=0; i<cols.length; i++)
if (cols[i].id && cols[i].id.match(/^rcm/)) {
name = cols[i].id.replace(/^rcm/, '');
@@ -1492,21 +1511,35 @@
if ((found = $.inArray('flag', this.env.coltypes)) >= 0)
this.set_env('flagged_col', found);
+ if ((found = $.inArray('subject', this.env.coltypes)) >= 0)
+ this.set_env('subject_col', found);
+
this.http_post('save-pref', { '_name':'list_cols', '_value':this.env.coltypes });
};
this.check_droptarget = function(id)
{
+ var allow = false, copy = false;
+
if (this.task == 'mail')
- return (this.env.mailboxes[id] && this.env.mailboxes[id].id != this.env.mailbox && !this.env.mailboxes[id].virtual);
- else if (this.task == 'addressbook')
- return (id != this.env.source && this.env.contactfolders[id] && !this.env.contactfolders[id].readonly &&
- !(!this.env.source && this.env.contactfolders[id].group) &&
- !(this.env.contactfolders[id].type == 'group' && this.env.contactfolders[this.env.source].readonly) &&
- !(this.env.contactfolders[id].type == 'group' && this.env.contactfolders[id].source != this.env.source) &&
- !(this.env.contactfolders[id].type == 'group' && this.env.contactfolders[id].id == this.env.group));
+ allow = (this.env.mailboxes[id] && this.env.mailboxes[id].id != this.env.mailbox && !this.env.mailboxes[id].virtual);
else if (this.task == 'settings')
- return (id != this.env.folder);
+ allow = (id != this.env.folder);
+ else if (this.task == 'addressbook') {
+ if (id != this.env.source && this.env.contactfolders[id]) {
+ if (this.env.contactfolders[id].type == 'group') {
+ var target_abook = this.env.contactfolders[id].source;
+ allow = this.env.contactfolders[id].id != this.env.group && !this.env.contactfolders[target_abook].readonly;
+ copy = target_abook != this.env.source;
+ }
+ else {
+ allow = !this.env.contactfolders[id].readonly;
+ copy = true;
+ }
+ }
+ }
+
+ return allow ? (copy ? 2 : 1) : 0;
};
@@ -1561,7 +1594,9 @@
depth: flags.depth?flags.depth:0,
unread_children: flags.unread_children?flags.unread_children:0,
parent_uid: flags.parent_uid?flags.parent_uid:0,
- selected: this.select_all_mode || this.message_list.in_selection(uid)
+ selected: this.select_all_mode || this.message_list.in_selection(uid),
+ // flags from plugins
+ flags: flags.extra_flags
});
var c, tree = expando = '',
@@ -1636,11 +1671,6 @@
tree += icon ? '<img id="msgicn'+uid+'" src="'+icon+'" alt="" class="msgicon" />' : '';
- // first col is always there
- col.className = 'threads';
- col.innerHTML = expando;
- row.appendChild(col);
-
// build subject link
if (!bw.ie && cols.subject) {
var action = flags.mbox == this.env.drafts_mailbox ? 'compose' : 'show';
@@ -1662,6 +1692,8 @@
else if(!flags.flagged && this.env.unflaggedicon)
html = '<img id="flaggedicn'+uid+'" src="'+this.env.unflaggedicon+'" class="flagicon" alt="" />';
}
+ else if (c == 'threads')
+ html = expando;
else if (c == 'attachment')
html = flags.attachment && this.env.attachmenticon ? '<img src="'+this.env.attachmenticon+'" alt="" />' : ' ';
else if (c == 'subject')
@@ -1721,15 +1753,15 @@
name = oldcols[i] == 'to' ? 'from' : oldcols[i];
idx = $.inArray(name, cols);
if (idx != -1) {
- newcols[newcols.length] = name;
+ newcols.push(name);
delete cols[idx];
}
}
for (i=0; i<cols.length; i++)
if (cols[i])
- newcols[newcols.length] = cols[i];
+ newcols.push(cols[i]);
- if (newcols.join() != this.env.coltypes.join()) {
+ if (newcols.join() != oldcols.join()) {
update = 1;
add_url += '&_cols=' + newcols.join(',');
}
@@ -1864,6 +1896,7 @@
this.env.current_page = page;
this.select_all_mode = false;
this.show_contentframe(false);
+ this.env.messages = {};
}
if (mbox != this.env.mailbox || (mbox == this.env.mailbox && !page && !sort))
@@ -2228,8 +2261,6 @@
rows[uid].forwarded = status;
else if (flag == 'flagged')
rows[uid].flagged = status;
-
-// this.env.messages[uid] = rows[uid];
};
// set message row status, class and icon
@@ -2325,7 +2356,7 @@
this.show_contentframe(false);
// Hide message command buttons until a message is selected
- this.enable_command('reply', 'reply-all', 'forward', 'delete', 'mark', 'print', 'open', 'edit', 'viewsource', 'download', false);
+ this.enable_command(this.env.message_commands, false);
this._with_selected_messages('moveto', lock, add_url);
};
@@ -3446,7 +3477,7 @@
for (i=0; i < a_results.length; i++) {
text = typeof a_results[i] == 'object' ? a_results[i].name : a_results[i];
li = document.createElement('LI');
- li.innerHTML = text.replace(new RegExp('('+s_val+')', 'ig'), '##$1%%').replace(/</g, '<').replace(/>/g, '>').replace(/##([^%]+)%%/g, '<b>$1</b>');
+ li.innerHTML = text.replace(new RegExp('('+RegExp.escape(s_val)+')', 'ig'), '##$1%%').replace(/</g, '<').replace(/>/g, '>').replace(/##([^%]+)%%/g, '<b>$1</b>');
li.onmouseover = function(){ ref.ksearch_select(this); };
li.onmouseup = function(){ ref.ksearch_click(this) };
li._rcm_id = i;
@@ -3624,10 +3655,24 @@
if (!cid)
cid = this.contact_list.get_selection().join(',');
- if (to.type == 'group')
- this.http_post('group-addmembers', '_cid='+urlencode(cid)+'&_source='+urlencode(this.env.source)+'&_gid='+urlencode(to.id));
- else if (to.id != this.env.source && cid && this.env.address_sources[to.id] && !this.env.address_sources[to.id].readonly)
- this.http_post('copy', '_cid='+urlencode(cid)+'&_source='+urlencode(this.env.source)+'&_to='+urlencode(to.id)+(this.env.group ? '&_gid='+urlencode(this.env.group) : ''));
+ if (to.type == 'group' && to.source == this.env.source) {
+ this.http_post('group-addmembers', '_cid='+urlencode(cid)
+ + '&_source='+urlencode(this.env.source)
+ + '&_gid='+urlencode(to.id));
+ }
+ else if (to.type == 'group' && !this.env.address_sources[to.source].readonly) {
+ this.http_post('copy', '_cid='+urlencode(cid)
+ + '&_source='+urlencode(this.env.source)
+ + '&_to='+urlencode(to.source)
+ + '&_togid='+urlencode(to.id)
+ + (this.env.group ? '&_gid='+urlencode(this.env.group) : ''));
+ }
+ else if (to.id != this.env.source && cid && this.env.address_sources[to.id] && !this.env.address_sources[to.id].readonly) {
+ this.http_post('copy', '_cid='+urlencode(cid)
+ + '&_source='+urlencode(this.env.source)
+ + '&_to='+urlencode(to.id)
+ + (this.env.group ? '&_gid='+urlencode(this.env.group) : ''));
+ }
};
@@ -3770,7 +3815,7 @@
{
var li, key = 'G'+prop.source+prop.id;
if ((li = this.get_folder_li(key))) {
- this.triggerEvent('removegroup', { source:prop.source, id:prop.id, li:li });
+ this.triggerEvent('group_delete', { source:prop.source, id:prop.id, li:li });
li.parentNode.removeChild(li);
delete this.env.contactfolders[key];
@@ -3837,11 +3882,12 @@
var link = $('<a>').attr('href', '#')
.bind('click', function() { return rcmail.command('listgroup', prop, this);})
.html(prop.name);
- var li = $('<li>').attr('id', 'rcmli'+key).addClass('contactgroup').append(link);
- var pli = this.get_folder_li(prop.source)
- $(li).insertAfter(pli);
+ var li = $('<li>').attr('id', 'rcmli'+key)
+ .addClass('contactgroup')
+ .append(link)
+ .insertAfter(this.get_folder_li(prop.source));
- this.triggerEvent('insertgroup', { id:prop.id, source:prop.source, name:prop.name, li:li[0] });
+ this.triggerEvent('group_insert', { id:prop.id, source:prop.source, name:prop.name, li:li[0] });
};
// callback for renaming a contact group
@@ -3855,7 +3901,7 @@
link.innerHTML = prop.name;
this.env.contactfolders[key].name = this.env.contactgroups[key].name = name;
- this.triggerEvent('updategroup', { id:prop.id, source:prop.source, name:prop.name, li:li[0] });
+ this.triggerEvent('group_update', { id:prop.id, source:prop.source, name:prop.name, li:li[0] });
};
@@ -4556,58 +4602,54 @@
// for reordering column array (Konqueror workaround)
// and for setting some message list global variables
this.set_message_coltypes = function(coltypes, repl)
- {
+ {
this.env.coltypes = coltypes;
// set correct list titles
- var thead = this.gui_objects.messagelist ? this.gui_objects.messagelist.tHead : null;
+ var thead = this.gui_objects.messagelist ? this.gui_objects.messagelist.tHead : null,
+ cell, col, n, len;
// replace old column headers
- if (thead && repl) {
- for (var cell, c=0; c < repl.length; c++) {
- cell = thead.rows[0].cells[c];
- if (!cell) {
+ if (thead) {
+ if (repl) {
+ var th = document.createElement('thead'),
+ tr = document.createElement('tr');
+ for (c=0, len=repl.length; c < len; c++) {
cell = document.createElement('td');
- thead.rows[0].appendChild(cell);
+ cell.innerHTML = repl[c].html;
+ if (repl[c].id) cell.id = repl[c].id;
+ if (repl[c].className) cell.className = repl[c].className;
+ tr.appendChild(cell);
}
- cell.innerHTML = repl[c].html;
- if (repl[c].id) cell.id = repl[c].id;
- if (repl[c].className) cell.className = repl[c].className;
+ th.appendChild(tr);
+ thead.parentNode.replaceChild(th, thead);
+ }
+
+ for (n=0, len=this.env.coltypes.length; n<len; n++) {
+ col = this.env.coltypes[n];
+ if ((cell = thead.rows[0].cells[n]) && (col=='from' || col=='to')) {
+ cell.id = 'rcm'+col;
+ // if we have links for sorting, it's a bit more complicated...
+ if (cell.firstChild && cell.firstChild.tagName.toLowerCase()=='a') {
+ cell = cell.firstChild;
+ cell.onclick = function(){ return rcmail.command('sort', this.__col, this); };
+ cell.__col = col;
+ }
+ cell.innerHTML = this.get_label(col);
+ }
}
}
-
- var cell, col, n;
- for (n=0; thead && n<this.env.coltypes.length; n++) {
- col = this.env.coltypes[n];
- if ((cell = thead.rows[0].cells[n+1]) && (col=='from' || col=='to')) {
- // if we have links for sorting, it's a bit more complicated...
- if (cell.firstChild && cell.firstChild.tagName.toLowerCase()=='a') {
- cell.firstChild.innerHTML = this.get_label(this.env.coltypes[n]);
- cell.firstChild.onclick = function(){ return rcmail.command('sort', this.__col, this); };
- cell.firstChild.__col = col;
- }
- else
- cell.innerHTML = this.get_label(this.env.coltypes[n]);
-
- cell.id = 'rcm'+col;
- }
- }
-
- // remove excessive columns
- for (var i=n+1; thead && i<thead.rows[0].cells.length; i++)
- thead.rows[0].removeChild(thead.rows[0].cells[i]);
this.env.subject_col = null;
this.env.flagged_col = null;
- var found;
- if ((found = $.inArray('subject', this.env.coltypes)) >= 0) {
- this.set_env('subject_col', found);
+ if ((n = $.inArray('subject', this.env.coltypes)) >= 0) {
+ this.set_env('subject_col', n);
if (this.message_list)
- this.message_list.subject_col = found+1;
+ this.message_list.subject_col = n;
}
- if ((found = $.inArray('flag', this.env.coltypes)) >= 0)
- this.set_env('flagged_col', found);
+ if ((n = $.inArray('flag', this.env.coltypes)) >= 0)
+ this.set_env('flagged_col', n);
this.message_list.init_header();
};
@@ -4632,7 +4674,7 @@
this.set_quota = function(content)
{
if (content && this.gui_objects.quotadisplay) {
- if (typeof(content) == 'object')
+ if (typeof(content) == 'object' && content.type == 'image')
this.percent_indicator(this.gui_objects.quotadisplay, content);
else
$(this.gui_objects.quotadisplay).html(content);
@@ -4783,6 +4825,9 @@
quota_width = parseInt(quota / 100 * width),
pos = $(obj).position();
+ // Opera bug?
+ pos.top = Math.max(0, pos.top);
+
this.env.indicator_width = width;
this.env.indicator_height = height;
@@ -4791,6 +4836,9 @@
quota_width = width;
quota = 100;
}
+
+ if (data.title)
+ data.title = this.get_label('quota') + ': ' + data.title;
// main div
var main = $('<div>');
@@ -4822,6 +4870,8 @@
// replace quota image
$(obj).html('').append(bar1).append(bar2).append(main);
+ // update #quotaimg title
+ $('#quotaimg').attr('title', data.title);
};
/********************************************************/
@@ -4874,8 +4924,18 @@
// send a http request to the server
this.http_request = function(action, querystring, lock)
{
+ // trigger plugin hook
+ var result = this.triggerEvent('request'+action, querystring);
+ if (typeof result != 'undefined') {
+ // abort if one the handlers returned false
+ if (result === false)
+ return false;
+ else
+ querystring = result;
+ }
+
querystring += (querystring ? '&' : '') + '_remote=1';
- var url = this.env.comm_path + '&_action=' + action + '&' + querystring
+ var url = this.env.comm_path + '&_action=' + action + '&' + querystring;
// send request
console.log('HTTP GET: ' + url);
@@ -4893,6 +4953,16 @@
}
else
postdata += (postdata ? '&' : '') + '_remote=1' + (lock ? '&_unlock=1' : '');
+
+ // trigger plugin hook
+ var result = this.triggerEvent('request'+action, postdata);
+ if (typeof result != 'undefined') {
+ // abort if one the handlers returned false
+ if (result === false)
+ return false;
+ else
+ postdata = result;
+ }
// send request
console.log('HTTP POST: ' + url);
@@ -4929,6 +4999,7 @@
if (response.callbacks && response.callbacks.length) {
for (var i=0; i < response.callbacks.length; i++)
this.triggerEvent(response.callbacks[i][0], response.callbacks[i][1]);
+ }
// process the response data according to the sent action
switch (response.action) {
@@ -4943,21 +5014,25 @@
case 'moveto':
if (this.env.action == 'show') {
// re-enable commands on move/delete error
- this.enable_command('reply', 'reply-all', 'forward', 'delete', 'mark', 'print', 'open', 'edit', 'viewsource', 'download', true);
+ this.enable_command(this.env.message_commands, true);
}
- break;
+ else if (this.task == 'addressbook') {
+ this.triggerEvent('listupdate', { folder:this.env.source, rowcount:this.contact_list.rowcount });
+ }
case 'purge':
case 'expunge':
- if (!this.env.messagecount && this.task == 'mail') {
- // clear preview pane content
- if (this.env.contentframe)
- this.show_contentframe(false);
- // disable commands useless when mailbox is empty
- this.enable_command('show', 'reply', 'reply-all', 'forward', 'moveto', 'copy', 'delete',
- 'mark', 'viewsource', 'open', 'edit', 'download', 'print', 'load-attachment',
- 'purge', 'expunge', 'select-all', 'select-none', 'sort',
- 'expand-all', 'expand-unread', 'collapse-all', false);
+ if (this.task == 'mail') {
+ if (!this.env.messagecount) {
+ // clear preview pane content
+ if (this.env.contentframe)
+ this.show_contentframe(false);
+ // disable commands useless when mailbox is empty
+ this.enable_command(this.env.message_commands, 'purge', 'expunge',
+ 'select-all', 'select-none', 'sort', 'expand-all', 'expand-unread', 'collapse-all', false);
+ }
+ if (this.message_list)
+ this.triggerEvent('listupdate', { folder:this.env.mailbox, rowcount:this.message_list.rowcount });
}
break;
@@ -5011,9 +5086,9 @@
if (this._int)
clearInterval(this._int);
- if (this.env.keep_alive && !this.env.framed && this.task=='mail' && this.gui_objects.mailboxlist)
+ if (this.env.keep_alive && !this.env.framed && this.task == 'mail' && this.gui_objects.mailboxlist)
this._int = setInterval(function(){ ref.check_for_recent(false); }, this.env.keep_alive * 1000);
- else if (this.env.keep_alive && !this.env.framed && this.task!='login')
+ else if (this.env.keep_alive && !this.env.framed && this.task != 'login' && this.env.action != 'print')
this._int = setInterval(function(){ ref.send_keep_alive(); }, this.env.keep_alive * 1000);
};
--
Gitblit v1.9.1