From 7f5a849e7816e7b4c7b13a72d38a9c777632d7cd Mon Sep 17 00:00:00 2001
From: alecpl <alec@alec.pl>
Date: Thu, 07 Jul 2011 07:44:26 -0400
Subject: [PATCH] - Added possibility to undo last contact delete operation
---
skins/default/functions.js | 443 +++++++++++++++++++++++++++++++++++++++----------------
1 files changed, 313 insertions(+), 130 deletions(-)
diff --git a/skins/default/functions.js b/skins/default/functions.js
index 877d152..603c703 100644
--- a/skins/default/functions.js
+++ b/skins/default/functions.js
@@ -1,5 +1,5 @@
/**
- * RoundCube functions for default skin interface
+ * Roundcube functions for default skin interface
*/
/**
@@ -13,12 +13,64 @@
tab = '#settingstab' + (rcmail.env.action=='preferences' ? 'default' : (rcmail.env.action.indexOf('identity')>0 ? 'identities' : rcmail.env.action.replace(/\./g, '')));
$(tab).addClass('tablink-selected');
- $(tab + '> a').removeAttr('onclick').unbind('click').bind('click', function(){return false;});
+ $(tab + '> a').removeAttr('onclick').click(function() { return false; });
}
function rcube_show_advanced(visible)
{
$('tr.advanced').css('display', (visible ? (bw.ie ? 'block' : 'table-row') : 'none'));
+}
+
+// Fieldsets-to-tabs converter
+// Warning: don't place "caller" <script> inside page element (id)
+function rcube_init_tabs(id, current)
+{
+ var content = $('#'+id),
+ fs = content.children('fieldset');
+
+ if (!fs.length)
+ return;
+
+ current = current ? current : 0;
+
+ // first hide not selected tabs
+ fs.each(function(idx) { if (idx != current) $(this).hide(); });
+
+ // create tabs container
+ var tabs = $('<div>').addClass('tabsbar').appendTo(content);
+
+ // convert fildsets into tabs
+ fs.each(function(idx) {
+ var tab, a, elm = $(this), legend = elm.children('legend');
+
+ // create a tab
+ a = $('<a>').text(legend.text()).attr('href', '#');
+ tab = $('<span>').attr({'id': 'tab'+idx, 'class': 'tablink'})
+ .click(function() { rcube_show_tab(id, idx); return false })
+
+ // remove legend
+ legend.remove();
+ // style fieldset
+ elm.addClass('tabbed');
+ // style selected tab
+ if (idx == current)
+ tab.addClass('tablink-selected');
+
+ // add the tab to container
+ tab.append(a).appendTo(tabs);
+ });
+}
+
+function rcube_show_tab(id, index)
+{
+ var fs = $('#'+id).children('fieldset');
+
+ fs.each(function(idx) {
+ // Show/hide fieldset (tab content)
+ $(this)[index==idx ? 'show' : 'hide']();
+ // Select/unselect tab
+ $('#tab'+idx).toggleClass('tablink-selected', idx==index);
+ });
}
/**
@@ -27,145 +79,217 @@
function rcube_mail_ui()
{
- this.popupmenus = {
- markmenu:'markmessagemenu',
- searchmenu:'searchmenu',
- messagemenu:'messagemenu',
- listmenu:'listmenu',
- dragmessagemenu:'dragmessagemenu',
- groupmenu:'groupoptionsmenu',
- mailboxmenu:'mailboxoptionsmenu',
- composemenu:'composeoptionsmenu',
- uploadform:'attachment-form'
+ this.popups = {
+ markmenu: {id:'markmessagemenu'},
+ replyallmenu: {id:'replyallmenu'},
+ forwardmenu: {id:'forwardmenu'},
+ searchmenu: {id:'searchmenu', editable:1},
+ messagemenu: {id:'messagemenu'},
+ listmenu: {id:'listmenu', editable:1},
+ dragmessagemenu:{id:'dragmessagemenu', sticky:1},
+ groupmenu: {id:'groupoptionsmenu', above:1},
+ mailboxmenu: {id:'mailboxoptionsmenu', above:1},
+ composemenu: {id:'composeoptionsmenu', editable:1},
+ // toggle: #1486823, #1486930
+ uploadmenu: {id:'attachment-form', editable:1, above:1, toggle:!bw.ie&&!bw.linux },
+ uploadform: {id:'upload-form', editable:1, toggle:!bw.ie&&!bw.linux }
};
var obj;
- for (var k in this.popupmenus) {
- obj = $('#'+this.popupmenus[k])
+ for (var k in this.popups) {
+ obj = $('#'+this.popups[k].id)
if (obj.length)
- this[k] = obj;
+ this.popups[k].obj = obj;
+ else {
+ delete this.popups[k];
+ }
}
}
rcube_mail_ui.prototype = {
-show_popupmenu: function(obj, refname, show, above)
+show_popup: function(popup, show)
{
+ if (typeof this[popup] == 'function')
+ return this[popup](show);
+ else
+ return this.show_popupmenu(popup, show);
+},
+
+show_popupmenu: function(popup, show)
+{
+ var obj = this.popups[popup].obj,
+ above = this.popups[popup].above,
+ ref = rcube_find_object(popup+'link');
+
if (typeof show == 'undefined')
show = obj.is(':visible') ? false : true;
+ else if (this.popups[popup].toggle && show && this.popups[popup].obj.is(':visible') )
+ show = false;
- var ref = rcube_find_object(refname);
if (show && ref) {
- var pos = $(ref).offset();
+ var parent = $(ref).parent(),
+ win = $(window),
+ pos = parent.hasClass('dropbutton') ? parent.offset() : $(ref).offset();
+
+ if (!above && pos.top + ref.offsetHeight + obj.height() > win.height())
+ above = true;
+ if (pos.left + obj.width() > win.width())
+ pos.left = win.width() - obj.width() - 30;
+
obj.css({ left:pos.left, top:(pos.top + (above ? -obj.height() : ref.offsetHeight)) });
}
obj[show?'show':'hide']();
},
-show_markmenu: function(show)
+dragmessagemenu: function(show)
{
- this.show_popupmenu(this.markmenu, 'markreadbutton', show);
+ this.popups.dragmessagemenu.obj[show?'show':'hide']();
},
-show_messagemenu: function(show)
+forwardmenu: function(show)
{
- this.show_popupmenu(this.messagemenu, 'messagemenulink', show);
+ $("input[name='forwardtype'][value="+(rcmail.env.forward_attachment ? 1 : 0)+"]", this.popups.forwardmenu.obj)
+ .prop('checked', true);
+ this.show_popupmenu('forwardmenu', show);
},
-show_groupmenu: function(show)
-{
- this.show_popupmenu(this.groupmenu, 'groupactionslink', show, true);
-},
-
-show_mailboxmenu: function(show)
-{
- this.show_popupmenu(this.mailboxmenu, 'mboxactionslink', show, true);
-},
-
-show_composemenu: function(show)
-{
- this.show_popupmenu(this.composemenu, 'composemenulink', show, true);
-},
-
-show_uploadform: function(show)
+uploadmenu: function(show)
{
if (typeof show == 'object') // called as event handler
show = false;
- if (!show)
- $('input[type=file]').val('');
- this.show_popupmenu(this.uploadform, 'uploadformlink', show, true);
+
+ // clear upload form
+ if (!show) {
+ try { $('#attachment-form form')[0].reset(); }
+ catch(e){} // ignore errors
+ }
+
+ this.show_popupmenu('uploadmenu', show);
+
+ if (!document.all && this.popups.uploadmenu.obj.is(':visible'))
+ $('#attachment-form input[type=file]').click();
},
-show_searchmenu: function(show)
+searchmenu: function(show)
{
- if (typeof show == 'undefined')
- show = this.searchmenu.is(':visible') ? false : true;
+ var obj = this.popups.searchmenu.obj,
+ ref = rcube_find_object('searchmenulink');
- var ref = rcube_find_object('searchmod');
+ if (typeof show == 'undefined')
+ show = obj.is(':visible') ? false : true;
+
if (show && ref) {
var pos = $(ref).offset();
- this.searchmenu.css({ left:pos.left, top:(pos.top + ref.offsetHeight + 2)});
- this.searchmenu.find(":checked").attr('checked', false);
+ obj.css({ left:pos.left, top:(pos.top + ref.offsetHeight + 2)})
+ .find(':checked').prop('checked', false);
if (rcmail.env.search_mods) {
- var search_mods = rcmail.env.search_mods[rcmail.env.mailbox] ? rcmail.env.search_mods[rcmail.env.mailbox] : rcmail.env.search_mods['*'];
- for (var n in search_mods)
- $('#s_mod_' + n).attr('checked', true);
+ var n, mbox = rcmail.env.mailbox, mods = rcmail.env.search_mods;
+
+ if (rcmail.env.task != 'addressbook') {
+ mods = mods[mbox] ? mods[mbox] : mods['*'];
+
+ for (n in mods)
+ $('#s_mod_' + n).prop('checked', true);
+ }
+ else {
+ if (mods['*'])
+ $('input:checkbox[name="s_mods[]"]').map(function() {
+ this.checked = true;
+ this.disabled = this.value != '*';
+ });
+ else {
+ for (n in mods)
+ $('#s_mod_' + n).prop('checked', true);
+ }
+ }
}
}
- this.searchmenu[show?'show':'hide']();
+ obj[show?'show':'hide']();
},
set_searchmod: function(elem)
{
- if (!rcmail.env.search_mods)
- rcmail.env.search_mods = {};
+ var task = rcmail.env.task,
+ mods = rcmail.env.search_mods,
+ mbox = rcmail.env.mailbox;
- if (!rcmail.env.search_mods[rcmail.env.mailbox])
- rcmail.env.search_mods[rcmail.env.mailbox] = rcube_clone_object(rcmail.env.search_mods['*']);
+ if (!mods)
+ mods = {};
- if (!elem.checked)
- delete(rcmail.env.search_mods[rcmail.env.mailbox][elem.value]);
- else
- rcmail.env.search_mods[rcmail.env.mailbox][elem.value] = elem.value;
+ if (task == 'mail') {
+ if (!mods[mbox])
+ mods[mbox] = rcube_clone_object(mods['*']);
+ if (!elem.checked)
+ delete(mods[mbox][elem.value]);
+ else
+ mods[mbox][elem.value] = 1;
+ }
+ else { //addressbook
+ if (!elem.checked)
+ delete(mods[elem.value]);
+ else
+ mods[elem.value] = 1;
+
+ // mark all fields
+ if (elem.value == '*') {
+ $('input:checkbox[name="s_mods[]"]').map(function() {
+ if (this == elem)
+ return;
+
+ if (elem.checked) {
+ mods[this.value] = 1;
+ this.checked = true;
+ this.disabled = true;
+ }
+ else {
+ this.disabled = false;
+ }
+ });
+ }
+ }
+
+ rcmail.env.search_mods = mods;
},
-show_listmenu: function(show)
+listmenu: function(show)
{
- if (typeof show == 'undefined')
- show = this.listmenu.is(':visible') ? false : true;
+ var obj = this.popups.listmenu.obj,
+ ref = rcube_find_object('listmenulink');
- var ref = rcube_find_object('listmenulink');
+ if (typeof show == 'undefined')
+ show = obj.is(':visible') ? false : true;
+
if (show && ref) {
var pos = $(ref).offset(),
- menuwidth = this.listmenu.width(),
+ menuwidth = obj.width(),
pagewidth = $(document).width();
if (pagewidth - pos.left < menuwidth && pos.left > menuwidth)
pos.left = pos.left - menuwidth;
- this.listmenu.css({ left:pos.left, top:(pos.top + ref.offsetHeight + 2)});
+ obj.css({ left:pos.left, top:(pos.top + ref.offsetHeight + 2)});
// set form values
- $('input[name="sort_col"][value="'+rcmail.env.sort_col+'"]').attr('checked', 1);
- $('input[name="sort_ord"][value="DESC"]').attr('checked', rcmail.env.sort_order=='DESC' ? 1 : 0);
- $('input[name="sort_ord"][value="ASC"]').attr('checked', rcmail.env.sort_order=='DESC' ? 0 : 1);
- $('input[name="view"][value="thread"]').attr('checked', rcmail.env.threading ? 1 : 0);
- $('input[name="view"][value="list"]').attr('checked', rcmail.env.threading ? 0 : 1);
+ $('input[name="sort_col"][value="'+rcmail.env.sort_col+'"]').prop('checked', true);
+ $('input[name="sort_ord"][value="DESC"]').prop('checked', rcmail.env.sort_order == 'DESC');
+ $('input[name="sort_ord"][value="ASC"]').prop('checked', rcmail.env.sort_order != 'DESC');
+ $('input[name="view"][value="thread"]').prop('checked', rcmail.env.threading ? true : false);
+ $('input[name="view"][value="list"]').prop('checked', rcmail.env.threading ? false : true);
// list columns
- var cols = $('input[name="list_col[]"]');
+ var found, cols = $('input[name="list_col[]"]');
for (var i=0; i<cols.length; i++) {
- var found = 0;
if (cols[i].value != 'from')
found = jQuery.inArray(cols[i].value, rcmail.env.coltypes) != -1;
else
found = (jQuery.inArray('from', rcmail.env.coltypes) != -1
- || jQuery.inArray('to', rcmail.env.coltypes) != -1);
- $(cols[i]).attr('checked',found ? 1 : 0);
+ || jQuery.inArray('to', rcmail.env.coltypes) != -1);
+ $(cols[i]).prop('checked', found);
}
}
- this.listmenu[show?'show':'hide']();
+ obj[show?'show':'hide']();
if (show) {
var maxheight=0;
@@ -185,12 +309,12 @@
open_listmenu: function(e)
{
- this.show_listmenu();
+ this.listmenu();
},
save_listmenu: function()
{
- this.show_listmenu();
+ this.listmenu();
var sort = $('input[name="sort_col"]:checked').val(),
ord = $('input[name="sort_ord"]:checked').val(),
@@ -203,33 +327,16 @@
body_mouseup: function(evt, p)
{
- var target = rcube_event.get_target(evt);
+ var i, target = rcube_event.get_target(evt);
- if (this.markmenu && this.markmenu.is(':visible') && target != rcube_find_object('markreadbutton'))
- this.show_markmenu(false);
- else if (this.messagemenu && this.messagemenu.is(':visible') && target != rcube_find_object('messagemenulink'))
- this.show_messagemenu(false);
- else if (this.dragmessagemenu && this.dragmessagemenu.is(':visible') && !rcube_mouse_is_over(evt, rcube_find_object('dragmessagemenu')))
- this.dragmessagemenu.hide();
- else if (this.groupmenu && this.groupmenu.is(':visible') && target != rcube_find_object('groupactionslink'))
- this.show_groupmenu(false);
- else if (this.mailboxmenu && this.mailboxmenu.is(':visible') && target != rcube_find_object('mboxactionslink'))
- this.show_mailboxmenu(false);
- else if (this.composemenu && this.composemenu.is(':visible') && target != rcube_find_object('composemenulink')
- && !this.target_overlaps(target, this.popupmenus.composemenu)) {
- this.show_composemenu(false);
- }
- else if (this.uploadform && this.uploadform.is(':visible') && target != rcube_find_object('uploadformlink')
- && !this.target_overlaps(target, this.popupmenus.uploadform)) {
- this.show_uploadform(false);
- }
- else if (this.listmenu && this.listmenu.is(':visible') && target != rcube_find_object('listmenulink')
- && !this.target_overlaps(target, this.popupmenus.listmenu)) {
- this.show_listmenu(false);
- }
- else if (this.searchmenu && this.searchmenu.is(':visible') && target != rcube_find_object('searchmod')
- && !this.target_overlaps(target, this.popupmenus.searchmenu)) {
- this.show_searchmenu(false);
+ for (i in this.popups) {
+ if (this.popups[i].obj.is(':visible') && target != rcube_find_object(i+'link')
+ && !this.popups[i].toggle
+ && (!this.popups[i].editable || !this.target_overlaps(target, this.popups[i].id))
+ && (!this.popups[i].sticky || !rcube_mouse_is_over(evt, rcube_find_object(this.popups[i].id)))
+ ) {
+ window.setTimeout('$("#'+this.popups[i].id+'").hide()', 50);
+ }
}
},
@@ -244,12 +351,12 @@
return false;
},
-body_keypress: function(evt, p)
+body_keydown: function(evt, p)
{
if (rcube_event.get_keycode(evt) == 27) {
- for (var k in this.popupmenus) {
- if (this[k] && this[k].is(':visible'))
- this[k].hide();
+ for (var k in this.popups) {
+ if (this.popups[k].obj.is(':visible'))
+ this.show_popup(k, false);
}
}
},
@@ -274,7 +381,6 @@
if (uid = rcmail.message_list.get_single_selection())
rcmail.show_message(uid, false, true);
- rcmail.http_post('save-pref', '_name=preview_pane&_value=1');
}
else {
prev_frm.hide();
@@ -293,23 +399,23 @@
rcmail.env.contentframe = null;
rcmail.show_contentframe(false);
- rcmail.http_post('save-pref', '_name=preview_pane&_value=0');
}
+
+ rcmail.command('save-pref', {name: 'preview_pane', value: (elem.checked?1:0)});
},
/* Message composing */
init_compose_form: function()
{
- var cc_field = document.getElementById('_cc'),
- bcc_field = document.getElementById('_bcc'),
+ var f, field, fields = ['cc', 'bcc', 'replyto', 'followupto'],
div = document.getElementById('compose-div'),
headers_div = document.getElementById('compose-headers-div');
- if (cc_field && cc_field.value != '')
- rcmail_show_header_form('cc');
-
- if (bcc_field && bcc_field.value != '')
- rcmail_show_header_form('bcc');
+ // Show input elements with non-empty value
+ for (f=0; f<fields.length; f++) {
+ if ((field = $('#_'+fields[f])) && field.length && field.val() != '')
+ rcmail_ui.show_header_form(fields[f]);
+ }
// prevent from form data loss when pressing ESC key in IE
if (bw.ie) {
@@ -328,25 +434,30 @@
rcmail_ui.resize_compose_body();
});
- div.style.top = (parseInt(headers_div.offsetHeight, 10) + 1) + 'px';
+ div.style.top = (parseInt(headers_div.offsetHeight, 10) + 3) + 'px';
$(window).resize();
},
resize_compose_body: function()
{
- var ed, div = $('#compose-div'), w = div.width(), h = div.height();
- w = w-4;
- h = h-25;
+ var div = $('#compose-div .boxlistcontent'), w = div.width(), h = div.height();
+ w -= 8; // 2 x 3px padding + 2 x 1px border
+ h -= 4;
- $('#compose-body').width(w-(bw.ie || bw.opera || bw.safari ? 2 : 0)+'px').height(h+'px');
+ $('#compose-body').width(w+'px').height(h+'px');
if (window.tinyMCE && tinyMCE.get('compose-body')) {
- $('#compose-body_tbl').width((w+4)+'px').height('');
- $('#compose-body_ifr').width((w+2)+'px').height((h-54)+'px');
+ $('#compose-body_tbl').width((w+6)+'px').height('');
+ $('#compose-body_ifr').width((w+6)+'px').height((h-54)+'px');
}
else {
- $('#googie_edit_layer').width(w-(bw.ie || bw.opera || bw.safari ? 2 : 0)+'px').height(h+'px');
+ $('#googie_edit_layer').height(h+'px');
}
+},
+
+resize_compose_body_ev: function()
+{
+ window.setTimeout(function(){rcmail_ui.resize_compose_body();}, 100);
},
show_header_form: function(id)
@@ -365,7 +476,7 @@
var div = document.getElementById('compose-div'),
headers_div = document.getElementById('compose-headers-div');
row.style.display = (document.all && !window.opera) ? 'block' : 'table-row';
- div.style.top = (parseInt(headers_div.offsetHeight, 10) + 1) + 'px';
+ div.style.top = (parseInt(headers_div.offsetHeight, 10) + 3) + 'px';
this.resize_compose_body();
}
@@ -428,20 +539,31 @@
{
rcmail_ui = new rcube_mail_ui();
rcube_event.add_listener({ object:rcmail_ui, method:'body_mouseup', event:'mouseup' });
- rcube_event.add_listener({ object:rcmail_ui, method:'body_keypress', event:'keypress' });
+ rcube_event.add_listener({ object:rcmail_ui, method:'body_keydown', event:'keydown' });
$('iframe').load(iframe_events)
- .contents().mouseup(function(e){parent.rcmail_ui.body_mouseup(e)});
+ .contents().mouseup(function(e){rcmail_ui.body_mouseup(e)});
if (rcmail.env.task == 'mail') {
rcmail.addEventListener('menu-open', 'open_listmenu', rcmail_ui);
rcmail.addEventListener('menu-save', 'save_listmenu', rcmail_ui);
- rcmail.addEventListener('aftersend-attachment', 'show_uploadform', rcmail_ui);
- rcmail.addEventListener('aftertoggle-editor', 'resize_compose_body', rcmail_ui);
+ rcmail.addEventListener('aftersend-attachment', 'uploadmenu', rcmail_ui);
+ rcmail.addEventListener('aftertoggle-editor', 'resize_compose_body_ev', rcmail_ui);
rcmail.gui_object('message_dragmenu', 'dragmessagemenu');
+
+ if (rcmail.gui_objects.mailboxlist) {
+ rcmail.addEventListener('responseaftermark', rcube_render_mailboxlist);
+ rcmail.addEventListener('responseaftergetunread', rcube_render_mailboxlist);
+ rcmail.addEventListener('responseaftercheck-recent', rcube_render_mailboxlist);
+ rcmail.addEventListener('aftercollapse-folder', rcube_render_mailboxlist);
+ rcube_render_mailboxlist();
+ }
if (rcmail.env.action == 'compose')
rcmail_ui.init_compose_form();
+ }
+ else if (rcmail.env.task == 'addressbook') {
+ rcmail.addEventListener('afterupload-photo', function(){ rcmail_ui.show_popup('uploadform', false); });
}
}
@@ -450,6 +572,67 @@
{
// this==iframe
var doc = this.contentDocument ? this.contentDocument : this.contentWindow ? this.contentWindow.document : null;
- parent.rcube_event.add_listener({ element: doc, object:rcmail_ui, method:'body_mouseup', event:'mouseup' });
+ rcube_event.add_listener({ element: doc, object:rcmail_ui, method:'body_mouseup', event:'mouseup' });
}
+// Abbreviate mailbox names to fit width of the container
+function rcube_render_mailboxlist()
+{
+ if (bw.ie6) // doesn't work well on IE6
+ return;
+
+ $('#mailboxlist > li a, #mailboxlist ul:visible > li a').each(function(){
+ var elem = $(this);
+ var text = elem.data('text');
+ if (!text) {
+ text = elem.text().replace(/\s+\(.+$/, '');
+ elem.data('text', text);
+ }
+ if (text.length < 6)
+ return;
+
+ var abbrev = fit_string_to_size(text, elem, elem.width() - elem.children('span.unreadcount').width());
+ if (abbrev != text)
+ elem.attr('title', text);
+ elem.contents().filter(function(){ return (this.nodeType == 3); }).get(0).data = abbrev;
+ });
+}
+
+// inspired by https://gist.github.com/24261/7fdb113f1e26111bd78c0c6fe515f6c0bf418af5
+function fit_string_to_size(str, elem, len)
+{
+ var result = str;
+ var ellip = '...';
+ var span = $('<b>').css({ visibility:'hidden', padding:'0px' }).appendTo(elem).get(0);
+
+ // on first run, check if string fits into the length already.
+ span.innerHTML = result;
+ if (span.offsetWidth > len) {
+ var cut = Math.max(1, Math.floor(str.length * ((span.offsetWidth - len) / span.offsetWidth) / 2)),
+ mid = Math.floor(str.length / 2);
+ var offLeft = mid, offRight = mid;
+ while (true) {
+ offLeft = mid - cut;
+ offRight = mid + cut;
+ span.innerHTML = str.substring(0,offLeft) + ellip + str.substring(offRight);
+
+ // break loop if string fits size
+ if (span.offsetWidth <= len || offLeft < 3)
+ break;
+
+ cut++;
+ }
+
+ // build resulting string
+ result = str.substring(0,offLeft) + ellip + str.substring(offRight);
+ }
+
+ span.parentNode.removeChild(span);
+ return result;
+}
+
+// Optional parameters used by TinyMCE
+var rcmail_editor_settings = {
+ skin : "default", // "default", "o2k7"
+ skin_variant : "" // "", "silver", "black"
+};
--
Gitblit v1.9.1