diff options
| author | Hakan Sandell <hakan.sandell@home.se> | 2010-10-08 21:15:19 +0200 |
|---|---|---|
| committer | Hakan Sandell <hakan.sandell@home.se> | 2010-10-08 21:15:19 +0200 |
| commit | e3626db54846ba20cefbc1a9e2d8e29c40137067 (patch) | |
| tree | be549543a7c36718ffb06a6293fe80ee0675ec92 /lib/scripts/hotkeys.js | |
| parent | 7cceaa7443c80b526a6bbad32b6cbdf5d759fd39 (diff) | |
| parent | 4ea48b361401e136dbfd3339af368ceeb5b27480 (diff) | |
| download | rpg-e3626db54846ba20cefbc1a9e2d8e29c40137067.tar.gz rpg-e3626db54846ba20cefbc1a9e2d8e29c40137067.tar.bz2 | |
Merge branch 'master' of git://github.com/splitbrain/dokuwiki
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) |