summaryrefslogtreecommitdiff
path: root/program
diff options
context:
space:
mode:
authorAleksander Machniak <alec@alec.pl>2013-05-20 10:32:52 +0200
committerAleksander Machniak <alec@alec.pl>2013-05-20 10:32:52 +0200
commit2355045dedc96274ca6b1c29612006e736b6f540 (patch)
treeb573b7bd48d40e21d26c1d21f9259508e14f7a90 /program
parentc8bc8c97f3f6e5c04fa7b459bdb1c922d7f4e6ad (diff)
Change Reply-All button label/title when mailing list is detected (#1488938)
Diffstat (limited to 'program')
-rw-r--r--program/js/app.js1
-rw-r--r--program/js/common.js3
-rw-r--r--program/steps/mail/func.inc2
-rw-r--r--program/steps/mail/show.inc2
4 files changed, 4 insertions, 4 deletions
diff --git a/program/js/app.js b/program/js/app.js
index b98272493..1f0b95410 100644
--- a/program/js/app.js
+++ b/program/js/app.js
@@ -1179,6 +1179,7 @@ function rcube_webmail()
if (typeof cmd === 'string') {
this.commands[cmd] = enable;
this.set_button(cmd, (enable ? 'act' : 'pas'));
+ this.triggerEvent('enable-command', {command: cmd, status: enable});
}
// push array elements into commands array
else {
diff --git a/program/js/common.js b/program/js/common.js
index f7c0a7536..53dce8cc2 100644
--- a/program/js/common.js
+++ b/program/js/common.js
@@ -298,8 +298,7 @@ addEventListener: function(evt, func, obj)
if (!this._events[evt])
this._events[evt] = [];
- var e = {func:func, obj:obj ? obj : window};
- this._events[evt][this._events[evt].length] = e;
+ this._events[evt].push({func:func, obj:obj ? obj : window});
},
/**
diff --git a/program/steps/mail/func.inc b/program/steps/mail/func.inc
index fc22366c0..661d3fbbb 100644
--- a/program/steps/mail/func.inc
+++ b/program/steps/mail/func.inc
@@ -120,7 +120,7 @@ if (empty($RCMAIL->action) || $RCMAIL->action == 'list') {
if (!$OUTPUT->ajax_call)
$OUTPUT->add_label('checkingmail', 'deletemessage', 'movemessagetotrash',
'movingmessage', 'copyingmessage', 'deletingmessage', 'markingmessage',
- 'copy', 'move', 'quota');
+ 'copy', 'move', 'quota', 'replyall', 'replylist');
$pagetitle = $RCMAIL->localize_foldername($RCMAIL->storage->mod_folder($mbox_name), true);
$pagetitle = str_replace($delimiter, " \xC2\xBB ", $pagetitle);
diff --git a/program/steps/mail/show.inc b/program/steps/mail/show.inc
index 2ad1ba9bd..d8d4372f9 100644
--- a/program/steps/mail/show.inc
+++ b/program/steps/mail/show.inc
@@ -116,7 +116,7 @@ if ($uid) {
if (!$OUTPUT->ajax_call)
$OUTPUT->add_label('checkingmail', 'deletemessage', 'movemessagetotrash',
- 'movingmessage', 'deletingmessage', 'markingmessage');
+ 'movingmessage', 'deletingmessage', 'markingmessage', 'replyall', 'replylist');
$prefer_html = $RCMAIL->config->get('prefer_html');
if ($MESSAGE->has_html_part()) {