summaryrefslogtreecommitdiff
path: root/common
diff options
context:
space:
mode:
authorKris Maglione <maglione.k@gmail.com>2011-03-19 15:52:39 -0400
committerKris Maglione <maglione.k@gmail.com>2011-03-19 15:52:39 -0400
commit2a48b8bc863309e467f86a88d9737796c2b0c075 (patch)
tree1aac74915e54bdef812c5a6b80e9000169663cea /common
parentde04fc99d4bcd4d57ad9d1249b1a0eae7bd12be9 (diff)
downloadpentadactyl-2a48b8bc863309e467f86a88d9737796c2b0c075.tar.gz
Fix feedkeys issue.
--HG-- extra : rebase_source : 3b5128e8cc36dc6f94a7b55092d331e8ce5305f4
Diffstat (limited to 'common')
-rw-r--r--common/content/events.js12
1 files changed, 6 insertions, 6 deletions
diff --git a/common/content/events.js b/common/content/events.js
index 4f5f6a38..36ba5b1b 100644
--- a/common/content/events.js
+++ b/common/content/events.js
@@ -670,7 +670,7 @@ var Events = Module("events", {
let doc = document.commandDispatcher.focusedWindow.document;
let event = events.create(doc, type, evt);
- if (!evt_obj.dactylString && !evt_obj.dactylShift && !mode)
+ if (!evt_obj.dactylString && !mode)
events.dispatch(dactyl.focusedElement
|| ["complete", "interactive"].indexOf(doc.readyState) >= 0 && doc.documentElement
|| doc.defaultView,
@@ -865,11 +865,11 @@ var Events = Module("events", {
if (keyname && (unknownOk || keyname.length == 1 || /mouse$/.test(keyname) ||
this._key_code[keyname] || set.has(this._pseudoKeys, keyname))) {
- evt_obj.globKey = modifier["*"];
- evt_obj.ctrlKey = modifier["C"];
- evt_obj.altKey = modifier["A"];
- evt_obj.shiftKey = modifier["S"];
- evt_obj.metaKey = modifier["M"];
+ evt_obj.globKey ="*" in modifier;
+ evt_obj.ctrlKey ="C" in modifier;
+ evt_obj.altKey ="A" in modifier;
+ evt_obj.shiftKey ="S" in modifier;
+ evt_obj.metaKey ="M" in modifier;
evt_obj.dactylShift = evt_obj.shiftKey;
if (keyname.length == 1) { // normal characters