diff --git a/common/content/buffer.js b/common/content/buffer.js index 38f5a422..f8f11316 100644 --- a/common/content/buffer.js +++ b/common/content/buffer.js @@ -811,7 +811,6 @@ const Buffer = Module("buffer", { * contains at least one frame. * * @param {number} count The number of frames to skip through. - * @param {boolean} forward The direction of motion. */ shiftFrameFocus: function (count) { if (!(window.content.document instanceof HTMLDocument)) @@ -829,10 +828,6 @@ const Buffer = Module("buffer", { rect.width && rect.height); // find the currently focused frame index - // TODO: If the window is a frameset then the first _frame_ should be - // focused. Since this is not the current FF behavior, - // we initialize current to -1 so the first call takes us to the - // first frame. let current = Math.max(0, frames.indexOf(buffer.focusedFrame)); // calculate the next frame to focus @@ -840,7 +835,6 @@ const Buffer = Module("buffer", { if (next < 0 || next >= frames.length) dactyl.beep(); next = Math.constrain(next, 0, frames.length - 1); - util.dump(current, count, next, String(frames[next])); // focus next frame and scroll into view frames[next].focus(); diff --git a/common/content/dactyl.js b/common/content/dactyl.js index 758304f6..e0420bf7 100644 --- a/common/content/dactyl.js +++ b/common/content/dactyl.js @@ -1161,7 +1161,9 @@ const Dactyl = Module("dactyl", { } }, { - opts: config.guioptions, + opts: update({ + s: ["Status bar", [statusline.statusBar.id]] + }, config.guioptions), setter: function (opts) { for (let [opt, [, ids]] in Iterator(this.opts)) { ids.map(function (id) document.getElementById(id)) diff --git a/common/content/statusline.js b/common/content/statusline.js index 0c10a146..7e716f31 100644 --- a/common/content/statusline.js +++ b/common/content/statusline.js @@ -274,31 +274,6 @@ const StatusLine = Module("statusline", { this.widgets.zoomlevel.value = " (" + percent + "%)"; } } - -}, { -}, { - options: function () { - options.add(["laststatus", "ls"], - "Show the status line", - "number", 2, - { - setter: function setter(value) { - if (value == 0) - statusline.statusBar.collapsed = true; - else if (value == 1) - dactyl.echoerr("show status line only with > 1 window not implemented yet"); - else - statusline.statusBar.collapsed = false; - commandline.widgets.updateVisibility(); - return value; - }, - completer: function completer(context) [ - ["0", "Never display status line"], - ["1", "Display status line only if there are multiple windows"], - ["2", "Always display status line"] - ] - }); - } }); // vim: set fdm=marker sw=4 ts=4 et: diff --git a/common/locale/en-US/options.xml b/common/locale/en-US/options.xml index c1e1d3c3..6fe5322c 100644 --- a/common/locale/en-US/options.xml +++ b/common/locale/en-US/options.xml @@ -675,7 +675,7 @@ 'go' 'guioptions' 'guioptions' 'go' charlist - rbC + bCrs

Show or hide certain GUI elements.

@@ -693,6 +693,7 @@
m
Menu bar
n
Tab number
r
Right scrollbar
+
s
Status bar

See also showtabline.

@@ -911,26 +912,6 @@
- - 'ls' 'laststatus' - 'laststatus' 'ls' - number - 2 - -

Determines when the status line is shown.

- -

Possible values:

- -
-
0
Never
-
1
Only if there are multiple windows
-
2
Always
-
- - laststatus=1 is not implemented. -
-
- 'nolks' 'nolinksearch' 'lks' 'linksearch' diff --git a/melodactyl/content/config.js b/melodactyl/content/config.js index 5477d030..afa74709 100644 --- a/melodactyl/content/config.js +++ b/melodactyl/content/config.js @@ -23,7 +23,7 @@ const Config = Module("config", ConfigBase, { /*** optional options, there are checked for existence and a fallback provided ***/ features: ["bookmarks", "hints", "marks", "history", "quickmarks", "session", "tabs", "player"], defaults: { - guioptions: "mprb", + guioptions: "smprb", showtabline: 2, get titlestring() config.name }, diff --git a/pentadactyl/NEWS b/pentadactyl/NEWS index 8251baa1..d944535f 100644 --- a/pentadactyl/NEWS +++ b/pentadactyl/NEWS @@ -49,6 +49,8 @@ * The concept of completion contexts is now exposed to the user (see :h :contexts), allowing for powerful and fine-grained completion system customization. + * IMPORTANT: 'laststatus' has been replaced with the ā€˜s’ flag in + 'guioptions' * IMPORTANT: Command script files now use the *.penta file extension. * IMPORTANT: Plugins are now loaded from the 'plugins/' directory in 'runtimepath' rather than 'plugin/'. diff --git a/pentadactyl/content/config.js b/pentadactyl/content/config.js index 9631986e..c3f53da4 100644 --- a/pentadactyl/content/config.js +++ b/pentadactyl/content/config.js @@ -31,7 +31,7 @@ const Config = Module("config", ConfigBase, { defaults: { complete: "slf", - guioptions: "rbC", + guioptions: "bCrs", showtabline: 2, titlestring: "Pentadactyl" }, diff --git a/teledactyl/content/config.js b/teledactyl/content/config.js index 0ddb016e..3aa4f198 100644 --- a/teledactyl/content/config.js +++ b/teledactyl/content/config.js @@ -51,7 +51,7 @@ const Config = Module("config", ConfigBase, { }, defaults: { - guioptions: "frb", + guioptions: "bfrs", showtabline: 1, titlestring: "Teledactyl" },