diff --git a/src/command/KeyMap.js b/src/command/KeyMap.js index c40d52468f6..5e9acd0ee4c 100644 --- a/src/command/KeyMap.js +++ b/src/command/KeyMap.js @@ -3,7 +3,7 @@ */ /*jslint vars: true, plusplus: true, devel: true, browser: true, nomen: true, indent: 4, maxerr: 50 */ -/*global define: false */ +/*global define: false, brackets: false */ define(function (require, exports, module) { 'use strict'; @@ -24,15 +24,23 @@ define(function (require, exports, module) { } var keyDescriptor = []; - if (hasCtrl) { - keyDescriptor.push("Ctrl"); - } if (hasAlt) { keyDescriptor.push("Alt"); } + if (hasShift) { keyDescriptor.push("Shift"); } + + if (hasCtrl) { + // Windows display Ctrl first, Mac displays Command symbol last + if (brackets.platform === "win") { + keyDescriptor.unshift("Ctrl"); + } else { + keyDescriptor.push("Ctrl"); + } + } + keyDescriptor.push(key); return keyDescriptor.join("-");