diff --git a/content/addressbook.js b/content/addressbook.js index 7715a6fe..7b0674b5 100644 --- a/content/addressbook.js +++ b/content/addressbook.js @@ -204,7 +204,7 @@ liberator.Addressbook = function () //{{{ { var list = ":" + liberator.util.escapeHTML(liberator.commandline.getCommand()) + "
" + ""; - for (var i = 0; i < addresses.length; i++) + for (let i = 0; i < addresses.length; i++) { var displayName = liberator.util.escapeHTML(liberator.util.clip(addresses[i][0], 50)); var mailAddr = liberator.util.escapeHTML(addresses[i][1]); diff --git a/content/bookmarks.js b/content/bookmarks.js index c34cea90..523da014 100644 --- a/content/bookmarks.js +++ b/content/bookmarks.js @@ -113,7 +113,7 @@ liberator.Bookmarks = function () //{{{ rootNode.containerOpen = true; // iterate over the immediate children of this folder - for (var i = 0; i < rootNode.childCount; i++) + for (let i = 0; i < rootNode.childCount; i++) { var node = rootNode.getChild(i); if (node.type == node.RESULT_TYPE_FOLDER) // folder @@ -238,7 +238,7 @@ liberator.Bookmarks = function () //{{{ list += ""; var num = -sh.index; - for (var i = 0; i < sh.count; i++) + for (let i = 0; i < sh.count; i++) { var entry = sh.getEntryAtIndex(i, false); var uri = entry.URI.spec; @@ -419,7 +419,7 @@ liberator.Bookmarks = function () //{{{ { var searchEngines = []; var firefoxEngines = searchService.getVisibleEngines({}); - for (var i in firefoxEngines) + for (let i in firefoxEngines) { var alias = firefoxEngines[i].alias; if (!alias || !/^[a-z0-9_-]+$/.test(alias)) @@ -429,7 +429,7 @@ liberator.Bookmarks = function () //{{{ // make sure we can use search engines which would have the same alias (add numbers at the end) var newAlias = alias; - for (var j = 1; j <= 10; j++) // <=10 is intentional + for (let j = 1; j <= 10; j++) // <=10 is intentional { if (!searchEngines.some(function (item) { return (item[0] == newAlias); })) break; @@ -502,7 +502,7 @@ liberator.Bookmarks = function () //{{{ var title, url, tags, keyword, extra; var list = ":" + liberator.util.escapeHTML(liberator.commandline.getCommand()) + "
" + "
NameAddress
jumptitleURI
"; - for (var i = 0; i < items.length; i++) + for (let i = 0; i < items.length; i++) { title = liberator.util.escapeHTML(liberator.util.clip(items[i][1], 50)); url = liberator.util.escapeHTML(items[i][0]); @@ -567,7 +567,7 @@ liberator.History = function () //{{{ var rootNode = result.root; rootNode.containerOpen = true; // iterate over the immediate children of this folder - for (var i = 0; i < rootNode.childCount; i++) + for (let i = 0; i < rootNode.childCount; i++) { var node = rootNode.getChild(i); //liberator.dump("History child " + node.itemId + ": " + node.title + " - " + node.type + "\n"); @@ -622,7 +622,7 @@ liberator.History = function () //{{{ if (args) { var sh = getWebNavigation().sessionHistory; - for (var i = sh.index - 1; i >= 0; i--) + for (let i = sh.index - 1; i >= 0; i--) { if (sh.getEntryAtIndex(i, false).URI.spec == args) { @@ -643,7 +643,7 @@ liberator.History = function () //{{{ { var sh = getWebNavigation().sessionHistory; var completions = []; - for (var i = sh.index - 1; i >= 0; i--) + for (let i = sh.index - 1; i >= 0; i--) { var entry = sh.getEntryAtIndex(i, false); var url = entry.URI.spec; @@ -668,7 +668,7 @@ liberator.History = function () //{{{ if (args) { var sh = getWebNavigation().sessionHistory; - for (var i = sh.index + 1; i < sh.count; i++) + for (let i = sh.index + 1; i < sh.count; i++) { if (sh.getEntryAtIndex(i, false).URI.spec == args) { @@ -689,7 +689,7 @@ liberator.History = function () //{{{ { var sh = getWebNavigation().sessionHistory; var completions = []; - for (var i = sh.index + 1; i < sh.count; i++) + for (let i = sh.index + 1; i < sh.count; i++) { var entry = sh.getEntryAtIndex(i, false); var url = entry.URI.spec; @@ -806,7 +806,7 @@ liberator.History = function () //{{{ { var list = ":" + liberator.util.escapeHTML(liberator.commandline.getCommand()) + "
" + "
titleURL
"; - for (var i = 0; i < items.length; i++) + for (let i = 0; i < items.length; i++) { var title = liberator.util.escapeHTML(liberator.util.clip(items[i][1], 50)); var url = liberator.util.escapeHTML(items[i][0]); @@ -934,7 +934,7 @@ liberator.QuickMarks = function () //{{{ { var pattern = new RegExp("[" + filter.replace(/\s+/g, "") + "]"); - for (var [qmark,] in qmarks) + for (let [qmark,] in qmarks) { if (pattern.test(qmark)) qmarks.remove(qmark); @@ -985,7 +985,7 @@ liberator.QuickMarks = function () //{{{ var list = ":" + liberator.util.escapeHTML(liberator.commandline.getCommand()) + "
" + "
titleURL
"; - for (var i = 0; i < marks.length; i++) + for (let i = 0; i < marks.length; i++) { list += ""; diff --git a/content/buffer.js b/content/buffer.js index 8e5df69c..1919ec95 100644 --- a/content/buffer.js +++ b/content/buffer.js @@ -67,7 +67,7 @@ liberator.Buffer = function () //{{{ var index = -1; if (steps <= 0) { - for (var i = zoomLevels.length - 1; i >= 0; i--) + for (let i = zoomLevels.length - 1; i >= 0; i--) { if ((zoomLevels[i] + 0.01) < value) // 0.01 for float comparison { @@ -78,7 +78,7 @@ liberator.Buffer = function () //{{{ } else { - for (var i = 0; i < zoomLevels.length; i++) + for (let i = 0; i < zoomLevels.length; i++) { if ((zoomLevels[i] - 0.01) > value) // 0.01 for float comparison { @@ -112,7 +112,7 @@ liberator.Buffer = function () //{{{ if (win.scrollMaxX > 0 || win.scrollMaxY > 0) return win; - for (var i = 0; i < win.frames.length; i++) + for (let i = 0; i < win.frames.length; i++) if (win.frames[i].scrollMaxX > 0 || win.frames[i].scrollMaxY > 0) return win.frames[i]; @@ -798,7 +798,7 @@ liberator.Buffer = function () //{{{ revText = new RegExp(revString, "i"); var elems = parsedFrame.document.getElementsByTagName("link"); // links have higher priority than normal hrefs - for (var i = 0; i < elems.length; i++) + for (let i = 0; i < elems.length; i++) { if (relText.test(elems[i].rel) || revText.test(elems[i].rev)) { @@ -809,7 +809,7 @@ liberator.Buffer = function () //{{{ // no links? ok, look for hrefs elems = parsedFrame.document.getElementsByTagName("a"); - for (var i = 0; i < elems.length; i++) + for (let i = 0; i < elems.length; i++) { if (relText.test(elems[i].rel) || revText.test(elems[i].rev)) { @@ -818,10 +818,10 @@ liberator.Buffer = function () //{{{ } } - for (var pattern = 0; pattern < regexps.length; pattern++) + for (let pattern = 0; pattern < regexps.length; pattern++) { patternText = new RegExp(regexps[pattern], "i"); - for (var i = 0; i < elems.length; i++) + for (let i = 0; i < elems.length; i++) { if (patternText.test(elems[i].textContent)) { @@ -832,7 +832,7 @@ liberator.Buffer = function () //{{{ { // images with alt text being href var children = elems[i].childNodes; - for (var j = 0; j < children.length; j++) + for (let j = 0; j < children.length; j++) { if (patternText.test(children[j].alt)) { @@ -853,7 +853,7 @@ liberator.Buffer = function () //{{{ if (!retVal) { // only loop through frames if the main content didnt match - for (var i = 0; i < window.content.frames.length; i++) + for (let i = 0; i < window.content.frames.length; i++) { retVal = followFrameRelationship(relationship, window.content.frames[i]); if (retVal) @@ -1156,7 +1156,7 @@ liberator.Buffer = function () //{{{ if (data.length - 1) { - for (var i = 0; i < data.length - 1; i++) + for (let i = 0; i < data.length - 1; i++) ret += ""; } else @@ -1206,7 +1206,7 @@ liberator.Buffer = function () //{{{ // put feeds rss into pageFeeds[] var linkNodes = window.content.document.getElementsByTagName("link"); var length = linkNodes.length; - for (var i = 0; i < length; i++) + for (let i = 0; i < length; i++) { var link = linkNodes[i]; if (!link.href) @@ -1292,7 +1292,7 @@ liberator.Buffer = function () //{{{ var tmpSort = []; var tmpDict = []; - for (var i = 0; i < length; i++) + for (let i = 0; i < length; i++) { var tmpTag = metaNodes[i].name || metaNodes[i].httpEquiv;// + var tmpTagNr = tmpTag + "-" + i; // allows multiple (identical) meta names @@ -1302,7 +1302,7 @@ liberator.Buffer = function () //{{{ // sort: ignore-case tmpSort.sort(function (a, b) { return a.toLowerCase() > b.toLowerCase() ? 1 : -1; }); - for (var i = 0; i < tmpSort.length; i++) + for (let i = 0; i < tmpSort.length; i++) pageMeta.push([tmpDict[tmpSort[i]][0], liberator.util.highlightURL(tmpDict[tmpSort[i]][1], false)]); } @@ -1314,9 +1314,9 @@ liberator.Buffer = function () //{{{ var option = liberator.options["pageinfo"]; var br = ""; - for (var z = 0; z < option.length; z++) + for (let i = 0; i < option.length; i++) { - switch (option[z]) + switch (option[i]) { case "g": if (pageGeneral.length > 1) @@ -1426,7 +1426,7 @@ liberator.Marks = function () //{{{ function onPageLoad(event) { var win = event.originalTarget.defaultView; - for (var i = 0, length = pendingJumps.length; i < length; i++) + for (let i = 0, length = pendingJumps.length; i < length; i++) { var mark = pendingJumps[i]; if (win && win.location.href == mark.location) @@ -1451,7 +1451,7 @@ liberator.Marks = function () //{{{ if (localmark) { var win = window.content; - for (var [i,] in Iterator(localmark)) + for (let [i,] in Iterator(localmark)) { if (localmark[i].location == win.location.href) { @@ -1562,7 +1562,7 @@ liberator.Marks = function () //{{{ // check for illegal ranges - only allow a-z A-Z 0-9 if (matches = args.match(/[a-zA-Z0-9]-[a-zA-Z0-9]/g)) { - for (var i = 0; i < matches.length; i++) + for (let i = 0; i < matches.length; i++) { var start = matches[i][0]; var end = matches[i][2]; @@ -1658,18 +1658,18 @@ liberator.Marks = function () //{{{ if (special) { // :delmarks! only deletes a-z marks - for (var [mark,] in localMarks) + for (let [mark,] in localMarks) removeLocalMark(mark); } else { var pattern = new RegExp("[" + filter.replace(/\s+/g, "") + "]"); - for (var [mark,] in urlMarks) + for (let [mark,] in urlMarks) { if (pattern.test(mark)) removeURLMark(mark); } - for (var [mark,] in localMarks) + for (let [mark,] in localMarks) { if (pattern.test(mark)) removeLocalMark(mark); @@ -1716,7 +1716,7 @@ liberator.Marks = function () //{{{ var win = window.content; var slice = localMarks.get(mark) || []; - for (var i = 0; i < slice.length; i++) + for (let i = 0; i < slice.length; i++) { if (win.location.href == slice[i].location) { @@ -1756,7 +1756,7 @@ liberator.Marks = function () //{{{ var list = ":" + liberator.util.escapeHTML(liberator.commandline.getCommand()) + "
" + "
QuickMarkURL
" + marks[i] + "" + liberator.util.escapeHTML(qmarks.get(marks[i])) + "
" + data[i][0] + ": " + data[i][1] + "
"; - for (var i = 0; i < marks.length; i++) + for (let i = 0; i < marks.length; i++) { list += "" + "" + diff --git a/content/commands.js b/content/commands.js index e2f75ce0..9f84a65b 100644 --- a/content/commands.js +++ b/content/commands.js @@ -44,7 +44,7 @@ liberator.Command = function (specs, description, action, extraInfo) //{{{ var shortNames = []; var longNames = []; var names = []; - for (var i = 0; i < specs.length; i++) + for (let i = 0; i < specs.length; i++) { var match; if (match = specs[i].match(/(\w+|!)\[(\w+)\]/)) @@ -114,7 +114,7 @@ liberator.Command.prototype = { return false; } - for (var i = 0; i < this.specs.length; i++) + for (let i = 0; i < this.specs.length; i++) { if (this.specs[i] == name) // literal command name { @@ -142,7 +142,7 @@ liberator.Commands = function () //{{{ function getMatchingUserCommands(name) { var matches = []; - for (var i = 0; i < exCommands.length; i++) + for (let i = 0; i < exCommands.length; i++) { if (exCommands[i].isUserCommand) { @@ -186,7 +186,7 @@ liberator.Commands = function () //{{{ __iterator__: function () { var sorted = exCommands.sort(function (cmd1, cmd2) { return cmd1.name > cmd2.name; }); - for (var i = 0; i < sorted.length; i++) + for (let i = 0; i < sorted.length; i++) yield sorted[i]; }, @@ -196,7 +196,7 @@ liberator.Commands = function () //{{{ if (!command) return false; - for (var i = 0; i < exCommands.length; i++) + for (let i = 0; i < exCommands.length; i++) { if (exCommands[i].name == command.name) { @@ -220,7 +220,7 @@ liberator.Commands = function () //{{{ if (!command) return false; - for (var i = 0; i < exCommands.length; i++) + for (let i = 0; i < exCommands.length; i++) { if (exCommands[i].name == command.name) { @@ -242,7 +242,7 @@ liberator.Commands = function () //{{{ get: function (name) { - for (var i = 0; i < exCommands.length; i++) + for (let i = 0; i < exCommands.length; i++) { if (exCommands[i].hasName(name)) return exCommands[i]; @@ -253,7 +253,7 @@ liberator.Commands = function () //{{{ getUserCommand: function (name) { - for (var i = 0; i < exCommands.length; i++) + for (let i = 0; i < exCommands.length; i++) { if (exCommands[i].isUserCommand && exCommands[i].hasName(name)) return exCommands[i]; @@ -266,7 +266,7 @@ liberator.Commands = function () //{{{ { var userCommands = []; - for (var i = 0; i < exCommands.length; i++) + for (let i = 0; i < exCommands.length; i++) { if (exCommands[i].isUserCommand) userCommands.push(exCommands[i]); @@ -309,7 +309,7 @@ liberator.Commands = function () //{{{ var arg = ""; outer: - for (var i = 0; i < str.length; i++) + for (let i = 0; i < str.length; i++) { switch (str[i]) { @@ -436,9 +436,9 @@ liberator.Commands = function () //{{{ var optname = ""; if (!onlyArgumentsRemaining) { - for (var opt = 0; opt < options.length; opt++) + for (let opt = 0; opt < options.length; opt++) { - for (var name = 0; name < options[opt][0].length; name++) + for (let name = 0; name < options[opt][0].length; name++) { optname = options[opt][0][name]; if (sub.indexOf(optname) == 0) @@ -640,7 +640,7 @@ liberator.Commands = function () //{{{ removeUserCommand: function (name) { - for (var i = 0; i < exCommands.length; i++) + for (let i = 0; i < exCommands.length; i++) { if (exCommands[i].isUserCommand && exCommands[i].hasName(name)) { @@ -695,7 +695,7 @@ liberator.Commands = function () //{{{ { var str = ":" + liberator.util.escapeHTML(liberator.commandline.getCommand()) + "
" + "
marklinecolfile
" + marks[i][0] + "
"; - for (var i = 0; i < cmdlist.length; i++) + for (let i = 0; i < cmdlist.length; i++) { // programmatically added user commands have a null replacementText str += ""; @@ -737,7 +737,7 @@ liberator.Commands = function () //{{{ var name = args.arguments[0]; var cmdlist = liberator.commands.getUserCommands(); - for (var i = 0; i < cmdlist.length; i++) + for (let i = 0; i < cmdlist.length; i++) { if (cmdlist[i].name == name) { diff --git a/content/completion.js b/content/completion.js index 0110e20c..1ca272ec 100644 --- a/content/completion.js +++ b/content/completion.js @@ -51,10 +51,10 @@ liberator.Completion = function () //{{{ if (liberator.options["wildmode"].indexOf("longest") >= 0) longest = true; - for (var i = 0; i < list.length; i++) + for (let i = 0; i < list.length; i++) { var complist = list[i][0] instanceof Array ? list[i][0] : [list[i][0]]; - for (var j = 0; j < complist.length; j++) + for (let j = 0; j < complist.length; j++) { var item = complist[j]; if (ignorecase) @@ -71,9 +71,9 @@ liberator.Completion = function () //{{{ { var lastIndex = item.lastIndexOf(filter); var length = item.length; - for (var k = item.indexOf(filter); k != -1 && k <= lastIndex; k = item.indexOf(filter, k + 1)) + for (let k = item.indexOf(filter); k != -1 && k <= lastIndex; k = item.indexOf(filter, k + 1)) { - for (var l = k + filter.length; l <= length; l++) + for (let l = k + filter.length; l <= length; l++) substrings.push(complist[j].substring(k, l)); } } @@ -99,10 +99,10 @@ liberator.Completion = function () //{{{ if (liberator.options["wildmode"].indexOf("longest") >= 0) longest = true; - for (var i = 0; i < list.length; i++) + for (let i = 0; i < list.length; i++) { var complist = list[i][0] instanceof Array ? list[i][0] : [list[i][0]]; - for (var j = 0; j < complist.length; j++) + for (let j = 0; j < complist.length; j++) { if (complist[j].indexOf(filter) != 0) continue; @@ -114,7 +114,7 @@ liberator.Completion = function () //{{{ if (substrings.length == 0) { var length = complist[j].length; - for (var k = filter.length; k <= length; k++) + for (let k = filter.length; k <= length; k++) substrings.push(complist[j].substring(0, k)); } else @@ -144,7 +144,7 @@ liberator.Completion = function () //{{{ return ""; var longest = substrings[0]; - for (var i = 1; i < substrings.length; i++) + for (let i = 1; i < substrings.length; i++) { if (substrings[i].length > longest.length) longest = substrings[i]; @@ -172,7 +172,7 @@ liberator.Completion = function () //{{{ var num = getBrowser().browsers.length; var title, url; - for (var i = 0; i < num; i++) + for (let i = 0; i < num; i++) { try { @@ -208,12 +208,12 @@ liberator.Completion = function () //{{{ if (!filter) { - for (var command in liberator.commands) + for (let command in liberator.commands) completions.push([command.name, command.description]); return [0, completions]; } - for (var command in liberator.commands) + for (let command in liberator.commands) completions.push([command.longNames, command.description]); return [0, buildLongestStartingSubstring(completions, filter)]; @@ -312,7 +312,7 @@ liberator.Completion = function () //{{{ var completions = []; try { - for (var o = 0; o < objects.length; o++) + for (let o = 0; o < objects.length; o++) { completions = completions.concat(eval( "var comp = [];" + @@ -443,7 +443,7 @@ liberator.Completion = function () //{{{ var autoCompletions = liberator.options["wildoptions"].indexOf("auto") >= 0; var suggestEngineAlias = liberator.options["suggestengines"] || "google"; // join all completion arrays together - for (var i = 0; i < cpt.length; i++) + for (let i = 0; i < cpt.length; i++) { if (cpt[i] == "s") completions = completions.concat(this.search(filter)[1]); @@ -470,7 +470,7 @@ liberator.Completion = function () //{{{ //if (result.searchResult == result.RESULT_SUCCESS) // urlResultsCache = result; - for (var i = 0; i < result.matchCount; i++) + for (let i = 0; i < result.matchCount; i++) { comp.push([result.getValueAt(i), result.getCommentAt(i)]); } @@ -497,7 +497,7 @@ liberator.Completion = function () //{{{ // TODO: add appropriate getters to l.mappings var mappings = []; - for (var map in liberator.mappings.getUserIterator(modes)) + for (let map in liberator.mappings.getUserIterator(modes)) mappings.push([map.names[0], ""]); return [0, this.filter(mappings, filter)]; @@ -571,9 +571,9 @@ liberator.Completion = function () //{{{ var urlLength = url.length; if (lastIndex >= 0 && lastIndex < urlLength) // do not build substrings, if we don't match filter { - for (var k = url.indexOf(filter); k != -1 && k <= lastIndex; k = url.indexOf(filter, k + 1)) + for (let k = url.indexOf(filter); k != -1 && k <= lastIndex; k = url.indexOf(filter, k + 1)) { - for (var l = k + filter.length; l <= urlLength; l++) + for (let l = k + filter.length; l <= urlLength; l++) substrings.push(url.substring(k, l)); } } diff --git a/content/editor.js b/content/editor.js index afbab047..bab6218e 100644 --- a/content/editor.js +++ b/content/editor.js @@ -522,7 +522,7 @@ liberator.Editor = function () //{{{ { var line = 1; var text = editor().value; - for (var i = 0; i < editor().selectionStart; i++) + for (let i = 0; i < editor().selectionStart; i++) if (text[i] == "\n") line++; return line; @@ -532,7 +532,7 @@ liberator.Editor = function () //{{{ { var col = 1; var text = editor().value; - for (var i = 0; i < editor().selectionStart; i++) + for (let i = 0; i < editor().selectionStart; i++) { col++; if (text[i] == "\n") @@ -742,7 +742,7 @@ liberator.Editor = function () //{{{ if (!typeof count == "number" || count < 1) count = 1; - for (var i = editor().selectionEnd + 1; i < text.length; i++) + for (let i = editor().selectionEnd + 1; i < text.length; i++) { if (text[i] == "\n") break; @@ -769,7 +769,7 @@ liberator.Editor = function () //{{{ if (!typeof count == "number" || count < 1) count = 1; - for (var i = editor().selectionStart - 1; i >= 0; i--) + for (let i = editor().selectionStart - 1; i >= 0; i--) { if (text[i] == "\n") break; @@ -900,9 +900,9 @@ liberator.Editor = function () //{{{ __iterator__: function () { var tmpCmd; - for (var lhs in abbrev) + for (let lhs in abbrev) { - for (var i = 0; i < abbrev[lhs].length; i++) + for (let i = 0; i < abbrev[lhs].length; i++) { tmpCmd = (abbrev[lhs][i][0] == "!") ? "abbreviate" : abbrev[lhs][i][0] + "abbrev"; yield (tmpCmd + " " + lhs + " " + abbrev[lhs][i][1] + "\n"); @@ -918,7 +918,7 @@ liberator.Editor = function () //{{{ { if (abbrev[lhs]) { - for (var i = 0; i < abbrev[lhs].length; i++) + for (let i = 0; i < abbrev[lhs].length; i++) { if (abbrev[lhs][i][0] == filter) liberator.echo(abbrev[lhs][i][0] + " " + lhs + " " + abbrev[lhs][i][1]); @@ -933,9 +933,9 @@ liberator.Editor = function () //{{{ var flagFound = false; var searchFilter = (filter == "!") ? "!ci" : filter + "!"; // ! -> list all, on c or i ! matches too) var list = "
NameArgsDefinition
" + cmdlist[i].name + "" + "*" + "" + liberator.util.escapeHTML(cmdlist[i].replacementText || "function () { ... }") + "
"; - for (var tmplhs in abbrev) + for (let tmplhs in abbrev) { - for (var i = 0; i < abbrev[tmplhs].length; i++) + for (let i = 0; i < abbrev[tmplhs].length; i++) { if (searchFilter.indexOf(abbrev[tmplhs][i][0]) > -1) { @@ -1003,7 +1003,7 @@ liberator.Editor = function () //{{{ return; } - for (var i = 0; i < abbrev[lhs].length; i++) + for (let i = 0; i < abbrev[lhs].length; i++) { if (abbrev[lhs][i][1] == rhs) { @@ -1097,9 +1097,9 @@ liberator.Editor = function () //{{{ } else { - for (var lhs in abbrev) + for (let lhs in abbrev) { - for (var i = 0; i < abbrev[lhs].length; i++) + for (let i = 0; i < abbrev[lhs].length; i++) { if (abbrev[lhs][i][0] == "!" || abbrev[lhs][i][0] == filter) this.removeAbbreviation(filter, lhs); @@ -1118,9 +1118,9 @@ liberator.Editor = function () //{{{ if (!foundWord) return true; - for (var lhs in abbrev) + for (let lhs in abbrev) { - for (var i = 0; i < abbrev[lhs].length; i++) + for (let i = 0; i < abbrev[lhs].length; i++) { if (lhs == foundWord && (abbrev[lhs][i][0] == filter || abbrev[lhs][i][0] == "!")) { diff --git a/content/events.js b/content/events.js index 16a954e3..9a883a9a 100644 --- a/content/events.js +++ b/content/events.js @@ -36,8 +36,8 @@ liberator.AutoCommands = function () //{{{ function autoCommandsIterator() { - for (var item in autoCommands) - for (var i = 0; i < autoCommands[item].length; i++) + for (let item in autoCommands) + for (let i = 0; i < autoCommands[item].length; i++) yield item + " " + autoCommands[item][i][0] + " " + autoCommands[item][i][1]; } @@ -122,15 +122,15 @@ liberator.AutoCommands = function () //{{{ add: function (auEvent, regex, cmds) { var eventsIter = auEvent.split(","); - for (var i = 0; i < eventsIter.length; i++) + for (let i = 0; i < eventsIter.length; i++) { if (!autoCommands[eventsIter[i]]) autoCommands[eventsIter[i]] = []; var flag = true; - for (var y = 0; y < autoCommands[eventsIter[i]].length; y++) + for (let j = 0; j < autoCommands[eventsIter[i]].length; j++) { - if (autoCommands[eventsIter[i]][y][0] == regex && autoCommands[eventsIter[i]][y][1] == cmds) + if (autoCommands[eventsIter[i]][j][0] == regex && autoCommands[eventsIter[i]][j][1] == cmds) { flag = false; break; @@ -149,7 +149,7 @@ liberator.AutoCommands = function () //{{{ } else if (!regex) // remove all on this auEvent { - for (var item in autoCommands) + for (let item in autoCommands) { if (item == auEvent) delete autoCommands[item]; @@ -157,7 +157,7 @@ liberator.AutoCommands = function () //{{{ } else if (!auEvent) // delete all matches to this regex { - for (var item in autoCommands) + for (let item in autoCommands) { var i = 0; while (i < autoCommands[item].length) @@ -174,11 +174,11 @@ liberator.AutoCommands = function () //{{{ } else // delete matching `auEvent && regex' items { - for (var item in autoCommands) + for (let item in autoCommands) { if (item == auEvent) { - for (var i = 0; i < autoCommands[item].length; i++) + for (let i = 0; i < autoCommands[item].length; i++) { if (regex == autoCommands[item][i][0]) autoCommands[item].splice(i, 1); // remove array @@ -194,12 +194,12 @@ liberator.AutoCommands = function () //{{{ var list = ":" + liberator.util.escapeHTML(liberator.commandline.getCommand()) + "
" + "
"; - for (var item in autoCommands) + for (let item in autoCommands) { flag = true; if (!auEvent || item == auEvent) // filter event { - for (var i = 0; i < autoCommands[item].length; i++) + for (let i = 0; i < autoCommands[item].length; i++) { if (!regex || regex == autoCommands[item][i][0]) // filter regex { @@ -234,7 +234,7 @@ liberator.AutoCommands = function () //{{{ if (autoCommands[auEvent]) { - for (var i = 0; i < autoCommands[auEvent].length; i++) + for (let i = 0; i < autoCommands[auEvent].length; i++) { if (autoCommands[auEvent][i][2].test(url)) liberator.execute(autoCommands[auEvent][i][1]); @@ -503,7 +503,7 @@ liberator.Events = function () //{{{ var ms = 25000; // maximum time to wait - TODO: add option var then = new Date().getTime(); - for (var now = then; now - then < ms; now = new Date().getTime()) + for (let now = then; now - then < ms; now = new Date().getTime()) { mainThread.processNextEvent(true); if ((now - then) % 1000 < 10) @@ -541,7 +541,7 @@ liberator.Events = function () //{{{ try { var files = liberator.io.readDirectory(liberator.io.getSpecialDirectory("macros")); - for (var i = 0; i < files.length; i++) + for (let i = 0; i < files.length; i++) { var file = files[i]; if (!file.exists() || file.isDirectory() || @@ -632,7 +632,7 @@ liberator.Events = function () //{{{ { var str = "
---- Auto-Commands ----
"; var macroRef = liberator.events.getMacros(args); - for (var [macro, keys] in macroRef) + for (let [macro, keys] in macroRef) str += ""; @@ -769,7 +769,7 @@ liberator.Events = function () //{{{ { var re = new RegExp(filter); - for (var [item,] in macros) + for (let [item,] in macros) { if (re.test(item)) macros.remove(item); diff --git a/content/hints.js b/content/hints.js index b737bdda..5a393488 100644 --- a/content/hints.js +++ b/content/hints.js @@ -137,7 +137,7 @@ liberator.Hints = function () //{{{ docs.push({ doc: doc, start: start, end: hints.length - 1 }); // also generate hints for frames - for (var i = 0; i < win.frames.length; i++) + for (let i = 0; i < win.frames.length; i++) generate(win.frames[i]); return true; @@ -168,7 +168,7 @@ liberator.Hints = function () //{{{ var activeHint = hintNumber || 1; validHints = []; - for (var j = 0; j < docs.length; j++) + for (let j = 0; j < docs.length; j++) { var doc = docs[j].doc; var start = docs[j].start; @@ -177,7 +177,7 @@ liberator.Hints = function () //{{{ var scrollY = doc.defaultView.scrollY; inner: - for (var i = start; i <= end; i++) + for (let i = start; i <= end; i++) { elem = hints[i][0]; text = hints[i][1]; @@ -238,13 +238,13 @@ liberator.Hints = function () //{{{ var firstElemBgColor = ""; var firstElemColor = ""; - for (var j = 0; j < docs.length; j++) + for (let j = 0; j < docs.length; j++) { var doc = docs[j].doc; var start = docs[j].start; var end = docs[j].end; - for (var i = start; i <= end; i++) + for (let i = start; i <= end; i++) { // remove the span for the numeric display part doc.body.removeChild(hints[i][2]); @@ -386,7 +386,7 @@ liberator.Hints = function () //{{{ function contains(textOfLink) { - for (var i = 0; i < tokens.length; i++) + for (let i = 0; i < tokens.length; i++) { if (textOfLink.indexOf(tokens[i]) < 0) return false; @@ -407,7 +407,7 @@ liberator.Hints = function () //{{{ { var charIdx = 0; var numMatchedWords = 0; - for (var wIdx = 0; wIdx < words.length; wIdx++) + for (let wIdx = 0; wIdx < words.length; wIdx++) { var word = words[wIdx]; if (word.length == 0) @@ -419,7 +419,7 @@ liberator.Hints = function () //{{{ if (charIdx > numMatchedWords) { var matchingStarted = false; - for (var i = numMatchedWords; i < charIdx; i++) + for (let i = numMatchedWords; i < charIdx; i++) { if (chars[i] == word[wcIdx]) { @@ -450,7 +450,7 @@ liberator.Hints = function () //{{{ // if yes, then consume them if (prevCharIdx == charIdx) { - for (var i = 0; i < wcIdx && charIdx < chars.length; i++, charIdx++) + for (let i = 0; i < wcIdx && charIdx < chars.length; i++, charIdx++) { if (word[i] != chars[charIdx]) break; @@ -464,7 +464,7 @@ liberator.Hints = function () //{{{ else { var prevCharIdx = charIdx; - for (var i = 0; i < word.length && charIdx < chars.length; i++, charIdx++) + for (let i = 0; i < word.length && charIdx < chars.length; i++, charIdx++) { if (word[i] != chars[charIdx]) break; @@ -489,7 +489,7 @@ liberator.Hints = function () //{{{ function stringsAtBeginningOfWords(strings, words, allowWordOverleaping) { var strIdx = 0; - for (var wIdx = 0; wIdx < words.length; wIdx++) + for (let wIdx = 0; wIdx < words.length; wIdx++) { var word = words[wIdx]; if (word.length == 0) diff --git a/content/io.js b/content/io.js index 1481c864..51e60ad4 100644 --- a/content/io.js +++ b/content/io.js @@ -213,15 +213,15 @@ liberator.IO = function () //{{{ var modes = [[[liberator.modes.NORMAL], ""], [[liberator.modes.COMMAND_LINE], "c"], [[liberator.modes.INSERT, liberator.modes.TEXTAREA], "i"]]; - for (var i = 0; i < modes.length; i++) + for (let i = 0; i < modes.length; i++) { // NOTE: names.length is always 1 on user maps. If that changes, also fix getUserIterator and v.m.list - for (var map in liberator.mappings.getUserIterator(modes[i][0])) + for (let map in liberator.mappings.getUserIterator(modes[i][0])) line += modes[i][1] + (map.noremap ? "nore" : "") + "map " + map.names[0] + " " + map.rhs + "\n"; } line += "\n\" Options\n"; - for (var option in liberator.options) + for (let option in liberator.options) { // TODO: options should be queried for this info // TODO: string/list options might need escaping in future @@ -236,11 +236,11 @@ liberator.IO = function () //{{{ // :mkvimrc doesn't save autocommands, so we don't either - remove this code at some point // line += "\n\" Auto-Commands\n"; - // for (var item in liberator.autocommands) + // for (let item in liberator.autocommands) // line += "autocmd " + item + "\n"; line += "\n\" Abbreviations\n"; - for (var abbrCmd in liberator.editor.abbreviations) + for (let abbrCmd in liberator.editor.abbreviations) line += abbrCmd; // if (liberator.mappings.getMapLeader() != "\\") @@ -259,7 +259,7 @@ liberator.IO = function () //{{{ { var list = "
" + macro + "   " + liberator.util.escapeHTML(keys) + "
"; - for (var i = 0; i < scriptNames.length; i++) + for (let i = 0; i < scriptNames.length; i++) list += ""; list += "
" + (i + 1) + "." + scriptNames[i] + "
"; @@ -354,7 +354,7 @@ liberator.IO = function () //{{{ { var expansion; - for (var i = 0; i < envVars.length; i++) + for (let i = 0; i < envVars.length; i++) { expansion = environmentService.get(envVars[i].replace("$", "")); if (expansion) @@ -371,7 +371,7 @@ liberator.IO = function () //{{{ .createInstance(Components.interfaces.nsILocalFile); var dirs = [cwd, "$PWD", "~"]; - for (var i = 0; i < dirs.length; i++) + for (let i = 0; i < dirs.length; i++) { if (!dirs[i]) continue; @@ -603,7 +603,7 @@ liberator.IO = function () //{{{ { var dirs = environmentService.get("PATH").split(WINDOWS ? ";" : ":"); lookup: - for (var i = 0; i < dirs.length; i++) + for (let i = 0; i < dirs.length; i++) { var path = dirs[i] + (WINDOWS ? "\\" : "/") + program; try diff --git a/content/liberator.js b/content/liberator.js index d9bacb77..55e39f70 100644 --- a/content/liberator.js +++ b/content/liberator.js @@ -189,7 +189,7 @@ const liberator = (function () //{{{ var menubar = document.getElementById(liberator.config.guioptions["m"]); var items = []; - for (var i = 0; i < menubar.childNodes.length; i++) + for (let i = 0; i < menubar.childNodes.length; i++) { (function (item, path) { @@ -204,7 +204,7 @@ const liberator = (function () //{{{ if (item.localName == "menu") path += item.label + "."; - for (var j = 0; j < item.childNodes.length; j++) + for (let j = 0; j < item.childNodes.length; j++) arguments.callee(item.childNodes[j], path); } })(menubar.childNodes[i], ""); @@ -226,7 +226,7 @@ const liberator = (function () //{{{ return; } - for (var i = 0; i < items.length; i++) + for (let i = 0; i < items.length; i++) { if (items[i].fullMenuPath == item) items[i].doCommand(); @@ -516,7 +516,7 @@ const liberator = (function () //{{{ var files = liberator.config.helpFiles || []; var res = []; - for (var i = 0; i < files.length; i++) + for (let i = 0; i < files.length; i++) { try { @@ -531,7 +531,7 @@ const liberator = (function () //{{{ } var doc = xmlhttp.responseXML; var elems = doc.getElementsByClassName("tag"); - for (var j = 0; j < elems.length; j++) + for (let j = 0; j < elems.length; j++) res.push([elems[j].textContent, files[i]]); } @@ -830,7 +830,7 @@ const liberator = (function () //{{{ var [, items] = getHelpCompletions(topic); var partialMatch = -1; - for (var i = 0; i < items.length; i++) + for (let i = 0; i < items.length; i++) { if (items[i][0] == topic) { @@ -946,7 +946,7 @@ const liberator = (function () //{{{ return true; // all other URLs are always loaded in background - for (var i = 1; i < urls.length; i++) + for (let i = 1; i < urls.length; i++) { url = typeof urls[i] == "string" ? urls[i] : urls[i][0]; postdata = typeof urls[i] == "string" ? null : urls[i][1]; diff --git a/content/mail.js b/content/mail.js index fa855424..497b23b2 100644 --- a/content/mail.js +++ b/content/mail.js @@ -60,7 +60,7 @@ liberator.Mail = function () //{{{ var indices = []; if (selectMessageKeys.length > 0) { - for (var j = 0; j < selectMessageKeys.length; j++) + for (let j = 0; j < selectMessageKeys.length; j++) indices.push([gDBView.findIndexFromKey(selectMessageKeys[j], true), selectMessageKeys[j]]); indices.sort(); @@ -861,7 +861,7 @@ liberator.Mail = function () //{{{ : this.getFolders("", true, false); var unreadCount = 0, totalCount = 0, newCount = 0; - for (var i = 0; i < accounts.length; i++) + for (let i = 0; i < accounts.length; i++) { var account = accounts[i]; unreadCount += account.getNumUnread(true); // true == deep (includes subfolders) @@ -935,7 +935,7 @@ liberator.Mail = function () //{{{ // first try to find in current folder if (gDBView) { - for (var i = currentIndex() + (reverse ? -1 : (openThreads && closedThread() ? 0 : 1)); + for (let i = currentIndex() + (reverse ? -1 : (openThreads && closedThread() ? 0 : 1)); reverse ? (i >= 0) : (i < gDBView.rowCount); reverse ? i-- : i++) { @@ -987,7 +987,7 @@ liberator.Mail = function () //{{{ var folders = this.getFolders("", true, true); var ci = GetFolderTree().currentIndex; - for (var i = 1; i < folders.length; i++) + for (let i = 1; i < folders.length; i++) { let index = (i + ci) % folders.length; if (reverse) diff --git a/content/mappings.js b/content/mappings.js index 4a892c53..b67cdc12 100644 --- a/content/mappings.js +++ b/content/mappings.js @@ -79,7 +79,7 @@ liberator.Mappings = function () //{{{ var main = []; // default mappings var user = []; // user created mappings - for (var mode in liberator.modes) + for (let mode in liberator.modes) { main[mode] = []; user[mode] = []; @@ -95,7 +95,7 @@ liberator.Mappings = function () //{{{ { var maps = stack[mode]; - for (var i = 0; i < maps.length; i++) + for (let i = 0; i < maps.length; i++) { if (maps[i].hasName(cmd)) return maps[i]; @@ -109,10 +109,10 @@ liberator.Mappings = function () //{{{ var maps = user[mode]; var names; - for (var i = 0; i < maps.length; i++) + for (let i = 0; i < maps.length; i++) { names = maps[i].names; - for (var j = 0; j < names.length; j++) + for (let j = 0; j < names.length; j++) { if (names[j] == cmd) { @@ -139,17 +139,17 @@ liberator.Mappings = function () //{{{ var output; var maps = stack[modes[0]]; - for (var i = 0; i < maps.length; i++) + for (let i = 0; i < maps.length; i++) { output = true; - for (var index = 1; index < modes.length; index++) // check other modes + for (let index = 1; index < modes.length; index++) // check other modes { output = false; // toggle false, only true whan also found in this mode - for (var z = 0; z < user[modes[index]].length; z++) // maps + for (let j = 0; j < user[modes[index]].length; j++) // maps { // NOTE: when other than user maps, there might be more than only one names[x]. // since only user mappings gets queried here, only names[0] gets checked for equality. - if (maps[i].rhs == user[modes[index]][z].rhs && maps[i].names[0] == user[modes[index]][z].names[0]) + if (maps[i].rhs == user[modes[index]][j].rhs && maps[i].names[0] == user[modes[index]][j].names[0]) { output = true; break; // found on this mode - check next mode, if there is one, where it could still fail... @@ -184,7 +184,7 @@ liberator.Mappings = function () //{{{ } else { - for (var index = 0; index < mode.length; index++) + for (let index = 0; index < mode.length; index++) { liberator.mappings.addUserMap([mode[index]], [lhs], "User defined mapping", @@ -300,9 +300,9 @@ liberator.Mappings = function () //{{{ var map = new liberator.Map(modes, keys, description || "User defined mapping", action, extra); // remove all old mappings to this key sequence - for (var i = 0; i < map.names.length; i++) + for (let i = 0; i < map.names.length; i++) { - for (var j = 0; j < map.modes.length; j++) + for (let j = 0; j < map.modes.length; j++) removeMap(map.modes[j], map.names[i]); } @@ -327,10 +327,10 @@ liberator.Mappings = function () //{{{ var mappings = user[mode].concat(main[mode]); var matches = []; - for (var i = 0; i < mappings.length; i++) + for (let i = 0; i < mappings.length; i++) { var map = mappings[i]; - for (var j = 0; j < map.names.length; j++) + for (let j = 0; j < map.names.length; j++) { if (map.names[j].indexOf(cmd) == 0 && map.names[j].length > cmd.length) { @@ -378,7 +378,7 @@ liberator.Mappings = function () //{{{ return; } - for (var i = 0; i < maps.length; i++) // check on maps items (first mode) + for (let i = 0; i < maps.length; i++) // check on maps items (first mode) { output.push(true); if (filter && maps[i].names[0] != filter) // does it match the filter first of all? @@ -386,14 +386,14 @@ liberator.Mappings = function () //{{{ output[output.length - 1] = false; continue; } - for (var index = 1; index < modes.length; index++) // check if found in the other modes (1(2nd)-last) + for (let j = 1; j < modes.length; j++) // check if found in the other modes (1(2nd)-last) { output[output.length - 1] = false; // toggle false, only true whan also found in this mode - for (var z = 0; z < user[modes[index]].length; z++) // maps on the other modes + for (let k = 0; k < user[modes[j]].length; k++) // maps on the other modes { // NOTE: when other than user maps, there might be more than only one names[x]. // since only user mappings gets queried here, only names[0] gets checked for equality. - if (maps[i].rhs == user[modes[index]][z].rhs && maps[i].names[0] == user[modes[index]][z].names[0]) + if (maps[i].rhs == user[modes[j]][k].rhs && maps[i].names[0] == user[modes[j]][k].names[0]) { output[output.length - 1] = true; break; // found on this mode - ok, check next mode... @@ -405,7 +405,7 @@ liberator.Mappings = function () //{{{ // anything found? var flag = false; - for (var i = 0; i < output.length; i++) + for (let i = 0; i < output.length; i++) if (output[i]) flag = true; @@ -416,7 +416,7 @@ liberator.Mappings = function () //{{{ } var modeSign = ""; - for (var i = 0; i < modes.length; i++) + for (let i = 0; i < modes.length; i++) { if (modes[i] == liberator.modes.NORMAL) modeSign += "n"; @@ -429,11 +429,11 @@ liberator.Mappings = function () //{{{ } var list = ""; - for (i = 0; i < maps.length; i++) + for (let i = 0; i < maps.length; i++) { if (!output[i]) continue; - for (var j = 0; j < maps[i].names.length; j++) + for (let j = 0; j < maps[i].names.length; j++) { list += ""; list += ""; diff --git a/content/modes.js b/content/modes.js index 94445c89..8a34bbad 100644 --- a/content/modes.js +++ b/content/modes.js @@ -187,7 +187,7 @@ liberator.modes = (function () //{{{ { var modes = this.all; - for (var i = 0; i < modes.length; i++) + for (let i = 0; i < modes.length; i++) yield modes[i]; }, diff --git a/content/options.js b/content/options.js index a4ff2455..33b94241 100644 --- a/content/options.js +++ b/content/options.js @@ -61,7 +61,7 @@ liberator.Option = function (names, description, type, defaultValue, extraInfo) if (this.type == "boolean") { this.names = []; // reset since order is important - for (var i = 0; i < names.length; i++) + for (let i = 0; i < names.length; i++) { this.names.push(names[i]); this.names.push("no" + names[i]); @@ -269,7 +269,7 @@ liberator.Options = function () //{{{ if (!args) { var str = ""; - for (var i in liberator.globalVariables) + for (let i in liberator.globalVariables) { var value = liberator.globalVariables[i]; if (typeof value == "number") @@ -669,7 +669,7 @@ liberator.Options = function () //{{{ if (filter.length > 0 && filter.lastIndexOf("=") == filter.length - 1) { - for (var i = 0; i < prefArray.length; i++) + for (let i = 0; i < prefArray.length; i++) { var name = prefArray[i]; if (name.match("^" + filter.substr(0, filter.length - 1) + "$" )) @@ -681,7 +681,7 @@ liberator.Options = function () //{{{ return [0, []]; } - for (var i = 0; i < prefArray.length; i++) + for (let i = 0; i < prefArray.length; i++) optionCompletions.push([prefArray[i], liberator.options.getPref(prefArray[i])]); return [0, liberator.completion.filter(optionCompletions, filter)]; @@ -695,7 +695,7 @@ liberator.Options = function () //{{{ { var options = []; - for (var option in liberator.options) + for (let option in liberator.options) { if (!(option.scope & scope)) continue; @@ -709,7 +709,7 @@ liberator.Options = function () //{{{ else if (filter.length > 0 && filter.lastIndexOf("=") == filter.length - 1) { filter = filter.substr(0, filter.length - 1); - for (var option in liberator.options) + for (let option in liberator.options) { if (!(option.scope & scope)) continue; @@ -724,14 +724,14 @@ liberator.Options = function () //{{{ } var filterLength = filter.length; - for (var option in liberator.options) + for (let option in liberator.options) { if (!(option.scope & scope)) continue; if (prefix && option.type != "boolean") continue; - for (var j = 0; j < option.names.length; j++) + for (let j = 0; j < option.names.length; j++) { if (option.names[j].indexOf(filter) != 0) continue; @@ -753,8 +753,8 @@ liberator.Options = function () //{{{ //if (typeof names == "string") names = [names]; //var length = names.length; - //for (var i = 0, name = names[i]; i < length; name = names[++i]) - for (var i = 0; i < args.arguments.length; i++) + //for (let i = 0, name = names[i]; i < length; name = names[++i]) + for (let i = 0; i < args.arguments.length; i++) { var name = args.arguments[i]; var reference = liberator.variableReference(name); @@ -782,7 +782,7 @@ liberator.Options = function () //{{{ __iterator__: function () { - for (var i = 0; i < options.length; i++) + for (let i = 0; i < options.length; i++) yield options[i]; }, @@ -796,7 +796,7 @@ liberator.Options = function () //{{{ if (!option) return false; - for (var opt in Iterator(this)) + for (let opt in Iterator(this)) { if (opt.name == option.name) { @@ -829,7 +829,7 @@ liberator.Options = function () //{{{ if (!scope) scope = liberator.options.OPTION_SCOPE_BOTH; - for (var i = 0; i < options.length; i++) + for (let i = 0; i < options.length; i++) { if (options[i].hasName(name) && (options[i].scope & scope)) return options[i]; @@ -847,7 +847,7 @@ liberator.Options = function () //{{{ if (!scope) scope = liberator.options.OPTION_SCOPE_BOTH; - for (var opt in Iterator(this)) + for (let opt in Iterator(this)) { name = opt.name; value = opt.value; diff --git a/content/tabs.js b/content/tabs.js index 26896324..aa90ff56 100644 --- a/content/tabs.js +++ b/content/tabs.js @@ -548,7 +548,7 @@ liberator.Tabs = function () //{{{ if (count < 1) count = 1; - for (var i = 0; i < count; i++) + for (let i = 0; i < count; i++) liberator.tabs.cloneTab(tab, activate); }, { argCount: "0" }); @@ -569,7 +569,7 @@ liberator.Tabs = function () //{{{ var ss = Components.classes["@mozilla.org/browser/sessionstore;1"] .getService(Components.interfaces.nsISessionStore); var undoItems = eval("(" + ss.getClosedTabData(window) + ")"); - for (var i = 0; i < undoItems.length; i++) + for (let i = 0; i < undoItems.length; i++) { if (undoItems[i].state.entries[0].url == args) { @@ -588,7 +588,7 @@ liberator.Tabs = function () //{{{ .getService(Components.interfaces.nsISessionStore); var undoItems = eval("(" + ss.getClosedTabData(window) + ")"); var completions = []; - for (var i = 0; i < undoItems.length; i++) + for (let i = 0; i < undoItems.length; i++) { var url = undoItems[i].state.entries[0].url; var title = undoItems[i].title; @@ -617,7 +617,7 @@ liberator.Tabs = function () //{{{ var ss = Components.classes["@mozilla.org/browser/sessionstore;1"] .getService(Components.interfaces.nsISessionStore); var undoItems = eval("(" + ss.getClosedTabData(window) + ")"); - for (var i = 0; i < undoItems.length; i++) + for (let i = 0; i < undoItems.length; i++) undoCloseTab(); // doesn't work with i as the index to undoCloseTab }, { argCount: "0" }); @@ -665,7 +665,7 @@ liberator.Tabs = function () //{{{ if (tab) { var length = getBrowser().mTabs.length; - for (var i = 0; i < length; i++) + for (let i = 0; i < length; i++) { if (getBrowser().mTabs[i] == tab) return i; @@ -682,7 +682,7 @@ liberator.Tabs = function () //{{{ { var buffers = []; var browsers = getBrowser().browsers; - for (var i = 0; i < browsers.length; i++) + for (let i = 0; i < browsers.length; i++) { var title = browsers[i].contentTitle || "(Untitled)"; var uri = browsers[i].currentURI.spec; @@ -708,7 +708,7 @@ liberator.Tabs = function () //{{{ var number, indicator, title, url; var list = ":" + (liberator.util.escapeHTML(liberator.commandline.getCommand()) || "buffers") + "
" + "
" + modeSign + " " + liberator.util.escapeHTML(maps[i].names[j]) + "
"; - for (var i = 0; i < items.length; i++) + for (let i = 0; i < items.length; i++) { if (i == liberator.tabs.index()) indicator = " % "; @@ -786,7 +786,7 @@ liberator.Tabs = function () //{{{ if (focusLeftTab) { var lastRemovedTab = 0; - for (var i = index; i > index - count && i >= 0; i--) + for (let i = index; i > index - count && i >= 0; i--) { removeOrBlankTab(this.getTab(i)); lastRemovedTab = i > 0 ? i : 1; @@ -839,7 +839,7 @@ liberator.Tabs = function () //{{{ { if (bypassCache) { - for (var i = 0; i < getBrowser().mTabs.length; i++) + for (let i = 0; i < getBrowser().mTabs.length; i++) { try { @@ -899,7 +899,7 @@ liberator.Tabs = function () //{{{ var matches = []; var lowerBuffer = buffer.toLowerCase(); var first = liberator.tabs.index() + (reverse ? 0 : 1); - for (var i = 0; i < getBrowser().browsers.length; i++) + for (let i = 0; i < getBrowser().browsers.length; i++) { var index = (i + first) % getBrowser().browsers.length; var url = getBrowser().getBrowserAtIndex(index).contentDocument.location.href; diff --git a/content/ui.js b/content/ui.js index 61bb143a..e84be4a1 100644 --- a/content/ui.js +++ b/content/ui.js @@ -1269,7 +1269,7 @@ liberator.ItemList = function (id) //{{{ var tbody = doc.createElement("tbody"); table.appendChild(tbody); - for (var i = 0; i < completions.length; i++) + for (let i = 0; i < completions.length; i++) { var elem = completions[i]; if (i >= listOffset && i - listOffset < maxItems) @@ -1529,12 +1529,12 @@ liberator.StatusLine = function () //{{{ { progressStr = "["; var done = Math.floor(progress * 20); - for (var i = 0; i < done; i++) + for (let i = 0; i < done; i++) progressStr += "="; progressStr += ">"; - for (var i = 19; i > done; i--) + for (let i = 19; i > done; i--) progressStr += " "; progressStr += "]"; diff --git a/content/util.js b/content/util.js index b9e9fc82..96b1649a 100644 --- a/content/util.js +++ b/content/util.js @@ -129,7 +129,7 @@ liberator.util = { //{{{ strNum[1] += "0"; } - for (var u = strNum[0].length - 3; u > 0; u -= 3) // make a 10000 a 10,000 + for (let u = strNum[0].length - 3; u > 0; u -= 3) // make a 10000 a 10,000 strNum[0] = strNum[0].substring(0, u) + "," + strNum[0].substring(u, strNum[0].length); if (unitIndex) // decimalPlaces only when > Bytes @@ -153,7 +153,7 @@ liberator.util = { //{{{ longHelp = true; // the tags which are printed on the top right - for (var j = command.names.length - 1; j >= 0; j--) + for (let j = command.names.length - 1; j >= 0; j--) ret += "|" + start + command.names[j] + end + "| "; if (longHelp) @@ -225,7 +225,7 @@ liberator.util = { //{{{ try // window.content often does not want to be queried with "var i in object" { - for (var i in object) + for (let i in object) { var value; try @@ -287,7 +287,7 @@ liberator.util = { //{{{ { var urls = str.split(new RegExp("\s*" + liberator.options["urlseparator"] + "\s*")); - begin: for (var url = 0; url < urls.length; url++) + begin: for (let url = 0; url < urls.length; url++) { var file = liberator.io.getFile(urls[url]); if (file.exists() && file.isReadable()) diff --git a/content/vimperator.js b/content/vimperator.js index 6f58b8e0..ee596491 100644 --- a/content/vimperator.js +++ b/content/vimperator.js @@ -216,7 +216,7 @@ liberator.config = { //{{{ count = 1; var url = liberator.buffer.URL; - for (var i = 0; i < count; i++) + for (let i = 0; i < count; i++) { if (isDirectory(url)) url = url.replace(/^(.*?:)(.*?)([^\/]+\/*)$/, "$1$2/"); @@ -317,7 +317,7 @@ liberator.config = { //{{{ } var menu = document.getElementById("viewSidebarMenu"); - for (var i = 0; i < menu.childNodes.length; i++) + for (let i = 0; i < menu.childNodes.length; i++) { if (menu.childNodes[i].label == args.string) { @@ -334,7 +334,7 @@ liberator.config = { //{{{ var menu = document.getElementById("viewSidebarMenu"); var nodes = []; - for (var i = 0; i < menu.childNodes.length; i++) + for (let i = 0; i < menu.childNodes.length; i++) nodes.push([menu.childNodes[i].label, ""]); return [0, liberator.completion.filter(nodes, filter)];