From 05fea6befaf95c4615538cd6ebd127e83712c9c9 Mon Sep 17 00:00:00 2001
From: Christopher Smith <chris@jalakai.co.uk>
Date: Sun, 3 Oct 2010 13:32:09 +0100
Subject: FS#1958

---
 lib/scripts/hotkeys.js | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

(limited to 'lib/scripts/hotkeys.js')

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)
-- 
cgit v1.2.3