// Copyright (c) 2006-2008 by Martin Stubenschrott <stubenschrott@vimperator.org>
// Copyright (c) 2007-2011 by Doug Kearns <dougkearns@gmail.com>
-// Copyright (c) 2008-2011 by Kris Maglione <maglione.k@gmail.com>
+// Copyright (c) 2008-2014 Kris Maglione <maglione.k@gmail.com>
//
// This work is licensed for reuse under an MIT license. Details are
// given in the LICENSE.txt file included with this file.
init: function init() {
this._statusLine = document.getElementById("status-bar");
this.statusBar = document.getElementById("addon-bar") || this._statusLine;
- this.statusBar.collapsed = true;
+
this.baseGroup = this.statusBar == this._statusLine ? "StatusLine " : "";
+ if (this.statusBar.localName == "toolbar" &&
+ this.statusBar.parentNode.id != "browser-bottombox")
+ overlay.overlayWindow(window, {
+ objects: this,
+ append: [
+ ["vbox", { id: "browser-bottombox", xmlns: "xul" },
+ ["toolbar", { id: "dactyl-addon-bar",
+ customizable: true,
+ defaultset: "",
+ toolboxid: "navigator-toolbox",
+ toolbarname: /*L*/ "Add-on Bar",
+ class: "toolbar-primary chromeclass-toolbar",
+ mode: "icons",
+ iconsize: "small", defaulticonsize: "small",
+ key: "statusBar" },
+ ["statusbar", { id: "dactyl-status-bar", key: "_statusLine" }]]]
+ ]
+ });
+
+ if (config.haveGecko("25"))
+ config.tabbrowser.getStatusPanel().hidden = true;
+
if (this.statusBar.localName == "toolbar") {
- styles.system.add("addon-bar", config.styleableChrome, <css><![CDATA[
- #status-bar { margin-top: 0 !important; }
- #addon-bar > statusbar { -moz-box-flex: 1 }
+ styles.system.add("addon-bar", config.styleableChrome, literal(/*
+ #status-bar, #dactyl-status-bar { margin-top: 0 !important; }
+ #dactyl-status-bar { min-height: 0 !important; }
+ :-moz-any(#addon-bar, #dactyl-addon-bar) > statusbar { -moz-box-flex: 1 }
+ :-moz-any(#addon-bar, #dactyl-addon-bar) > xul|toolbarspring { visibility: collapse; }
#addon-bar > #addonbar-closebutton { visibility: collapse; }
- #addon-bar > xul|toolbarspring { visibility: collapse; }
- ]]></css>);
+ */));
- util.overlayWindow(window, { append: <><statusbar id="status-bar" ordinal="0"/></> });
+ overlay.overlayWindow(window, {
+ append: [
+ ["statusbar", { id: this._statusLine.id, ordinal: "0" }]]
+ });
- highlight.loadCSS(util.compileMacro(<![CDATA[
- !AddonBar;#addon-bar {
- /* The Add-on Bar */
+ highlight.loadCSS(util.compileMacro(literal(/*
+ !AddonBar;#addon-bar,#dactyl-addon-bar {
padding-left: 0 !important;
+ padding-top: 0 !important;
+ padding-bottom: 0 !important;
min-height: 18px !important;
-moz-appearance: none !important;
<padding>
}
- !AddonButton;#addon-bar xul|toolbarbutton {
- /* An Add-on Bar button */
+ !AddonButton;,:-moz-any(#addon-bar, #dactyl-addon-bar) xul|toolbarbutton {
-moz-appearance: none !important;
padding: 0 !important;
border-width: 0px !important;
color: inherit !important;
}
AddonButton:not(:hover) background: transparent;
- ]]>)({ padding: util.OS.isMacOSX ? "padding-right: 10px !important;" : "" }));
+ */))({ padding: config.OS.isMacOSX ? "padding-right: 10px !important;" : "" }));
if (document.getElementById("appmenu-button"))
- highlight.loadCSS(<![CDATA[
- AppmenuButton /* The app-menu button */ \
- min-width: 0 !important; padding: 0 .5em !important;
- ]]>);
+ highlight.loadCSS(literal(/*
+ AppmenuButton min-width: 0 !important; padding: 0 .5em !important;
+ */));
}
- XML.ignoreWhitespace = true;
let _commandline = "if (window.dactyl) return dactyl.modules.commandline";
- let prepend = <e4x xmlns={XUL} xmlns:dactyl={NS}>
- <button id="appmenu-button" label="" image="chrome://branding/content/icon16.png" highlight="AppmenuButton" />
- <toolbarbutton id="appmenu-toolbar-button" label="" image="chrome://branding/content/icon16.png" />
- <statusbar id="status-bar" highlight="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">
- <label key="mode" crop="end" class="plain" collapsed="true"/>
- <stack id="dactyl-statusline-stack" flex="1" highlight="CmdLine StatusCmdLine" class="dactyl-container">
- <textbox key="url" crop="end" flex="1" style="background: transparent;" class="plain dactyl-status-field-url" readonly="true"/>
- <textbox key="message" crop="end" flex="1" highlight="Normal StatusNormal" class="plain" readonly="true"/>
- </stack>
- </hbox>
- </stack>
- <label class="plain" key="inputbuffer" flex="0"/>
- <label class="plain" key="progress" flex="0"/>
- <label class="plain" key="tabcount" flex="0"/>
- <label class="plain" key="bufferposition" flex="0"/>
- <label class="plain" key="zoomlevel" flex="0"/>
- </hbox>
- <!-- just hide them since other elements expect them -->
- <statusbarpanel id="statusbar-display" hidden="true"/>
- <statusbarpanel id="statusbar-progresspanel" hidden="true"/>
- </statusbar>
- </e4x>;
-
- for each (let attr in prepend..@key)
- attr.parent().@id = "dactyl-statusline-field-" + attr;
-
- util.overlayWindow(window, {
+ let prepend = [
+ ["button", { id: "appmenu-button", label: "", image: "chrome://branding/content/icon16.png", highlight: "AppmenuButton", xmlns: "xul" }],
+ ["toolbarbutton", { id: "appmenu-toolbar-button", label: "", image: "chrome://branding/content/icon16.png" }],
+ ["statusbar", { id: this._statusLine.id, highlight: "StatusLine", xmlns: "xul" },
+ // <!-- 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" },
+ ["label", { key: "mode", crop: "end", class: "plain", collapsed: "true" }],
+ ["stack", { id: "dactyl-statusline-stack", flex: "1", highlight: "CmdLine StatusCmdLine", class: "dactyl-container" },
+ ["textbox", { key: "url", crop: "end", flex: "1", style: "background: transparent;", class: "plain dactyl-status-field-url",
+ readonly: "true" }],
+ ["hbox", { key: "message-box" },
+ ["label", { key: "message-pre", highlight: "WarningMsg StatusWarningMsg", class: "plain", readonly: "true" }],
+ ["textbox", { key: "message", crop: "end", flex: "1", highlight: "Normal StatusNormal", class: "plain",
+ readonly: "true" }]]]]],
+ ["label", { class: "plain", key: "inputbuffer", flex: "0" }],
+ ["label", { class: "plain", key: "progress", flex: "0" }],
+ ["label", { class: "plain", key: "tabcount", flex: "0" }],
+ ["label", { class: "plain", key: "bufferposition", flex: "0" }],
+ ["label", { class: "plain", key: "zoomlevel", flex: "0" }]],
+ // just hide them since other elements expect them
+ ["statusbarpanel", { id: "statusbar-display", hidden: "true" }],
+ ["statusbarpanel", { id: "statusbar-progresspanel", hidden: "true" }]]];
+
+ (function rec(ary) {
+ ary.forEach(function (elem) {
+ if ("key" in elem[1])
+ elem[1].id = "dactyl-statusline-field-" + elem[1].key;
+ if (elem.length > 2)
+ rec(elem.slice(2));
+ });
+ })(prepend);
+
+ overlay.overlayWindow(window, {
objects: this.widgets = { get status() this.container },
- prepend: prepend.elements()
+ prepend: prepend
});
try {
catch (e) {}
},
+ cleanup: function cleanup(reason) {
+ if (reason != "unload" && "CustomizableUI" in window)
+ CustomizableUI.unregisterArea(this.statusBar.id, false);
+ },
+
get visible() !this.statusBar.collapsed && !this.statusBar.hidden,
signals: {
"browser.overLink": function (link) {
switch (options["showstatuslinks"]) {
case "status":
+ this.overLink = link ? _("status.link", link) : null;
this.status = link ? _("status.link", link) : buffer.uri;
break;
case "command":
+ this.overLink = null;
if (link)
dactyl.echo(_("status.link", link), commandline.FORCE_SINGLELINE);
else
webProgress.DOMWindow.document.dactylSecurity = this.security;
},
"browser.stateChange": function onStateChange(webProgress, request, flags, status) {
- if (flags & Ci.nsIWebProgressListener.STATE_START)
- this.progress = 0;
- if (flags & Ci.nsIWebProgressListener.STATE_STOP) {
- this.progress = "";
+ const L = Ci.nsIWebProgressListener;
+
+ if (flags & (L.STATE_IS_DOCUMENT | L.STATE_IS_WINDOW))
+ if (flags & L.STATE_START)
+ this.progress = 0;
+ else if (flags & L.STATE_STOP)
+ this.progress = "";
+
+ if (flags & L.STATE_STOP)
this.updateStatus();
- }
},
"browser.statusChange": function onStatusChange(webProgress, request, status, message) {
this.timeout(function () {
this.status = message || buffer.uri;
});
+ },
+ "fullscreen": function onFullscreen(fullscreen) {
+ let go = options.get("guioptions");
+ if (fullscreen) {
+ this.wasVisible = go.has("s");
+ go.op("-", "s");
+ }
+ else if (this.wasVisible) {
+ go.op("+", "s");
+ }
}
},
url = _("buffer.noName");
}
else {
- url = url.replace(RegExp("^dactyl://help/(\\S+)#(.*)"), function (m, n1, n2) n1 + " " + decodeURIComponent(n2) + " " + _("buffer.help"))
+ url = url.replace(RegExp("^dactyl://help/(\\S+)#(.*)"), (m, n1, n2) => n1 + " " + decodeURIComponent(n2) + " " + _("buffer.help"))
.replace(RegExp("^dactyl://help/(\\S+)"), "$1 " + _("buffer.help"));
}
updateStatus: function updateStatus() {
this.timeout(function () {
- this.status = buffer.uri;
+ this.status = this.overLink || buffer.uri;
});
},
- updateUrl: deprecated("statusline.status", function updateUrl(url) { this.status = url || buffer.uri }),
+ updateUrl: deprecated("statusline.status", function updateUrl(url) { this.status = url || buffer.uri; }),
/**
* Set the contents of the status line's input buffer to the given
updateTabCount: function updateTabCount(delayed) {
if (dactyl.has("tabs")) {
if (delayed) {
- this.timeout(function () this.updateTabCount(false), 0);
+ this.timeout(() => { this.updateTabCount(false); }, 0);
return;
}
* @param {number} percent The zoom level, as a percentage. @optional
* @param {boolean} full True if full zoom is in operation. @optional
*/
- updateZoomLevel: function updateZoomLevel(percent, full) {
- if (arguments.length == 0)
- [percent, full] = [buffer.zoomLevel, buffer.fullZoom];
-
+ updateZoomLevel: function updateZoomLevel(percent=buffer.zoomLevel, full=buffer.fullZoom) {
if (percent == 100)
this.widgets.zoomlevel.value = "";
else {
}
});
-// vim: set fdm=marker sw=4 ts=4 et:
+// vim: set fdm=marker sw=4 sts=4 ts=8 et:
projects / dactyl.git / blobdiff