From 10ea10a3177fb59caac13adc44cfbc4b5e6ff8dd Mon Sep 17 00:00:00 2001
From: thomascube <thomas@roundcube.net>
Date: Fri, 20 May 2011 14:35:08 -0400
Subject: [PATCH] Catch write-errors on database (yet untested)
---
skins/default/functions.js | 38 ++++++++++++++++++++++++++------------
1 files changed, 26 insertions(+), 12 deletions(-)
diff --git a/skins/default/functions.js b/skins/default/functions.js
index c9d63e9..9057d97 100644
--- a/skins/default/functions.js
+++ b/skins/default/functions.js
@@ -82,6 +82,7 @@
this.popups = {
markmenu: {id:'markmessagemenu'},
replyallmenu: {id:'replyallmenu'},
+ forwardmenu: {id:'forwardmenu'},
searchmenu: {id:'searchmenu', editable:1},
messagemenu: {id:'messagemenu'},
listmenu: {id:'listmenu', editable:1},
@@ -147,6 +148,13 @@
this.popups.dragmessagemenu.obj[show?'show':'hide']();
},
+forwardmenu: function(show)
+{
+ $("input[name='forwardtype'][value="+(rcmail.env.forward_attachment ? 1 : 0)+"]", this.popups.forwardmenu.obj)
+ .prop('checked', true);
+ this.show_popupmenu('forwardmenu', show);
+},
+
uploadmenu: function(show)
{
if (typeof show == 'object') // called as event handler
@@ -175,12 +183,12 @@
if (show && ref) {
var pos = $(ref).offset();
obj.css({ left:pos.left, top:(pos.top + ref.offsetHeight + 2)})
- .find(':checked').attr('checked', false);
+ .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);
+ $('#s_mod_' + n).prop('checked', true);
}
}
obj[show?'show':'hide']();
@@ -218,21 +226,20 @@
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);
}
}
@@ -347,7 +354,8 @@
rcmail.env.contentframe = null;
rcmail.show_contentframe(false);
}
- rcmail.http_post('save-pref', '_name=preview_pane&_value='+(elem.checked?1:0));
+
+ rcmail.command('save-pref', {name: 'preview_pane', value: (elem.checked?1:0)});
},
/* Message composing */
@@ -576,3 +584,9 @@
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