From 53f647b488c3dc59afc3feb4568d47f6a0d9ed49 Mon Sep 17 00:00:00 2001 From: Doug Kearns Date: Thu, 5 Jul 2007 06:48:15 +0000 Subject: [PATCH] reformat hints mode mapping definitions --- chrome/content/vimperator/mappings.js | 189 ++++++++++++++++++------ chrome/content/vimperator/vimperator.js | 17 ++- 2 files changed, 153 insertions(+), 53 deletions(-) diff --git a/chrome/content/vimperator/mappings.js b/chrome/content/vimperator/mappings.js index 5ebb4c4c..f62d994b 100644 --- a/chrome/content/vimperator/mappings.js +++ b/chrome/content/vimperator/mappings.js @@ -195,9 +195,10 @@ function Mappings() //{{{ ////////////////////// DEFAULT MAPPINGS //////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////{{{ - /* - * Normal mode - */ + // + // Normal mode + // {{{ + addDefaultMap(new Map(vimperator.modes.NORMAL, ["'", "`"], function(mark) { vimperator.marks.jumpTo(mark) }, { @@ -487,7 +488,7 @@ function Mappings() //{{{ } )); - /* scrolling commands */ + // scrolling commands addDefaultMap(new Map(vimperator.modes.NORMAL, ["0", "^"], function(count) { scrollBufferAbsolute(0, -1); }, { @@ -569,7 +570,7 @@ function Mappings() //{{{ } )); - /* history manipulation and jumplist */ + // history manipulation and jumplist addDefaultMap(new Map(vimperator.modes.NORMAL, [""], function(count) { vimperator.history.stepTo(count > 0 ? -1 * count : -1); }, { @@ -619,7 +620,7 @@ function Mappings() //{{{ } )); - /* hint managment */ + // hint managment addDefaultMap(new Map(vimperator.modes.NORMAL, ["f"], function(count) { vimperator.hints.enableHahMode(vimperator.modes.QUICK_HINT); }, { @@ -662,7 +663,7 @@ function Mappings() //{{{ } )); - /* search managment */ + // search managment addDefaultMap(new Map(vimperator.modes.NORMAL, ["g/"], function(count) { vimperator.search.openSearchDialog(); }, { @@ -685,7 +686,7 @@ function Mappings() //{{{ } )); - /* vimperator managment */ + // vimperator managment addDefaultMap(new Map(vimperator.modes.NORMAL, [""], function(count) { vimperator.help(null); }, { @@ -736,50 +737,144 @@ function Mappings() //{{{ } )); - /* - * Hints mode - */ + // }}} + // Hints mode + // {{{ - /* action keys */ - addDefaultMap(new Map(vimperator.modes.HINTS, ["o"], function() { vimperator.hints.openHints(false, false); }, { cancel_mode: true, always_active: false })); - addDefaultMap(new Map(vimperator.modes.HINTS, ["t"], function() { vimperator.hints.openHints(true, false); }, { cancel_mode: true, always_active: false })); - addDefaultMap(new Map(vimperator.modes.HINTS, [""], function() { vimperator.hints.openHints(false, true ); }, { cancel_mode: true, always_active: false })); - addDefaultMap(new Map(vimperator.modes.HINTS, ["s"], function() { vimperator.echoerr('Saving of links not yet implemented'); }, { cancel_mode: true, always_active: false })); - addDefaultMap(new Map(vimperator.modes.HINTS, ["y"], function() { vimperator.hints.yankUrlHints(); }, { cancel_mode: true, always_active: false })); - addDefaultMap(new Map(vimperator.modes.HINTS, ["Y"], function() { vimperator.hints.yankTextHints(); }, { cancel_mode: true, always_active: false })); - addDefaultMap(new Map(vimperator.modes.HINTS, [","], function() { vimperator.input.buffer += ','; vimperator.hints.setCurrentState(0); }, { cancel_mode: false, always_active: true })); - addDefaultMap(new Map(vimperator.modes.HINTS, [":"], function() { vimperator.commandline.open(':', '', vimperator.modes.EX); }, { cancel_mode: false, always_active: true })); + // action keys + addDefaultMap(new Map(vimperator.modes.HINTS, ["o"], + function() { vimperator.hints.openHints(false, false); }, + { cancel_mode: true, always_active: false } + )); + addDefaultMap(new Map(vimperator.modes.HINTS, ["t"], + function() { vimperator.hints.openHints(true, false); }, + { cancel_mode: true, always_active: false } + )); + addDefaultMap(new Map(vimperator.modes.HINTS, [""], + function() { vimperator.hints.openHints(false, true ); }, + { cancel_mode: true, always_active: false } + )); + addDefaultMap(new Map(vimperator.modes.HINTS, ["s"], + function() { vimperator.echoerr('Saving of links not yet implemented'); }, + { cancel_mode: true, always_active: false } + )); + addDefaultMap(new Map(vimperator.modes.HINTS, ["y"], + function() { vimperator.hints.yankUrlHints(); }, + { cancel_mode: true, always_active: false } + )); + addDefaultMap(new Map(vimperator.modes.HINTS, ["Y"], + function() { vimperator.hints.yankTextHints(); }, + { cancel_mode: true, always_active: false } + )); + addDefaultMap(new Map(vimperator.modes.HINTS, [","], + function() { vimperator.input.buffer += ','; vimperator.hints.setCurrentState(0); }, + { cancel_mode: false, always_active: true } + )); + addDefaultMap(new Map(vimperator.modes.HINTS, [":"], + function() { vimperator.commandline.open(':', '', vimperator.modes.EX); }, + { cancel_mode: false, always_active: true } + )); - /* movement keys */ - addDefaultMap(new Map(vimperator.modes.HINTS, [""], function() { scrollBufferRelative(0, 1); }, { cancel_mode: false, always_active: true })); - addDefaultMap(new Map(vimperator.modes.HINTS, [""], function() { scrollBufferRelative(0, -1); }, { cancel_mode: false, always_active: true })); - addDefaultMap(new Map(vimperator.modes.HINTS, [""], function() { scrollBufferAbsolute(-1, 0); }, { cancel_mode: false, always_active: true })); - addDefaultMap(new Map(vimperator.modes.HINTS, [""], function() { scrollBufferAbsolute(-1, 100); }, { cancel_mode: false, always_active: true })); - addDefaultMap(new Map(vimperator.modes.HINTS, [""], function() { goDoCommand('cmd_scrollPageUp'); }, { cancel_mode: false, always_active: true })); - addDefaultMap(new Map(vimperator.modes.HINTS, [""], function() { goDoCommand('cmd_scrollPageUp'); }, { cancel_mode: false, always_active: true })); - addDefaultMap(new Map(vimperator.modes.HINTS, [""], function() { goDoCommand('cmd_scrollPageDown'); }, { cancel_mode: false, always_active: true })); - addDefaultMap(new Map(vimperator.modes.HINTS, [""], function() { goDoCommand('cmd_scrollPageDown'); }, { cancel_mode: false, always_active: true })); - addDefaultMap(new Map(vimperator.modes.HINTS, [""], function() { scrollBufferRelative(-1, 0); }, { cancel_mode: false, always_active: true })); - addDefaultMap(new Map(vimperator.modes.HINTS, [""], function() { scrollBufferRelative(0, 1); }, { cancel_mode: false, always_active: true })); - addDefaultMap(new Map(vimperator.modes.HINTS, [""], function() { scrollBufferRelative(0, -1); }, { cancel_mode: false, always_active: true })); - addDefaultMap(new Map(vimperator.modes.HINTS, [""], function() { scrollBufferRelative(1, 0); }, { cancel_mode: false, always_active: true })); + // movement keys + addDefaultMap(new Map(vimperator.modes.HINTS, [""], + function() { scrollBufferRelative(0, 1); }, + { cancel_mode: false, always_active: true } + )); + addDefaultMap(new Map(vimperator.modes.HINTS, [""], + function() { scrollBufferRelative(0, -1); }, + { cancel_mode: false, always_active: true } + )); + addDefaultMap(new Map(vimperator.modes.HINTS, [""], + function() { scrollBufferAbsolute(-1, 0); }, + { cancel_mode: false, always_active: true } + )); + addDefaultMap(new Map(vimperator.modes.HINTS, [""], + function() { scrollBufferAbsolute(-1, 100); }, + { cancel_mode: false, always_active: true } + )); + addDefaultMap(new Map(vimperator.modes.HINTS, [""], + function() { goDoCommand('cmd_scrollPageUp'); }, + { cancel_mode: false, always_active: true } + )); + addDefaultMap(new Map(vimperator.modes.HINTS, [""], + function() { goDoCommand('cmd_scrollPageUp'); }, + { cancel_mode: false, always_active: true } + )); + addDefaultMap(new Map(vimperator.modes.HINTS, [""], + function() { goDoCommand('cmd_scrollPageDown'); }, + { cancel_mode: false, always_active: true } + )); + addDefaultMap(new Map(vimperator.modes.HINTS, [""], + function() { goDoCommand('cmd_scrollPageDown'); }, + { cancel_mode: false, always_active: true } + )); + addDefaultMap(new Map(vimperator.modes.HINTS, [""], + function() { scrollBufferRelative(-1, 0); }, + { cancel_mode: false, always_active: true } + )); + addDefaultMap(new Map(vimperator.modes.HINTS, [""], + function() { scrollBufferRelative(0, 1); }, + { cancel_mode: false, always_active: true } + )); + addDefaultMap(new Map(vimperator.modes.HINTS, [""], + function() { scrollBufferRelative(0, -1); }, + { cancel_mode: false, always_active: true } + )); + addDefaultMap(new Map(vimperator.modes.HINTS, [""], + function() { scrollBufferRelative(1, 0); }, + { cancel_mode: false, always_active: true } + )); - /* tab managment */ - addDefaultMap(new Map(vimperator.modes.HINTS, [""], function() { vimperator.tabs.select('+1', true); }, { cancel_mode: true, always_active: true })); // same as gt, but no count supported - addDefaultMap(new Map(vimperator.modes.HINTS, [""], function() { vimperator.tabs.select('-1', true); }, { cancel_mode: true, always_active: true })); + // tab managment + addDefaultMap(new Map(vimperator.modes.HINTS, [""], + function() { vimperator.tabs.select('+1', true); }, + { cancel_mode: true, always_active: true } + )); // same as gt, but no count supported + addDefaultMap(new Map(vimperator.modes.HINTS, [""], + function() { vimperator.tabs.select('-1', true); }, + { cancel_mode: true, always_active: true } + )); - /* navigation */ - addDefaultMap(new Map(vimperator.modes.HINTS, [""], function() { vimperator.history.stepTo(vimperator.input.count > 0 ? -1 * vimperator.input.count : -1); }, { cancel_mode: false, always_active: true })); - addDefaultMap(new Map(vimperator.modes.HINTS, [""], function() { vimperator.history.stepTo(vimperator.input.count > 0 ? vimperator.input.count : 1); }, { cancel_mode: false, always_active: true })); - addDefaultMap(new Map(vimperator.modes.HINTS, [""], function() { vimperator.history.stepTo(vimperator.input.count > 0 ? -1 * vimperator.input.count : -1); }, { cancel_mode: false, always_active: true })); - addDefaultMap(new Map(vimperator.modes.HINTS, [""], function() { vimperator.history.stepTo(vimperator.input.count > 0 ? vimperator.input.count : 1); }, { cancel_mode: false, always_active: true })); - addDefaultMap(new Map(vimperator.modes.HINTS, [""], function() { vimperator.tabs.remove(getBrowser().mCurrentTab, vimperator.input.count, false, 0); }, { cancel_mode: true, always_active: true })); + // navigation + addDefaultMap(new Map(vimperator.modes.HINTS, [""], + function() { vimperator.history.stepTo(vimperator.input.count > 0 ? -1 * vimperator.input.count : -1); }, + { cancel_mode: false, always_active: true } + )); + addDefaultMap(new Map(vimperator.modes.HINTS, [""], + function() { vimperator.history.stepTo(vimperator.input.count > 0 ? vimperator.input.count : 1); }, + { cancel_mode: false, always_active: true } + )); + addDefaultMap(new Map(vimperator.modes.HINTS, [""], + function() { vimperator.history.stepTo(vimperator.input.count > 0 ? -1 * vimperator.input.count : -1); }, + { cancel_mode: false, always_active: true } + )); + addDefaultMap(new Map(vimperator.modes.HINTS, [""], + function() { vimperator.history.stepTo(vimperator.input.count > 0 ? vimperator.input.count : 1); }, + { cancel_mode: false, always_active: true } + )); + addDefaultMap(new Map(vimperator.modes.HINTS, [""], + function() { vimperator.tabs.remove(getBrowser().mCurrentTab, vimperator.input.count, false, 0); }, + { cancel_mode: true, always_active: true } + )); - /* cancel_mode hint mode keys */ - addDefaultMap(new Map(vimperator.modes.HINTS, [""], function() {}, { cancel_mode: true, always_active: true })); - addDefaultMap(new Map(vimperator.modes.HINTS, [""], function() {}, { cancel_mode: true, always_active: true })); - addDefaultMap(new Map(vimperator.modes.HINTS, [""], function() {}, { cancel_mode: true, always_active: true })); - addDefaultMap(new Map(vimperator.modes.HINTS, [""], function() {}, { cancel_mode: true, always_active: true })); + // cancel_mode hint mode keys + addDefaultMap(new Map(vimperator.modes.HINTS, [""], + function() { ; }, + { cancel_mode: true, always_active: true } + )); + addDefaultMap(new Map(vimperator.modes.HINTS, [""], + function() { ; }, + { cancel_mode: true, always_active: true } + )); + addDefaultMap(new Map(vimperator.modes.HINTS, [""], + function() { ; }, + { cancel_mode: true, always_active: true } + )); + addDefaultMap(new Map(vimperator.modes.HINTS, [""], + function() { ; }, + { cancel_mode: true, always_active: true } + )); + //}}} //}}} } //}}} diff --git a/chrome/content/vimperator/vimperator.js b/chrome/content/vimperator/vimperator.js index 87b369d4..4d1874a8 100644 --- a/chrome/content/vimperator/vimperator.js +++ b/chrome/content/vimperator/vimperator.js @@ -752,10 +752,10 @@ function Events() //{{{ }, // stub functions for the interfaces - setJSStatus : function(status) { }, - setJSDefaultStatus : function(status) { }, - setDefaultStatus : function(status) { }, - onLinkIconAvailable: function() { } + setJSStatus : function(status) { ; }, + setJSDefaultStatus : function(status) { ; }, + setDefaultStatus : function(status) { ; }, + onLinkIconAvailable: function() { ; } }; window.XULBrowserWindow = this.progressListener; window.QueryInterface(Components.interfaces.nsIInterfaceRequestor) @@ -1080,7 +1080,8 @@ function isFormElemFocused() if (elt == null) return false; - try { // sometimes the elt doesn't have .localName + try + { // sometimes the elt doesn't have .localName var tagname = elt.localName.toLowerCase(); var type = elt.type.toLowerCase(); @@ -1090,7 +1091,11 @@ function isFormElemFocused() // tagName == "BUTTON" || tagname == "isindex") // isindex is a deprecated one-line input box return true; - } catch(e) {}; + } + catch (e) + { + // FIXME: do nothing? + } return false; }