From e019f2d0f2dc2fbfa345ab5d7ae85e67bfdd76b8 Mon Sep 17 00:00:00 2001
From: alecpl <alec@alec.pl>
Date: Sat, 25 Sep 2010 09:03:53 -0400
Subject: [PATCH] - s/RoundCube/Roundcube/
---
skins/default/functions.js | 19 +++++++++++--------
1 files changed, 11 insertions(+), 8 deletions(-)
diff --git a/skins/default/functions.js b/skins/default/functions.js
index b39324e..338ce20 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
*/
/**
@@ -36,7 +36,8 @@
groupmenu: {id:'groupoptionsmenu', above:1},
mailboxmenu: {id:'mailboxoptionsmenu', above:1},
composemenu: {id:'composeoptionsmenu', editable:1},
- uploadmenu: {id:'attachment-form', editable:1, above:1}
+ // toggle: #1486823, #1486930
+ uploadmenu: {id:'attachment-form', editable:1, above:1, toggle:!bw.ie&&!bw.linux }
};
var obj;
@@ -68,6 +69,8 @@
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;
if (show && ref) {
var pos = $(ref).offset();
@@ -215,6 +218,7 @@
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)))
) {
@@ -234,7 +238,7 @@
return false;
},
-body_keypress: function(evt, p)
+body_keydown: function(evt, p)
{
if (rcube_event.get_keycode(evt) == 27) {
for (var k in this.popups) {
@@ -264,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();
@@ -283,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 */
@@ -423,10 +426,10 @@
{
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);
@@ -445,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