Merge pull request #1851 from DennisKehrig/dk/key-bindings

gruehle · gruehle · commit 22f5ff909a49 · 2012-10-16T10:41:59.000-07:00
Improved error message when trying to overwrite an existing key binding
diff --git a/src/command/KeyBindingManager.js b/src/command/KeyBindingManager.js
@@ -326,7 +326,7 @@ define(function (require, exports, module) {
         // skip if the key is already assigned
         if (_isKeyAssigned(normalized)) {
             console.log("Cannot assign " + normalized + " to " + commandID +
-                        ". It is already assigned to " + _keyMap[normalized]);
+                        ". It is already assigned to " + _keyMap[normalized].commandID);
             return null;
         }
         

Original file line number	Diff line number	Diff line change
`@@ -326,7 +326,7 @@ define(function (require, exports, module) {`
`326`	`326`	`// skip if the key is already assigned`
`327`	`327`	`if (_isKeyAssigned(normalized)) {`
`328`	`328`	`console.log("Cannot assign " + normalized + " to " + commandID +`
`329`		`- ". It is already assigned to " + _keyMap[normalized]);`
	`329`	`+ ". It is already assigned to " + _keyMap[normalized].commandID);`
`330`	`330`	`return null;`
`331`	`331`	`}`
`332`	`332`