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