gryf/pentadactyl-pm
1
0
Fork 0
mirror of https://github.com/gryf/pentadactyl-pm.git synced 2025-12-23 01:37:58 +01:00
Code Issues Projects Releases Wiki Activity

Don't derive Text Edit mode from Operator mode. Allow escaping from Operator mode.

Browse Source
This commit is contained in:
Kris Maglione
2011-08-06 14:25:43 -04:00
parent 48d1109f6a
commit ff0c5af5db
3 changed files with 10 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
common/content/modes.js
View File

@@ -66,7 +66,7 @@ var Modes = Module("modes", {
char: "v",
description: "Active when text is selected",
display: function () "VISUAL" + (this._extended & modes.LINE ? " LINE" : ""),
bases: [this.COMMAND, this.OPERATOR],
bases: [this.COMMAND],
ownsFocus: true
}, {
leave: function (stack, newMode) {
@@ -102,7 +102,7 @@ var Modes = Module("modes", {
this.addMode("TEXT_EDIT", {
char: "t",
description: "Vim-like editing of input elements",
bases: [this.OPERATOR, this.COMMAND],
bases: [this.COMMAND],
ownsFocus: true
}, {
onKeyPress: function (eventList) {
@@ -452,8 +452,7 @@ var Modes = Module("modes", {
while (this._modeStack.length > 1 && this.main != mode) {
let a = this._modeStack.pop();
this.set(this.topOfStack.main, this.topOfStack.extended, this.topOfStack.params,
update({ pop: a },
args || {}));
update({ pop: a }, args));
if (mode == null)
return;
@@ -595,10 +594,10 @@ var Modes = Module("modes", {
"Return to Normal mode",
function () { modes.reset(); });
mappings.add([modes.INPUT, modes.COMMAND, modes.PASS_THROUGH, modes.QUOTE],
mappings.add([modes.INPUT, modes.COMMAND, modes.OPERATOR, modes.PASS_THROUGH, modes.QUOTE],
["<Esc>", "<C-[>"],
"Return to the previous mode",
function () { modes.pop(); });
function () { modes.pop(null, { fromEscape: true }); });
mappings.add([modes.MENU], ["<C-c>"],
"Leave Menu mode",