mirror of
https://github.com/gryf/pentadactyl-pm.git
synced 2026-02-04 20:25:45 +01:00
Merge default.
--HG-- branch : key-processing
This commit is contained in:
@@ -1015,7 +1015,8 @@ var Events = Module("events", {
|
||||
*/
|
||||
|
||||
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.
|
||||
|
||||
@@ -47,9 +47,9 @@ var StatusLine = Module("statusline", {
|
||||
<!-- insertbefore="dactyl.statusBefore;" insertafter="dactyl.statusAfter;" -->
|
||||
<hbox key="container" hidden="false" align="center" flex="1">
|
||||
<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"/>
|
||||
<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="message" crop="end" flex="1" highlight="Normal StatusNormal" class="plain" readonly="true"/>
|
||||
</stack>
|
||||
|
||||
@@ -867,9 +867,11 @@ var Tabs = Module("tabs", {
|
||||
},
|
||||
events: function () {
|
||||
let tabContainer = config.tabbrowser.mTabContainer;
|
||||
["TabMove", "TabOpen", "TabClose"].forEach(function (event) {
|
||||
events.addSessionListener(tabContainer, event, this.closure.updateTabCount, false);
|
||||
}, this);
|
||||
function callback() {
|
||||
tabs.timeout(function () { this.updateTabCount(); });
|
||||
}
|
||||
for (let event in values(["TabMove", "TabOpen", "TabClose"]))
|
||||
events.addSessionListener(tabContainer, event, callback, false);
|
||||
events.addSessionListener(tabContainer, "TabSelect", this.closure._onTabSelect, false);
|
||||
},
|
||||
mappings: function () {
|
||||
|
||||
Reference in New Issue
Block a user