From 77b5d7ee304a688a2eb115ce04b460b43c0dd700 Mon Sep 17 00:00:00 2001
From: Aleksander Machniak <alec@alec.pl>
Date: Sun, 22 May 2016 08:43:54 -0400
Subject: [PATCH] Fix priority icon(s) position
---
program/js/app.js | 70 +++++++++++++++++++---------------
1 files changed, 39 insertions(+), 31 deletions(-)
diff --git a/program/js/app.js b/program/js/app.js
index 9a9a1d6..7dbe3b7 100644
--- a/program/js/app.js
+++ b/program/js/app.js
@@ -295,7 +295,7 @@
else if (this.env.action == 'compose') {
this.env.address_group_stack = [];
this.env.compose_commands = ['send-attachment', 'remove-attachment', 'send', 'cancel',
- 'toggle-editor', 'list-adresses', 'pushgroup', 'search', 'reset-search', 'extwin',
+ 'toggle-editor', 'list-addresses', 'pushgroup', 'search', 'reset-search', 'extwin',
'insert-response', 'save-response', 'menu-open', 'menu-close'];
if (this.env.drafts_mailbox)
@@ -381,7 +381,7 @@
if (this.gui_objects.addressbookslist) {
this.gui_objects.folderlist = this.gui_objects.addressbookslist;
- this.enable_command('list-adresses', true);
+ this.enable_command('list-addresses', true);
}
// ask user to send MDN
@@ -581,7 +581,12 @@
this.display_message.apply(this, this.pending_message);
// init treelist widget
- if (this.gui_objects.folderlist && window.rcube_treelist_widget) {
+ if (this.gui_objects.folderlist && window.rcube_treelist_widget
+ // some plugins may load rcube_treelist_widget and there's one case
+ // when this will cause problems - addressbook widget in compose,
+ // which already has been initialized using rcube_list_widget
+ && this.gui_objects.folderlist != this.gui_objects.addressbookslist
+ ) {
this.treelist = new rcube_treelist_widget(this.gui_objects.folderlist, {
selectable: true,
id_prefix: 'rcmli',
@@ -1019,7 +1024,7 @@
break;
}
- this.goto_url('get', qstring+'&_download=1', false);
+ this.goto_url('get', qstring+'&_download=1', false, true);
break;
case 'select-all':
@@ -1161,7 +1166,7 @@
this.change_identity($("[name='_from']")[0], true);
break;
- case 'list-adresses':
+ case 'list-addresses':
this.list_contacts(props);
this.enable_command('add-recipient', false);
break;
@@ -1225,10 +1230,10 @@
case 'download':
if (this.env.action == 'get') {
- location.href = location.href.replace(/_frame=/, '_download=');
+ location.href = this.secure_url(location.href.replace(/_frame=/, '_download='));
}
else if (uid = this.get_single_uid()) {
- this.goto_url('viewsource', this.params_from_uid(uid, {_save: 1}));
+ this.goto_url('viewsource', this.params_from_uid(uid, {_save: 1}), false, true);
}
break;
@@ -1316,13 +1321,13 @@
case 'export':
if (this.contact_list.rowcount > 0) {
- this.goto_url('export', { _source: this.env.source, _gid: this.env.group, _search: this.env.search_request });
+ this.goto_url('export', { _source: this.env.source, _gid: this.env.group, _search: this.env.search_request }, false, true);
}
break;
case 'export-selected':
if (this.contact_list.rowcount > 0) {
- this.goto_url('export', { _source: this.env.source, _gid: this.env.group, _cid: this.contact_list.get_selection().join(',') });
+ this.goto_url('export', { _source: this.env.source, _gid: this.env.group, _cid: this.contact_list.get_selection().join(',') }, false, true);
}
break;
@@ -1357,7 +1362,7 @@
if (!aborted && this.triggerEvent('after'+command, props) === false)
ret = false;
- this.triggerEvent('actionafter', { props:props, action:command, aborted:aborted });
+ this.triggerEvent('actionafter', { props:props, action:command, aborted:aborted, ret:ret });
return ret === false ? false : obj ? false : true;
};
@@ -1437,7 +1442,7 @@
if (task == 'mail')
url += '&_mbox=INBOX';
else if (task == 'logout' && !this.env.server_error) {
- url += '&_token=' + this.env.request_token;
+ url = this.secure_url(url);
this.clear_compose_data();
}
@@ -1485,6 +1490,12 @@
return url + '?' + name + '=' + value;
};
+
+ // append CSRF protection token to the given url
+ this.secure_url = function(url)
+ {
+ return this.add_url(url, '_token', this.env.request_token);
+ },
this.is_framed = function()
{
@@ -3466,6 +3477,12 @@
// enable encrypted compose toggle
this.enable_command('compose-encrypted', !is_html);
}
+
+ // make sure to disable encryption button after toggling editor into HTML mode
+ this.addEventListener('actionafter', function(args) {
+ if (args.ret && args.action == 'toggle-editor')
+ ref.enable_command('compose-encrypted', !args.props.html);
+ });
}
};
@@ -3560,14 +3577,6 @@
// list recipients with missing keys
if (!isvalid && missing_keys.length) {
- // load publickey.js
- if (!$('script#publickeyjs').length) {
- $('<script>')
- .attr('id', 'publickeyjs')
- .attr('src', ref.assets_path('program/js/publickey.js'))
- .appendTo(document.body);
- }
-
// display dialog with missing keys
ref.show_popup_dialog(
ref.get_label('nopubkeyfor').replace('$email', missing_keys.join(', ')) +
@@ -3962,7 +3971,7 @@
}
if (!html_mode) {
- pos = this.env.top_posting ? 0 : input_message.value.length;
+ pos = this.env.top_posting && this.env.compose_mode ? 0 : input_message.value.length;
// add signature according to selected identity
// if we have HTML editor, signature is added in a callback
@@ -4283,8 +4292,6 @@
if (result) {
// update internal format flag
$("input[name='_is_html']").val(props.html ? 1 : 0);
- // enable encrypted compose toggle
- this.enable_command('compose-encrypted', !props.html);
}
return result;
@@ -7819,8 +7826,6 @@
var url = '?_task=utils&_action=' + (format == 'html' ? 'html2text' : 'text2html'),
lock = this.set_busy(true, 'converting');
- this.log('HTTP POST: ' + url);
-
$.ajax({ type: 'POST', url: url, data: text, contentType: 'application/octet-stream',
error: function(o, status, err) { ref.http_error(o, status, err, lock); },
success: function(data) {
@@ -7894,9 +7899,11 @@
}
};
- this.goto_url = function(action, query, lock)
+ this.goto_url = function(action, query, lock, secure)
{
- this.redirect(this.url(action, query), lock);
+ var url = this.url(action, query)
+ if (secure) url = this.secure_url(url);
+ this.redirect(url, lock);
};
this.location_href = function(url, target, frame)
@@ -8000,22 +8007,23 @@
if (response.env)
this.set_env(response.env);
+ var i;
+
// we have labels to add
if (typeof response.texts === 'object') {
- for (var name in response.texts)
- if (typeof response.texts[name] === 'string')
- this.add_label(name, response.texts[name]);
+ for (i in response.texts)
+ if (typeof response.texts[i] === 'string')
+ this.add_label(i, response.texts[i]);
}
// if we get javascript code from server -> execute it
if (response.exec) {
- this.log(response.exec);
eval(response.exec);
}
// execute callback functions of plugins
if (response.callbacks && response.callbacks.length) {
- for (var i=0; i < response.callbacks.length; i++)
+ for (i=0; i < response.callbacks.length; i++)
this.triggerEvent(response.callbacks[i][0], response.callbacks[i][1]);
}
--
Gitblit v1.9.1