adobe
diff --git a/‎src/base-config/keyboard.json
Copy file name to clipboard
+11-22Lines changed: 11 additions & 22 deletions b/‎src/base-config/keyboard.json
Copy file name to clipboard
+11-22Lines changed: 11 additions & 22 deletions
diff --git a/‎src/command/KeyBindingManager.js
Copy file name to clipboard
+114-53Lines changed: 114 additions & 53 deletions b/‎src/command/KeyBindingManager.js
Copy file name to clipboard
+114-53Lines changed: 114 additions & 53 deletions
@@ -31,8 +31,7 @@
     ],
     "edit.selectLine":  [
         {
-            "key": "Ctrl-L",
-            "platform": "win"
+            "key": "Ctrl-L"
         },
         {
             "key": "Ctrl-L",
@@ -47,8 +46,7 @@
     ],
     "edit.findNext":  [
         {
-            "key": "F3",
-            "platform": "win"
+            "key": "F3"
         },
         {
             "key": "Cmd-G",
@@ -57,8 +55,7 @@
     ],
     "edit.findPrevious":  [
         {
-            "key": "Shift-F3",
-            "platform": "win"
+            "key": "Shift-F3"
         },
         {
             "key": "Cmd-Shift-G",
@@ -67,8 +64,7 @@
     ],
     "edit.replace":  [
         {
-            "key": "Ctrl-H",
-            "platform": "win"
+            "key": "Ctrl-H"
         },
         {
             "key": "Cmd-Alt-F",
@@ -96,8 +92,7 @@
     "edit.lineUp":  [
         {
             "key": "Ctrl-Shift-Up",
-            "displayKey": "Ctrl-Shift-↑",
-            "platform": "win"
+            "displayKey": "Ctrl-Shift-↑"
         },
         {
             "key": "Cmd-Ctrl-Up",
@@ -108,8 +103,7 @@
     "edit.lineDown":  [
         {
             "key": "Ctrl-Shift-Down",
-            "displayKey": "Ctrl-Shift-↓",
-            "platform": "win"
+            "displayKey": "Ctrl-Shift-↓"
         },
         {
             "key": "Cmd-Ctrl-Down",
@@ -150,8 +144,7 @@
     ],
     "navigate.gotoLine":  [
         {
-            "key": "Ctrl-G",
-            "platform": "win"
+            "key": "Ctrl-G"
         },
         {
             "key": "Cmd-L",
@@ -163,8 +156,7 @@
     ],
     "navigate.nextDoc":  [
         {
-            "key": "Ctrl-Tab",
-            "platform": "win"
+            "key": "Ctrl-Tab"
         },
         {
             "key": "Ctrl-Tab",
@@ -173,8 +165,7 @@
     ],
     "navigate.prevDoc":  [
         {
-            "key": "Ctrl-Shift-Tab",
-            "platform": "win"
+            "key": "Ctrl-Shift-Tab"
         },
         {
             "key": "Ctrl-Shift-Tab",
@@ -198,8 +189,7 @@
     ],
     "debug.showDeveloperTools":  [
         {
-            "key": "F12",
-            "platform": "win"
+            "key": "F12"
         },
         {
             "key": "Cmd-Opt-I",
@@ -208,8 +198,7 @@
     ],
     "debug.refreshWindow":  [
         {
-            "key": "F5",
-            "platform": "win"
+            "key": "F5"
         },
         {
             "key": "Cmd-R",
 
@@ -232,8 +232,8 @@ define(function (require, exports, module) {
      * Takes a keyboard event and translates it into a key in a key map
      */
     function _translateKeyboardEvent(event) {
-        var hasMacCtrl = (brackets.platform === "win") ? false : (event.ctrlKey),
-            hasCtrl = (brackets.platform === "win") ? (event.ctrlKey) : (event.metaKey),
+        var hasMacCtrl = (brackets.platform === "mac") ? (event.ctrlKey) : false,
+            hasCtrl = (brackets.platform !== "mac") ? (event.ctrlKey) : (event.metaKey),
             hasAlt = (event.altKey),
             hasShift = (event.shiftKey),
             key = String.fromCharCode(event.keyCode);
@@ -298,13 +298,51 @@ define(function (require, exports, module) {
         return (_keyMap[key] !== undefined);
     }
 
+    /**
+     * Remove a key binding from _keymap
+     *
+     * @param {!string} key - a key-description string that may or may not be normalized.
+     * @param {?string} platform - OS from which to remove the binding (all platforms if unspecified)
+     */
+    function removeBinding(key, platform) {
+        if (!key || ((platform !== null) && (platform !== undefined) && (platform !== brackets.platform))) {
+            return;
+        }
+
+        var normalizedKey = normalizeKeyDescriptorString(key);
+        
+        if (!normalizedKey) {
+            console.log("Fail to nomalize " + key);
+        } else if (_isKeyAssigned(normalizedKey)) {
+            var binding = _keyMap[normalizedKey],
+                command = CommandManager.get(binding.commandID),
+                bindings = _commandMap[binding.commandID];
+            
+            // delete key binding record
+            delete _keyMap[normalizedKey];
+            
+            if (bindings) {
+                // delete mapping from command to key binding
+                _commandMap[binding.commandID] = bindings.filter(function (b) {
+                    return (b.key !== normalizedKey);
+                });
+    
+                if (command) {
+                    $(command).triggerHandler("keyBindingRemoved", [{key: normalizedKey, displayKey: binding.displayKey}]);
+                }
+            }
+        }
+    }
+
     /**
      * @private
      *
      * @param {string} commandID
      * @param {string|{{key: string, displayKey: string}}} keyBinding - a single shortcut.
      * @param {?string} platform - undefined indicates all platforms
-     * @return {?{key: string, displayKey:String}} Returns a record for valid key bindings
+     * @return {?{key: string, displayKey:String}} Returns a record for valid key bindings.
+     *     Returns null when key binding platform does not match, binding does not normalize,
+     *     or is already assigned.
      */
     function _addBinding(commandID, keyBinding, platform) {
         var key,
@@ -315,11 +353,6 @@ define(function (require, exports, module) {
             targetPlatform = explicitPlatform || brackets.platform,
             command;
 
-        // skip if this binding doesn't match the current platform
-        if (targetPlatform !== brackets.platform) {
-            return null;
-        }
-        
         key = (keyBinding.key) || keyBinding;
         if (brackets.platform === "mac" && explicitPlatform === undefined) {
             key = key.replace("Ctrl", "Cmd");
@@ -342,6 +375,50 @@ define(function (require, exports, module) {
             return null;
         }
 
+        // for cross-platform compatibility
+        if (brackets.platform !== "mac" &&
+                brackets.platform !== "win") {
+            if (explicitPlatform === "win") {
+                // windows-only key bindings are used as the default binding
+                // only if a default binding wasn't already defined
+                var existing = _keyMap[normalized];
+                
+                // search for a generic or platform-specific binding if it
+                // already exists
+                if (existing &&
+                        (!existing.explicitPlatform || existing.explicitPlatform === brackets.platform)) {
+                    // do not clobber existing binding with windows-only binding
+                    return null;
+                }
+                
+                // target this windows binding for the current platform
+                targetPlatform = brackets.platform;
+            } else if (!explicitPlatform || (explicitPlatform === brackets.platform)) {
+                // if adding a generic binding or a binding for the current
+                // platform, clobber any windows bindings that may have been
+                // installed
+                var existingBindings = _commandMap[commandID] || [],
+                    bindingsToDelete = [];
+                
+                // filter out windows-only bindings in _commandMap
+                existingBindings.forEach(function (binding) {
+                    if (binding.explicitPlatform === "win") {
+                        bindingsToDelete.push(binding);
+                    }
+                });
+                
+                // delete windows-only bindings in _keyMap
+                bindingsToDelete.forEach(function (binding) {
+                    removeBinding(binding.key);
+                });
+            }
+        }
+        
+        // skip if this binding doesn't match the current platform
+        if (targetPlatform !== brackets.platform) {
+            return null;
+        }
+        
         // optional display-friendly string (e.g. CMD-+ instead of CMD-=)
         normalizedDisplay = (keyBinding.displayKey) ? normalizeKeyDescriptorString(keyBinding.displayKey) : normalized;
 
@@ -350,11 +427,21 @@ define(function (require, exports, module) {
             _commandMap[commandID] = [];
         }
 
-        result = {key: normalized, displayKey: normalizedDisplay};
+        result = {
+            key                 : normalized,
+            displayKey          : normalizedDisplay,
+            explicitPlatform    : explicitPlatform
+        };
+        
         _commandMap[commandID].push(result);
 
         // 1-to-1 key binding to commandID
-        _keyMap[normalized] = {commandID: commandID, key: normalized, displayKey: normalizedDisplay};
+        _keyMap[normalized] = {
+            commandID           : commandID,
+            key                 : normalized,
+            displayKey          : normalizedDisplay,
+            explicitPlatform    : explicitPlatform
+        };
 
         // notify listeners
         command = CommandManager.get(commandID);
@@ -404,12 +491,16 @@ define(function (require, exports, module) {
      * Add one or more key bindings to a particular Command.
      * 
      * @param {!string} commandID
-     * @param {?({key: string, displayKey: string} | Array.<{key: string, displayKey: string, platform: string}>)}  keyBindings - a single key binding
-     *      or an array of keybindings. Example: "Shift-Cmd-F". Mac and Win key equivalents are automatically
-     *      mapped to each other. Use displayKey property to display a different string (e.g. "CMD+" instead of "CMD=").
-     * @param {?string} platform - the target OS of the keyBindings either "mac" or "win". If undefined, all platforms will use
-     *      the key binding. Ignored if keyBindings is passed an Array.
-     * @return {{key: string, displayKey:String}|Array.<{key: string, displayKey:String}>} Returns record(s) for valid key binding(s)
+     * @param {?({key: string, displayKey: string} | Array.<{key: string, displayKey: string, platform: string}>)} keyBindings
+     *     a single key binding or an array of keybindings. Example:
+     *     "Shift-Cmd-F". Mac and Win key equivalents are automatically
+     *     mapped to each other. Use displayKey property to display a different
+     *     string (e.g. "CMD+" instead of "CMD=").
+     * @param {?string} platform - the target OS of the keyBindings either
+     *     "mac", "win" or "linux". If undefined, all platforms not explicitly
+     *     defined will use the key binding.
+     * @return {{key: string, displayKey:String}|Array.<{key: string, displayKey:String}>}
+     *     Returns record(s) for valid key binding(s)
      */
     function addBinding(commandID, keyBindings, platform) {
         if ((commandID === null) || (commandID === undefined) || !keyBindings) {
@@ -424,7 +515,8 @@ define(function (require, exports, module) {
             var keyBinding;
             results = [];
 
-            keyBindings.forEach(function (keyBindingRequest) {
+            keyBindings.forEach(function addSingleBinding(keyBindingRequest) {
+                // attempt to add keybinding
                 keyBinding = _addBinding(commandID, keyBindingRequest, keyBindingRequest.platform);
 
                 if (keyBinding) {
@@ -437,42 +529,6 @@ define(function (require, exports, module) {
 
         return results;
     }
-
-    /**
-     * Remove a key binding from _keymap
-     *
-     * @param {!string} key - a key-description string that may or may not be normalized.
-     * @param {?string} platform - OS from which to remove the binding (all platforms if unspecified)
-     */
-    function removeBinding(key, platform) {
-        if (!key || ((platform !== null) && (platform !== undefined) && (platform !== brackets.platform))) {
-            return;
-        }
-
-        var normalizedKey = normalizeKeyDescriptorString(key);
-        
-        if (!normalizedKey) {
-            console.log("Fail to nomalize " + key);
-        } else if (_isKeyAssigned(normalizedKey)) {
-            var binding = _keyMap[normalizedKey],
-                command = CommandManager.get(binding.commandID),
-                bindings = _commandMap[binding.commandID];
-            
-            // delete key binding record
-            delete _keyMap[normalizedKey];
-            
-            if (bindings) {
-                // delete mapping from command to key binding
-                _commandMap[binding.commandID] = bindings.filter(function (b) {
-                    return (b.key !== normalizedKey);
-                });
-    
-                if (command) {
-                    $(command).triggerHandler("keyBindingRemoved", [{key: normalizedKey, displayKey: binding.displayKey}]);
-                }
-            }
-        }
-    }
 
     /**
      * Retrieve key bindings currently associated with a command
@@ -485,6 +541,11 @@ define(function (require, exports, module) {
         return bindings || [];
     }
 
+    /**
+     * Adds default key bindings when commands are registered to CommandManager
+     * @param {$.Event} event jQuery event
+     * @param {Command} command Newly registered command
+     */
     function _handleCommandRegistered(event, command) {
         var commandId   = command.getID(),
             defaults    = KeyboardPrefs[commandId];
Original file line number	Diff line number	Diff line change
`@@ -31,8 +31,7 @@`
`31`	`31`	`],`
`32`	`32`	`"edit.selectLine": [`
`33`	`33`	`{`
`34`		`- "key": "Ctrl-L",`
`35`		`- "platform": "win"`
	`34`	`+ "key": "Ctrl-L"`
`36`	`35`	`},`
`37`	`36`	`{`
`38`	`37`	`"key": "Ctrl-L",`
`@@ -47,8 +46,7 @@`
`47`	`46`	`],`
`48`	`47`	`"edit.findNext": [`
`49`	`48`	`{`
`50`		`- "key": "F3",`
`51`		`- "platform": "win"`
	`49`	`+ "key": "F3"`
`52`	`50`	`},`
`53`	`51`	`{`
`54`	`52`	`"key": "Cmd-G",`
`@@ -57,8 +55,7 @@`
`57`	`55`	`],`
`58`	`56`	`"edit.findPrevious": [`
`59`	`57`	`{`
`60`		`- "key": "Shift-F3",`
`61`		`- "platform": "win"`
	`58`	`+ "key": "Shift-F3"`
`62`	`59`	`},`
`63`	`60`	`{`
`64`	`61`	`"key": "Cmd-Shift-G",`
`@@ -67,8 +64,7 @@`
`67`	`64`	`],`
`68`	`65`	`"edit.replace": [`
`69`	`66`	`{`
`70`		`- "key": "Ctrl-H",`
`71`		`- "platform": "win"`
	`67`	`+ "key": "Ctrl-H"`
`72`	`68`	`},`
`73`	`69`	`{`
`74`	`70`	`"key": "Cmd-Alt-F",`
`@@ -96,8 +92,7 @@`
`96`	`92`	`"edit.lineUp": [`
`97`	`93`	`{`
`98`	`94`	`"key": "Ctrl-Shift-Up",`
`99`		`- "displayKey": "Ctrl-Shift-↑",`
`100`		`- "platform": "win"`
	`95`	`+ "displayKey": "Ctrl-Shift-↑"`
`101`	`96`	`},`
`102`	`97`	`{`
`103`	`98`	`"key": "Cmd-Ctrl-Up",`
`@@ -108,8 +103,7 @@`
`108`	`103`	`"edit.lineDown": [`
`109`	`104`	`{`
`110`	`105`	`"key": "Ctrl-Shift-Down",`
`111`		`- "displayKey": "Ctrl-Shift-↓",`
`112`		`- "platform": "win"`
	`106`	`+ "displayKey": "Ctrl-Shift-↓"`
`113`	`107`	`},`
`114`	`108`	`{`
`115`	`109`	`"key": "Cmd-Ctrl-Down",`
`@@ -150,8 +144,7 @@`
`150`	`144`	`],`
`151`	`145`	`"navigate.gotoLine": [`
`152`	`146`	`{`
`153`		`- "key": "Ctrl-G",`
`154`		`- "platform": "win"`
	`147`	`+ "key": "Ctrl-G"`
`155`	`148`	`},`
`156`	`149`	`{`
`157`	`150`	`"key": "Cmd-L",`
`@@ -163,8 +156,7 @@`
`163`	`156`	`],`
`164`	`157`	`"navigate.nextDoc": [`
`165`	`158`	`{`
`166`		`- "key": "Ctrl-Tab",`
`167`		`- "platform": "win"`
	`159`	`+ "key": "Ctrl-Tab"`
`168`	`160`	`},`
`169`	`161`	`{`
`170`	`162`	`"key": "Ctrl-Tab",`
`@@ -173,8 +165,7 @@`
`173`	`165`	`],`
`174`	`166`	`"navigate.prevDoc": [`
`175`	`167`	`{`
`176`		`- "key": "Ctrl-Shift-Tab",`
`177`		`- "platform": "win"`
	`168`	`+ "key": "Ctrl-Shift-Tab"`
`178`	`169`	`},`
`179`	`170`	`{`
`180`	`171`	`"key": "Ctrl-Shift-Tab",`
`@@ -198,8 +189,7 @@`
`198`	`189`	`],`
`199`	`190`	`"debug.showDeveloperTools": [`
`200`	`191`	`{`
`201`		`- "key": "F12",`
`202`		`- "platform": "win"`
	`192`	`+ "key": "F12"`
`203`	`193`	`},`
`204`	`194`	`{`
`205`	`195`	`"key": "Cmd-Opt-I",`
`@@ -208,8 +198,7 @@`
`208`	`198`	`],`
`209`	`199`	`"debug.refreshWindow": [`
`210`	`200`	`{`
`211`		`- "key": "F5",`
`212`		`- "platform": "win"`
	`201`	`+ "key": "F5"`
`213`	`202`	`},`
`214`	`203`	`{`
`215`	`204`	`"key": "Cmd-R",`