summaryrefslogtreecommitdiff
path: root/skins/default/functions.js
diff options
context:
space:
mode:
authorthomascube <thomas@roundcube.net>2010-03-03 12:11:04 +0000
committerthomascube <thomas@roundcube.net>2010-03-03 12:11:04 +0000
commit7910c0ff55edcb9ed973abd680489b9e0f28d0cb (patch)
tree454e6565617cb80667c6f20e8ce985d1304d2acf /skins/default/functions.js
parentd15d594a42e8fe4e6c11dedcd8ac3e89c445f986 (diff)
Remember search modifiers in user prefs (#1486146) + bring back the old defaults
Diffstat (limited to 'skins/default/functions.js')
-rw-r--r--skins/default/functions.js15
1 files changed, 9 insertions, 6 deletions
diff --git a/skins/default/functions.js b/skins/default/functions.js
index 28af2e7e7..3a295decb 100644
--- a/skins/default/functions.js
+++ b/skins/default/functions.js
@@ -161,12 +161,12 @@ show_searchmenu: function(show)
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);
if (rcmail.env.search_mods) {
- for (var n in rcmail.env.search_mods) {
- box = rcube_find_object('s_mod_' + n);
- box.checked = 'checked';
- }
+ 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);
}
}
this.searchmenu[show?'show':'hide']();
@@ -177,10 +177,13 @@ set_searchmod: function(elem)
if (!rcmail.env.search_mods)
rcmail.env.search_mods = new Object();
+ if (!rcmail.env.search_mods[rcmail.env.mailbox])
+ rcmail.env.search_mods[rcmail.env.mailbox] = rcube_clone_object(rcmail.env.search_mods['*']);
+
if (!elem.checked)
- delete(rcmail.env.search_mods[elem.value]);
+ delete(rcmail.env.search_mods[rcmail.env.mailbox][elem.value]);
else
- rcmail.env.search_mods[elem.value] = elem.value;
+ rcmail.env.search_mods[rcmail.env.mailbox][elem.value] = elem.value;
},
body_mouseup: function(evt, p)