diff options
| author | Christopher Smith <chris@jalakai.co.uk> | 2010-10-03 13:32:09 +0100 |
|---|---|---|
| committer | Christopher Smith <chris@jalakai.co.uk> | 2010-10-03 13:32:09 +0100 |
| commit | 05fea6befaf95c4615538cd6ebd127e83712c9c9 (patch) | |
| tree | 418acf10256a625cc72a49890d37e8ab725c5676 /lib/scripts/hotkeys.js | |
| parent | c1e6807d8013592efafd00472f75ea08dc7347ec (diff) | |
| download | rpg-05fea6befaf95c4615538cd6ebd127e83712c9c9.tar.gz rpg-05fea6befaf95c4615538cd6ebd127e83712c9c9.tar.bz2 | |
FS#1958
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) |