gryf/pentadactyl-pm
1
0
Fork 0
mirror of https://github.com/gryf/pentadactyl-pm.git synced 2026-03-03 14:15:46 +01:00
Code Issues Projects Releases Wiki Activity

Merge default.

Browse Source 
--HG--
branch : key-processing
This commit is contained in:
Kris Maglione
2011-01-26 16:45:34 -05:00
parent 8a7c1a86d9 7720b17a5a
commit a796d8b871
3 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
common/content/events.js
View File

@@ -1015,7 +1015,8 @@ var Events = Module("events", {
*/ */
input: function onInput(event) { input: function onInput(event) {
delete event.originalTarget.dactylKeyPress; if ("dactylKeyPress" in event.originalTarget)
delete event.originalTarget.dactylKeyPress;
}, },
// this keypress handler gets always called first, even if e.g. // this keypress handler gets always called first, even if e.g.

4
common/content/statusline.js
View File

@@ -47,9 +47,9 @@ var StatusLine = Module("statusline", {
<!-- insertbefore="dactyl.statusBefore;" insertafter="dactyl.statusAfter;" --> <!-- insertbefore="dactyl.statusBefore;" insertafter="dactyl.statusAfter;" -->
<hbox key="container" hidden="false" align="center" flex="1"> <hbox key="container" hidden="false" align="center" flex="1">
<stack orient="horizontal" align="stretch" flex="1" highlight="CmdLine StatusCmdLine" class="dactyl-container"> <stack orient="horizontal" align="stretch" flex="1" highlight="CmdLine StatusCmdLine" class="dactyl-container">
<hbox highlight="CmdLine StatusCmdLine" class="dactyl-container" id="dactyl-statusline-stack"> <hbox highlight="CmdLine StatusCmdLine" class="dactyl-container">
<label key="mode" crop="end" class="plain" collapsed="true"/> <label key="mode" crop="end" class="plain" collapsed="true"/>
<stack flex="1" highlight="CmdLine StatusCmdLine" class="dactyl-container"> <stack id="dactyl-statusline-stack" flex="1" highlight="CmdLine StatusCmdLine" class="dactyl-container">
<textbox key="url" crop="end" flex="1" class="plain dactyl-status-field-url" readonly="true"/> <textbox key="url" crop="end" flex="1" class="plain dactyl-status-field-url" readonly="true"/>
<textbox key="message" crop="end" flex="1" highlight="Normal StatusNormal" class="plain" readonly="true"/> <textbox key="message" crop="end" flex="1" highlight="Normal StatusNormal" class="plain" readonly="true"/>
</stack> </stack>

8
common/content/tabs.js
View File

@@ -867,9 +867,11 @@ var Tabs = Module("tabs", {
}, },
events: function () { events: function () {
let tabContainer = config.tabbrowser.mTabContainer; let tabContainer = config.tabbrowser.mTabContainer;
["TabMove", "TabOpen", "TabClose"].forEach(function (event) { function callback() {
events.addSessionListener(tabContainer, event, this.closure.updateTabCount, false); tabs.timeout(function () { this.updateTabCount(); });
}, this); }
for (let event in values(["TabMove", "TabOpen", "TabClose"]))
events.addSessionListener(tabContainer, event, callback, false);
events.addSessionListener(tabContainer, "TabSelect", this.closure._onTabSelect, false); events.addSessionListener(tabContainer, "TabSelect", this.closure._onTabSelect, false);
}, },
mappings: function () { mappings: function () {