From 22c6b5b6a0ad6b831678caa29ed50d16b4f5e8bd Mon Sep 17 00:00:00 2001
From: alecpl <alec@alec.pl>
Date: Fri, 24 Sep 2010 03:17:46 -0400
Subject: [PATCH] - Fix: save-prefs action is now in utils task
---
skins/default/functions.js | 208 +++++++++++++++++++++++++--------------------------
1 files changed, 103 insertions(+), 105 deletions(-)
diff --git a/skins/default/functions.js b/skins/default/functions.js
index 877d152..c69a3cf 100644
--- a/skins/default/functions.js
+++ b/skins/default/functions.js
@@ -27,86 +27,95 @@
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'},
+ 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 }
};
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();
+ if (!above && pos.top + ref.offsetHeight + obj.height() > window.innerHeight)
+ above = true;
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)
-{
- this.show_popupmenu(this.messagemenu, 'messagemenulink', 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').attr('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['*'];
@@ -114,7 +123,7 @@
$('#s_mod_' + n).attr('checked', true);
}
}
- this.searchmenu[show?'show':'hide']();
+ obj[show?'show':'hide']();
},
set_searchmod: function(elem)
@@ -131,21 +140,23 @@
rcmail.env.search_mods[rcmail.env.mailbox][elem.value] = elem.value;
},
-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);
@@ -165,7 +176,7 @@
}
}
- this.listmenu[show?'show':'hide']();
+ obj[show?'show':'hide']();
if (show) {
var maxheight=0;
@@ -185,12 +196,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 +214,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 +238,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 +268,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,8 +286,8 @@
rcmail.env.contentframe = null;
rcmail.show_contentframe(false);
- rcmail.http_post('save-pref', '_name=preview_pane&_value=0');
}
+ rcmail.http_post('utils/save-pref', '_name=preview_pane&_value='+(elem.checked?1:0));
},
/* Message composing */
@@ -306,10 +299,10 @@
headers_div = document.getElementById('compose-headers-div');
if (cc_field && cc_field.value != '')
- rcmail_show_header_form('cc');
+ rcmail_ui.show_header_form('cc');
if (bcc_field && bcc_field.value != '')
- rcmail_show_header_form('bcc');
+ rcmail_ui.show_header_form('bcc');
// prevent from form data loss when pressing ESC key in IE
if (bw.ie) {
@@ -328,25 +321,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 +363,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,16 +426,16 @@
{
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.env.action == 'compose')
@@ -450,6 +448,6 @@
{
// 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' });
}
--
Gitblit v1.9.1