gryf/pentadactyl-pm
1
0
Fork 0
mirror of https://github.com/gryf/pentadactyl-pm.git synced 2026-04-05 07:03:32 +02:00
Code Issues Projects Releases Wiki Activity

Fix placement of the status command-line.

Browse Source
This commit is contained in:
Kris Maglione
2011-01-26 16:43:38 -05:00
parent 218562e21b
commit 7720b17a5a
3 changed files with 9 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
common/content/dactyl.js
View File

@@ -503,8 +503,6 @@ var Dactyl = Module("dactyl", XPCOM(Ci.nsISupportsWeakReference, ModuleBase), {
dactyl.focusedElement.blur(); dactyl.focusedElement.blur();
if (win && Editor.getEditor(win)) { if (win && Editor.getEditor(win)) {
win.blur(); win.blur();
if (win.frameElement)
util.dump("blur(" + util.objectToString(win.frameElement) + ")");
if (win.frameElement) if (win.frameElement)
win.frameElement.blur(); win.frameElement.blur();
} }

15
common/content/events.js
View File

@@ -451,15 +451,13 @@ var Events = Module("events", {
this._lastMacro = macro.toLowerCase(); // XXX: sets last played macro, even if it does not yet exist this._lastMacro = macro.toLowerCase(); // XXX: sets last played macro, even if it does not yet exist
if (this._macros.get(this._lastMacro)) { if (this._macros.get(this._lastMacro)) {
// make sure the page is stopped before starting to play the macro
try { try {
window.getWebNavigation().stop(nsIWebNavigation.STOP_ALL); modes.replaying = true;
res = events.feedkeys(this._macros.get(this._lastMacro).keys, { noremap: true });
}
finally {
modes.replaying = false;
} }
catch (e) {}
modes.replaying = true;
res = events.feedkeys(this._macros.get(this._lastMacro).keys, { noremap: true });
modes.replaying = false;
} }
else else
// TODO: ignore this like Vim? // TODO: ignore this like Vim?
@@ -537,7 +535,7 @@ var Events = Module("events", {
} }
if (!this.feedingKeys) if (!this.feedingKeys)
break; return false;
} }
} }
catch (e) { catch (e) {
@@ -549,6 +547,7 @@ var Events = Module("events", {
if (quiet) if (quiet)
commandline.quiet = wasQuiet; commandline.quiet = wasQuiet;
} }
return true;
}, },
/** /**

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>