diff options
| author | Michael Hamann <michael@content-space.de> | 2010-10-10 14:26:22 +0200 |
|---|---|---|
| committer | Michael Hamann <michael@content-space.de> | 2010-10-10 14:26:22 +0200 |
| commit | 762b4c44c691f69d521413d7016314e7f547c102 (patch) | |
| tree | 95ab294b1df2f8c7a5efb56762a0f284bec3754e /lib/scripts/hotkeys.js | |
| parent | eae17177de8f3f3580af5ea66d126aee0f23227f (diff) | |
| parent | 4ea48b361401e136dbfd3339af368ceeb5b27480 (diff) | |
| download | rpg-762b4c44c691f69d521413d7016314e7f547c102.tar.gz rpg-762b4c44c691f69d521413d7016314e7f547c102.tar.bz2 | |
Merge remote branch 'origin/master' into sitemap
Diffstat (limited to 'lib/scripts/hotkeys.js')
| -rw-r--r-- | lib/scripts/hotkeys.js | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/lib/scripts/hotkeys.js b/lib/scripts/hotkeys.js index 356b691ea..ad608b227 100644 --- a/lib/scripts/hotkeys.js +++ b/lib/scripts/hotkeys.js @@ -208,7 +208,7 @@ function Hotkeys() { /** * @property isMac */ - this.isMac = (navigator.userAgent.indexOf('Mac') != -1); + this.isMac = is_macos; /** * Apply function cb on each element of o in the namespace of s @@ -272,9 +272,7 @@ function Hotkeys() { } t.each(t.shortcuts, function(o) { - if (t.isMac && o.ctrl != e.metaKey) - return; - else if (!t.isMac && o.ctrl != e.ctrlKey) + if (o.ctrl != e.ctrlKey) return; if (o.alt != e.altKey) |