From 7c26dbd36fdfa4f2f70d878d420ee59ad5c2aaac Mon Sep 17 00:00:00 2001
From: Aleksander Machniak <alec@alec.pl>
Date: Fri, 16 Jan 2015 03:50:40 -0500
Subject: [PATCH] Fix javascript error in "IE 8.0/Tablet PC" browser (#1490210)
---
program/js/app.js | 11 ++++-------
1 files changed, 4 insertions(+), 7 deletions(-)
diff --git a/program/js/app.js b/program/js/app.js
index f132a2c..123f1fe 100644
--- a/program/js/app.js
+++ b/program/js/app.js
@@ -983,12 +983,9 @@
url = {};
if (this.task == 'mail') {
- url._mbox = this.env.mailbox;
+ url = {_mbox: this.env.mailbox, _search: this.env.search_request};
if (props)
url._to = props;
- // also send search request so we can go back to search result after message is sent
- if (this.env.search_request)
- url._search = this.env.search_request;
}
// modify url if we're in addressbook
else if (this.task == 'addressbook') {
@@ -1089,9 +1086,9 @@
case 'reply-list':
case 'reply':
if (uid = this.get_single_uid()) {
- url = {_reply_uid: uid, _mbox: this.env.mailbox};
+ url = {_reply_uid: uid, _mbox: this.env.mailbox, _search: this.env.search_request};
+ // do reply-list, when list is detected and popup menu wasn't used
if (command == 'reply-all')
- // do reply-list, when list is detected and popup menu wasn't used
url._all = (!props && this.env.reply_all_mode == 1 && this.commands['reply-list'] ? 'list' : 'all');
else if (command == 'reply-list')
url._all = 'list';
@@ -1811,7 +1808,7 @@
// attach events
$.each(fn, function(i, f) {
row[i].onclick = function(e) { f(e); return rcube_event.cancel(e); };
- if (bw.touch) {
+ if (bw.touch && row[i].addEventListener) {
row[i].addEventListener('touchend', function(e) {
if (e.changedTouches.length == 1) {
f(e);
--
Gitblit v1.9.1