1
0
mirror of https://github.com/gryf/pentadactyl-pm.git synced 2026-01-09 03:54:11 +01:00

Clean up some old-style iterator gunk.

This commit is contained in:
Kris Maglione
2015-02-25 10:48:10 -08:00
parent d1937f708c
commit a8b1b278e2
12 changed files with 31 additions and 27 deletions

View File

@@ -275,11 +275,11 @@ var AutoCommands = Module("autocommands", {
},
completion: function initCompletion() {
completion.autocmdEvent = function autocmdEvent(context) {
context.completions = Iterator(config.autocommands);
context.completions = iter(config.autocommands);
};
},
javascript: function initJavascript() {
JavaScript.setCompleter(AutoCmdHive.prototype.get, [() => Iterator(config.autocommands)]);
JavaScript.setCompleter(AutoCmdHive.prototype.get, [() => iter(config.autocommands)]);
},
options: function initOptions() {
options.add(["eventignore", "ei"],

View File

@@ -1339,8 +1339,9 @@ var Dactyl = Module("dactyl", XPCOM(Ci.nsISupportsWeakReference, ModuleBase), {
opts: update({
s: ["Status bar", [statusline.statusBar.id]]
}, config.guioptions),
setter: function (opts) {
for (let [opt, [, ids]] in Iterator(this.opts)) {
for (let [opt, [, ids]] of iter(this.opts)) {
ids.map(id => document.getElementById(id))
.forEach(function (elem) {
if (elem)

View File

@@ -278,7 +278,7 @@ var Marks = Module("marks", {
_onPageLoad: function _onPageLoad(event) {
let win = event.originalTarget.defaultView;
for (let [i, mark] in Iterator(this._pendingJumps)) {
for (let [i, mark] of this._pendingJumps.entries()) {
if (win && win.location.href == mark.location) {
this._scrollTo(mark);
this._pendingJumps.splice(i, 1);

View File

@@ -178,7 +178,7 @@ var QuickMarks = Module("quickmarks", {
completion: function initCompletion() {
completion.quickmark = function (context) {
context.title = ["QuickMark", "URL"];
context.generate = () => Iterator(quickmarks._qmarks);
context.generate = () => iter(quickmarks._qmarks);
};
},
mappings: function initMappings() {

View File

@@ -999,7 +999,7 @@ var Tabs = Module("tabs", {
context.keys = { text: function ([i, { state: s }]) (i + 1) + ": " + s.entries[s.index - 1].url,
description: "[1].title",
icon: "[1].image" };
context.completions = Iterator(tabs.closedTabs);
context.completions = tabs.closedTabs.entries();
},
count: true,
literal: 0,