diff options
| -rw-r--r-- | common/content/autocommands.js | 8 | ||||
| -rw-r--r-- | common/content/events.js | 8 | ||||
| -rw-r--r-- | common/locale/en-US/pattern.xml | 2 | ||||
| -rw-r--r-- | common/modules/finder.jsm | 2 |
4 files changed, 13 insertions, 7 deletions
diff --git a/common/content/autocommands.js b/common/content/autocommands.js index 5bd58e43..205cf4bf 100644 --- a/common/content/autocommands.js +++ b/common/content/autocommands.js @@ -103,6 +103,7 @@ var AutoCommands = Module("autocommands", { return cmds; } + XML.prettyPrinting = XML.ignoreWhitespace = false; commandline.commandOutput( <table> <tr highlight="Title"> @@ -110,15 +111,16 @@ var AutoCommands = Module("autocommands", { </tr> { template.map(hives, function (hive) - <tr highlight="Title"> - <td colspan="3">{hive.name}</td> + <tr> + <td colspan="3"><span highlight="Title">{hive.name}</span> + {hive.filter}</td> </tr> + <tr style="height: .5ex;"/> + template.map(cmds(hive), function ([event, items]) <tr style="height: .5ex;"/> + template.map(items, function (item, i) <tr> - <td highlight="Title" style="padding-right: 1em;">{i == 0 ? event : ""}</td> + <td highlight="Title" style="padding-left: 1em; padding-right: 1em;">{i == 0 ? event : ""}</td> <td>{item.filter.toXML ? item.filter.toXML() : item.filter}</td> <td>{item.command}</td> </tr>) + diff --git a/common/content/events.js b/common/content/events.js index 5d1ad674..ae1f669a 100644 --- a/common/content/events.js +++ b/common/content/events.js @@ -799,11 +799,15 @@ var Events = Module("events", { function (mode) mappings.hives.some( function (hive) hive.get(mode, key) || hive.getCandidates(mode, key))); + events.dbg("ON " + event.type.toUpperCase() + " " + DOM.Event.stringify(event) + + " passing: " + this.passing + " " + + " pass: " + pass + + " replay: " + event.isReplay + + " macro: " + event.isMacro); + if (event.type === "keydown") this.passing = pass; - events.dbg("ON " + event.type.toUpperCase() + " " + DOM.Event.stringify(event) + " pass: " + pass + " replay: " + event.isReplay + " macro: " + event.isMacro); - // Prevents certain sites from transferring focus to an input box // before we get a chance to process our key bindings on the // "keypress" event. diff --git a/common/locale/en-US/pattern.xml b/common/locale/en-US/pattern.xml index f1bc4e92..df43f02a 100644 --- a/common/locale/en-US/pattern.xml +++ b/common/locale/en-US/pattern.xml @@ -65,7 +65,7 @@ </item> <item> - <tags><![CDATA[<find-backward> ?]]></tags> + <tags><![CDATA[<find-backward> <S-Slash> ?]]></tags> <spec>?<a>pattern</a><k name="CR" link="false"/></spec> <description> <p> diff --git a/common/modules/finder.jsm b/common/modules/finder.jsm index 133e6f20..58d1ce97 100644 --- a/common/modules/finder.jsm +++ b/common/modules/finder.jsm @@ -268,7 +268,7 @@ var RangeFinder = Module("rangefinder", { function () { rangefinder.openPrompt(modes.FIND_FORWARD); }); mappings.add(myModes, - ["?", "<find-backward>"], "Find a pattern backward of the current caret position", + ["?", "<find-backward>", "<S-Slash>"], "Find a pattern backward of the current caret position", function () { rangefinder.openPrompt(modes.FIND_BACKWARD); }); mappings.add(myModes, |