summaryrefslogtreecommitdiff
path: root/program/js
diff options
context:
space:
mode:
Diffstat (limited to 'program/js')
-rw-r--r--program/js/app.js6
-rw-r--r--program/js/common.js2
2 files changed, 4 insertions, 4 deletions
diff --git a/program/js/app.js b/program/js/app.js
index 174920cc8..c60f62f29 100644
--- a/program/js/app.js
+++ b/program/js/app.js
@@ -153,7 +153,7 @@ function rcube_webmail()
if (this.env.messagecount)
this.enable_command('select-all', 'select-none', 'sort', 'expunge', true);
- if (this.env.messagecount && this.env.mailbox==this.env.trash_mailbox)
+ if (this.env.messagecount && (this.env.mailbox==this.env.trash_mailbox || this.env.mailbox==this.env.junk_mailbox))
this.enable_command('purge', true);
this.set_page_buttons();
@@ -893,7 +893,7 @@ function rcube_webmail()
}
else if (props)
- url += '&_to='+props;
+ url += '&_to='+encodeURIComponent(props);
// don't know if this is necessary...
url = url.replace(/&_framed=1/, "");
@@ -1352,7 +1352,7 @@ function rcube_webmail()
if (this.env.mailbox==this.env.drafts_mailbox)
{
this.enable_command('show', selected);
- this.enable_command('delete', this.selection.length>0 ? true : false);
+ this.enable_command('delete', 'moveto', this.selection.length>0 ? true : false);
}
else
{
diff --git a/program/js/common.js b/program/js/common.js
index f9fb9c1db..65341a758 100644
--- a/program/js/common.js
+++ b/program/js/common.js
@@ -395,4 +395,4 @@ function getCookie(name)
}
-var bw = new roundcube_browser(); \ No newline at end of file
+var bw = new roundcube_browser();