summaryrefslogtreecommitdiff
path: root/program
diff options
context:
space:
mode:
authorAleksander Machniak <alec@alec.pl>2013-03-28 20:13:39 +0100
committerAleksander Machniak <alec@alec.pl>2013-03-28 20:15:26 +0100
commit60fd3c8b5f112457f595fe0ac250701413d2f7fa (patch)
treeadf10bcb17f0b10502aeceecd46d0f1a5acf93a8 /program
parentbb13a8805435874996922f930020d695037ef160 (diff)
Fix keyboard events on list widgets in Internet Explorer (#1489025) - It was a regression in fix for #1489008
Diffstat (limited to 'program')
-rw-r--r--program/js/app.js5
-rw-r--r--program/js/common.js7
-rw-r--r--program/js/list.js1
3 files changed, 5 insertions, 8 deletions
diff --git a/program/js/app.js b/program/js/app.js
index 8e5bc540a..5d6d2c1de 100644
--- a/program/js/app.js
+++ b/program/js/app.js
@@ -178,11 +178,6 @@ function rcube_webmail()
parent.rcmail.env.frame_lock = null;
}
- // Makes that reference to document.activeElement do not throw
- // "unspecified error" in IE9 (#1489008)
- if (this.env.framed && bw.ie)
- document.documentElement.focus();
-
// enable general commands
this.enable_command('close', 'logout', 'mail', 'addressbook', 'settings', 'save-pref', 'compose', 'undo', 'about', 'switch-task', true);
diff --git a/program/js/common.js b/program/js/common.js
index 1075225b4..f7c0a7536 100644
--- a/program/js/common.js
+++ b/program/js/common.js
@@ -717,7 +717,7 @@ if (bw.ie) {
// jQuery plugin to emulate HTML5 placeholder attributes on input elements
jQuery.fn.placeholder = function(text) {
return this.each(function() {
- var elem = $(this);
+ var active = false, elem = $(this);
this.title = text;
// Try HTML5 placeholder attribute first
@@ -742,8 +742,9 @@ jQuery.fn.placeholder = function(text) {
elem[(active ? 'addClass' : 'removeClass')]('placeholder').attr('spellcheck', active);
});
- // Do not blur currently focused element
- if (this != document.activeElement)
+ // Do not blur currently focused element (catch exception: #1489008)
+ try { active = this == document.activeElement; } catch(e) {}
+ if (!active)
elem.blur();
}
});
diff --git a/program/js/list.js b/program/js/list.js
index 660b74d85..6b8bb39c7 100644
--- a/program/js/list.js
+++ b/program/js/list.js
@@ -687,6 +687,7 @@ select_row: function(id, mod_key, with_mouse)
this.shift_start = null;
this.last_selected = id;
+ this.list.focus();
},