Tentative fix for DFL-3440 Catch up with keyboard changes on Mac

Chris K · Chris K · commit b79dff054124 · 2012-08-07T14:24:25.000+02:00
diff --git a/src/ui-scripts/actions/keyidentifier.js b/src/ui-scripts/actions/keyidentifier.js
@@ -72,14 +72,14 @@
       var tokens = shortcut.split(/[ ,\+]+/).map(function(t)
       {
         t = t.toLowerCase();
-        // on Mac Opera cmd and ctrl are switched
+        // on Mac Opera cmd sets the meta flag
         if (t == "cmd")
-          t = "ctrl";
+          t = "meta";
 
         return t;
       });
 
-      var mod_key = ["shift", "ctrl", "alt"/*, "meta"*/].reduce(function(m_key, mod, index)
+      var mod_key = ["shift", "ctrl", "alt", "meta"].reduce(function(m_key, mod, index)
       {
         var pos = tokens.indexOf(mod);
         if (pos > -1)
@@ -199,7 +199,7 @@
   // opera
   this._handle_keydown_bound = function(event)
   {
-    var mod_key = ["shift", "ctrl", "alt"/*, "meta"*/].reduce(function(m_key, mod, index)
+    var mod_key = ["shift", "ctrl", "alt", "meta"].reduce(function(m_key, mod, index)
     {
       return m_key | (event[mod + "Key"] ? Math.pow(2, index) : 0);
     }, 0);

Original file line number	Diff line number	Diff line change
`@@ -72,14 +72,14 @@`
`72`	`72`	`var tokens = shortcut.split(/[ ,\+]+/).map(function(t)`
`73`	`73`	`{`
`74`	`74`	`t = t.toLowerCase();`
`75`		`- // on Mac Opera cmd and ctrl are switched`
	`75`	`+ // on Mac Opera cmd sets the meta flag`
`76`	`76`	`if (t == "cmd")`
`77`		`- t = "ctrl";`
	`77`	`+ t = "meta";`
`78`	`78`
`79`	`79`	`return t;`
`80`	`80`	`});`
`81`	`81`
`82`		`- var mod_key = ["shift", "ctrl", "alt"/, "meta"/].reduce(function(m_key, mod, index)`
	`82`	`+ var mod_key = ["shift", "ctrl", "alt", "meta"].reduce(function(m_key, mod, index)`
`83`	`83`	`{`
`84`	`84`	`var pos = tokens.indexOf(mod);`
`85`	`85`	`if (pos > -1)`
`@@ -199,7 +199,7 @@`
`199`	`199`	`// opera`
`200`	`200`	`this._handle_keydown_bound = function(event)`
`201`	`201`	`{`
`202`		`- var mod_key = ["shift", "ctrl", "alt"/, "meta"/].reduce(function(m_key, mod, index)`
	`202`	`+ var mod_key = ["shift", "ctrl", "alt", "meta"].reduce(function(m_key, mod, index)`
`203`	`203`	`{`
`204`	`204`	`return m_key \| (event[mod + "Key"] ? Math.pow(2, index) : 0);`
`205`	`205`	`}, 0);`