From 9796cd2063770a8562d58d6492fd6904cdeb4627 Mon Sep 17 00:00:00 2001
From: Aleksander Machniak <alec@alec.pl>
Date: Mon, 02 May 2016 12:01:18 -0400
Subject: [PATCH] Merge branch 'dev-rfc822-preview'
---
program/js/app.js | 13 ++++++++++---
1 files changed, 10 insertions(+), 3 deletions(-)
diff --git a/program/js/app.js b/program/js/app.js
index e6203de..63b25a7 100644
--- a/program/js/app.js
+++ b/program/js/app.js
@@ -339,8 +339,15 @@
// init message compose form
this.init_messageform();
}
- else if (this.env.action == 'get')
+ else if (this.env.action == 'get') {
this.enable_command('download', 'print', true);
+ if (this.env.is_message) {
+ this.enable_command('reply', 'reply-all', 'edit', 'viewsource',
+ 'forward', 'forward-inline', 'forward-attachment', true);
+ if (this.env.list_post)
+ this.enable_command('reply-list', true);
+ }
+ }
// show printing dialog
else if (this.env.action == 'print' && this.env.uid
&& !this.env.is_pgp_content && !this.env.pgp_mime_part
@@ -1211,13 +1218,13 @@
this.open_window(this.env.comm_path + url, true, true);
}
}
- else if (this.env.action == 'get') {
+ else if (this.env.action == 'get' && !this.env.is_message) {
this.gui_objects.messagepartframe.contentWindow.print();
}
else if (uid = this.get_single_uid()) {
url = this.url('print', this.params_from_uid(uid, {_safe: this.env.safemode ? 1 : 0}));
if (this.open_window(url, true, true)) {
- if (this.env.action != 'show')
+ if (this.env.action != 'show' && this.env.action != 'get')
this.mark_message('read', uid);
}
}
--
Gitblit v1.9.1