Skip to content
This repository has been archived by the owner on Sep 6, 2021. It is now read-only.

Key map optimizations #824

Merged
merged 3 commits into from
May 8, 2012
Merged

Key map optimizations #824

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
3b1681f
Removing link to Google Plus Page. Will re-add once we drive broader …
mikechambers Apr 27, 2012
68dba5f
Refactoring of _normalizeKeyDescriptorString. Moved _isModifier defin…
mikechambers May 8, 2012
15d1a13
blah
mikechambers May 8, 2012
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
34 changes: 17 additions & 17 deletions src/command/KeyMap.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,19 @@ define(function (require, exports, module) {
return keyDescriptor.join("-");
}

function _isModifier(left, right, previouslyFound, origDescriptor) {
if (!left || !right) {
return false;
}
left = left.trim().toLowerCase();
right = right.trim().toLowerCase();
var matched = (left.length > 0 && left === right);
if (matched && previouslyFound) {
console.log("KeyMap _normalizeKeyDescriptorString() - Modifier defined twice: " + origDescriptor);
}
return matched;
}

/**
* @private
* normalizes the incoming key descriptor so the modifier keys are always specified in the correct order
Expand All @@ -78,31 +91,18 @@ define(function (require, exports, module) {
hasShift = false,
key = "";

function _isModifier(left, right, previouslyFound) {
if (!left || !right) {
return false;
}
left = left.trim().toLowerCase();
right = right.trim().toLowerCase();
var matched = (left.length > 0 && left === right);
if (matched && previouslyFound) {
console.log("KeyMap _normalizeKeyDescriptorString() - Modifier defined twice: " + origDescriptor);
}
return matched;
}

origDescriptor.split("-").forEach(function parseDescriptor(ele, i, arr) {
if (_isModifier("ctrl", ele, hasCtrl)) {
hasCtrl = true;
} else if (_isModifier("cmd", ele, hasCtrl)) {
} else if (_isModifier("cmd", ele, hasCtrl, origDescriptor)) {
console.log("KeyMap _normalizeKeyDescriptorString() - Cmd getting mapped to Ctrl from: " + origDescriptor);
hasCtrl = true;
} else if (_isModifier("alt", ele, hasAlt)) {
} else if (_isModifier("alt", ele, hasAlt, origDescriptor)) {
hasAlt = true;
} else if (_isModifier("opt", ele, hasAlt)) {
} else if (_isModifier("opt", ele, hasAlt, origDescriptor)) {
console.log("KeyMap _normalizeKeyDescriptorString() - Opt getting mapped to Alt from: " + origDescriptor);
hasAlt = true;
} else if (_isModifier("shift", ele, hasShift)) {
} else if (_isModifier("shift", ele, hasShift, origDescriptor)) {
hasShift = true;
} else if (key.length > 0) {
console.log("KeyMap _normalizeKeyDescriptorString() - Multiple keys defined. Using key: " + key + " from: " + origDescriptor);
Expand Down