gryf/pentadactyl-pm
1
0
Fork 0
mirror of https://github.com/gryf/pentadactyl-pm.git synced 2025-12-23 16:52:25 +01:00
Code Issues Projects Releases Wiki Activity

use let when declaring loop variables

Browse Source
This commit is contained in:
Doug Kearns
2008-09-18 12:07:10 +00:00
parent 65f1b0d53f
commit e64a7397df
18 changed files with 186 additions and 186 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
content/addressbook.js
View File

@@ -204,7 +204,7 @@ liberator.Addressbook = function () //{{{
{ {
var list = ":" + liberator.util.escapeHTML(liberator.commandline.getCommand()) + "<br/>" + var list = ":" + liberator.util.escapeHTML(liberator.commandline.getCommand()) + "<br/>" +
"<table><tr class=\"hl-Title\" align=\"left\"><th>Name</th><th>Address</th></tr>"; "<table><tr class=\"hl-Title\" align=\"left\"><th>Name</th><th>Address</th></tr>";
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 displayName = liberator.util.escapeHTML(liberator.util.clip(addresses[i][0], 50));
var mailAddr = liberator.util.escapeHTML(addresses[i][1]); var mailAddr = liberator.util.escapeHTML(addresses[i][1]);

26
content/bookmarks.js
View File

@@ -113,7 +113,7 @@ liberator.Bookmarks = function () //{{{
rootNode.containerOpen = true; rootNode.containerOpen = true;
// iterate over the immediate children of this folder // 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); var node = rootNode.getChild(i);
if (node.type == node.RESULT_TYPE_FOLDER) // folder if (node.type == node.RESULT_TYPE_FOLDER) // folder
@@ -238,7 +238,7 @@ liberator.Bookmarks = function () //{{{
list += "<tr class=\"hl-Title\" align=\"left\"><th colspan=\"2\">jump</th><th>title</th><th>URI</th></tr>"; list += "<tr class=\"hl-Title\" align=\"left\"><th colspan=\"2\">jump</th><th>title</th><th>URI</th></tr>";
var num = -sh.index; 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 entry = sh.getEntryAtIndex(i, false);
var uri = entry.URI.spec; var uri = entry.URI.spec;
@@ -419,7 +419,7 @@ liberator.Bookmarks = function () //{{{
{ {
var searchEngines = []; var searchEngines = [];
var firefoxEngines = searchService.getVisibleEngines({}); var firefoxEngines = searchService.getVisibleEngines({});
for (var i in firefoxEngines) for (let i in firefoxEngines)
{ {
var alias = firefoxEngines[i].alias; var alias = firefoxEngines[i].alias;
if (!alias || !/^[a-z0-9_-]+$/.test(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) // make sure we can use search engines which would have the same alias (add numbers at the end)
var newAlias = alias; 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); })) if (!searchEngines.some(function (item) { return (item[0] == newAlias); }))
break; break;
@@ -502,7 +502,7 @@ liberator.Bookmarks = function () //{{{
var title, url, tags, keyword, extra; var title, url, tags, keyword, extra;
var list = ":" + liberator.util.escapeHTML(liberator.commandline.getCommand()) + "<br/>" + var list = ":" + liberator.util.escapeHTML(liberator.commandline.getCommand()) + "<br/>" +
"<table><tr class=\"hl-Title\" align=\"left\"><th>title</th><th>URL</th></tr>"; "<table><tr class=\"hl-Title\" align=\"left\"><th>title</th><th>URL</th></tr>";
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)); title = liberator.util.escapeHTML(liberator.util.clip(items[i][1], 50));
url = liberator.util.escapeHTML(items[i][0]); url = liberator.util.escapeHTML(items[i][0]);
@@ -567,7 +567,7 @@ liberator.History = function () //{{{
var rootNode = result.root; var rootNode = result.root;
rootNode.containerOpen = true; rootNode.containerOpen = true;
// iterate over the immediate children of this folder // 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); var node = rootNode.getChild(i);
//liberator.dump("History child " + node.itemId + ": " + node.title + " - " + node.type + "\n"); //liberator.dump("History child " + node.itemId + ": " + node.title + " - " + node.type + "\n");
@@ -622,7 +622,7 @@ liberator.History = function () //{{{
if (args) if (args)
{ {
var sh = getWebNavigation().sessionHistory; 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) if (sh.getEntryAtIndex(i, false).URI.spec == args)
{ {
@@ -643,7 +643,7 @@ liberator.History = function () //{{{
{ {
var sh = getWebNavigation().sessionHistory; var sh = getWebNavigation().sessionHistory;
var completions = []; 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 entry = sh.getEntryAtIndex(i, false);
var url = entry.URI.spec; var url = entry.URI.spec;
@@ -668,7 +668,7 @@ liberator.History = function () //{{{
if (args) if (args)
{ {
var sh = getWebNavigation().sessionHistory; 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) if (sh.getEntryAtIndex(i, false).URI.spec == args)
{ {
@@ -689,7 +689,7 @@ liberator.History = function () //{{{
{ {
var sh = getWebNavigation().sessionHistory; var sh = getWebNavigation().sessionHistory;
var completions = []; 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 entry = sh.getEntryAtIndex(i, false);
var url = entry.URI.spec; var url = entry.URI.spec;
@@ -806,7 +806,7 @@ liberator.History = function () //{{{
{ {
var list = ":" + liberator.util.escapeHTML(liberator.commandline.getCommand()) + "<br/>" + var list = ":" + liberator.util.escapeHTML(liberator.commandline.getCommand()) + "<br/>" +
"<table><tr class=\"hl-Title\" align=\"left\"><th>title</th><th>URL</th></tr>"; "<table><tr class=\"hl-Title\" align=\"left\"><th>title</th><th>URL</th></tr>";
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 title = liberator.util.escapeHTML(liberator.util.clip(items[i][1], 50));
var url = liberator.util.escapeHTML(items[i][0]); var url = liberator.util.escapeHTML(items[i][0]);
@@ -934,7 +934,7 @@ liberator.QuickMarks = function () //{{{
{ {
var pattern = new RegExp("[" + filter.replace(/\s+/g, "") + "]"); var pattern = new RegExp("[" + filter.replace(/\s+/g, "") + "]");
for (var [qmark,] in qmarks) for (let [qmark,] in qmarks)
{ {
if (pattern.test(qmark)) if (pattern.test(qmark))
qmarks.remove(qmark); qmarks.remove(qmark);
@@ -985,7 +985,7 @@ liberator.QuickMarks = function () //{{{
var list = ":" + liberator.util.escapeHTML(liberator.commandline.getCommand()) + "<br/>" + var list = ":" + liberator.util.escapeHTML(liberator.commandline.getCommand()) + "<br/>" +
"<table><tr class=\"hl-Title\" align=\"left\"><th>QuickMark</th><th>URL</th></tr>"; "<table><tr class=\"hl-Title\" align=\"left\"><th>QuickMark</th><th>URL</th></tr>";
for (var i = 0; i < marks.length; i++) for (let i = 0; i < marks.length; i++)
{ {
list += "<tr><td> " + marks[i] + list += "<tr><td> " + marks[i] +
"</td><td style=\"color: green;\">" + liberator.util.escapeHTML(qmarks.get(marks[i])) + "</td></tr>"; "</td><td style=\"color: green;\">" + liberator.util.escapeHTML(qmarks.get(marks[i])) + "</td></tr>";

46
content/buffer.js
View File

@@ -67,7 +67,7 @@ liberator.Buffer = function () //{{{
var index = -1; var index = -1;
if (steps <= 0) 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 if ((zoomLevels[i] + 0.01) < value) // 0.01 for float comparison
{ {
@@ -78,7 +78,7 @@ liberator.Buffer = function () //{{{
} }
else 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 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) if (win.scrollMaxX > 0 || win.scrollMaxY > 0)
return win; 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) if (win.frames[i].scrollMaxX > 0 || win.frames[i].scrollMaxY > 0)
return win.frames[i]; return win.frames[i];
@@ -798,7 +798,7 @@ liberator.Buffer = function () //{{{
revText = new RegExp(revString, "i"); revText = new RegExp(revString, "i");
var elems = parsedFrame.document.getElementsByTagName("link"); var elems = parsedFrame.document.getElementsByTagName("link");
// links have higher priority than normal <a> hrefs // links have higher priority than normal <a> 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)) if (relText.test(elems[i].rel) || revText.test(elems[i].rev))
{ {
@@ -809,7 +809,7 @@ liberator.Buffer = function () //{{{
// no links? ok, look for hrefs // no links? ok, look for hrefs
elems = parsedFrame.document.getElementsByTagName("a"); 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)) 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"); 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)) if (patternText.test(elems[i].textContent))
{ {
@@ -832,7 +832,7 @@ liberator.Buffer = function () //{{{
{ {
// images with alt text being href // images with alt text being href
var children = elems[i].childNodes; 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)) if (patternText.test(children[j].alt))
{ {
@@ -853,7 +853,7 @@ liberator.Buffer = function () //{{{
if (!retVal) if (!retVal)
{ {
// only loop through frames if the main content didnt match // 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]); retVal = followFrameRelationship(relationship, window.content.frames[i]);
if (retVal) if (retVal)
@@ -1156,7 +1156,7 @@ liberator.Buffer = function () //{{{
if (data.length - 1) if (data.length - 1)
{ {
for (var i = 0; i < data.length - 1; i++) for (let i = 0; i < data.length - 1; i++)
ret += "<tr><td style='font-weight: bold; min-width: 150px'> " + data[i][0] + ": </td><td>" + data[i][1] + "</td></tr>"; ret += "<tr><td style='font-weight: bold; min-width: 150px'> " + data[i][0] + ": </td><td>" + data[i][1] + "</td></tr>";
} }
else else
@@ -1206,7 +1206,7 @@ liberator.Buffer = function () //{{{
// put feeds rss into pageFeeds[] // put feeds rss into pageFeeds[]
var linkNodes = window.content.document.getElementsByTagName("link"); var linkNodes = window.content.document.getElementsByTagName("link");
var length = linkNodes.length; var length = linkNodes.length;
for (var i = 0; i < length; i++) for (let i = 0; i < length; i++)
{ {
var link = linkNodes[i]; var link = linkNodes[i];
if (!link.href) if (!link.href)
@@ -1292,7 +1292,7 @@ liberator.Buffer = function () //{{{
var tmpSort = []; var tmpSort = [];
var tmpDict = []; 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 tmpTag = metaNodes[i].name || metaNodes[i].httpEquiv;// +
var tmpTagNr = tmpTag + "-" + i; // allows multiple (identical) meta names var tmpTagNr = tmpTag + "-" + i; // allows multiple (identical) meta names
@@ -1302,7 +1302,7 @@ liberator.Buffer = function () //{{{
// sort: ignore-case // sort: ignore-case
tmpSort.sort(function (a, b) { return a.toLowerCase() > b.toLowerCase() ? 1 : -1; }); 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)]); 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 option = liberator.options["pageinfo"];
var br = ""; 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": case "g":
if (pageGeneral.length > 1) if (pageGeneral.length > 1)
@@ -1426,7 +1426,7 @@ liberator.Marks = function () //{{{
function onPageLoad(event) function onPageLoad(event)
{ {
var win = event.originalTarget.defaultView; 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]; var mark = pendingJumps[i];
if (win && win.location.href == mark.location) if (win && win.location.href == mark.location)
@@ -1451,7 +1451,7 @@ liberator.Marks = function () //{{{
if (localmark) if (localmark)
{ {
var win = window.content; var win = window.content;
for (var [i,] in Iterator(localmark)) for (let [i,] in Iterator(localmark))
{ {
if (localmark[i].location == win.location.href) 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 // 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)) 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 start = matches[i][0];
var end = matches[i][2]; var end = matches[i][2];
@@ -1658,18 +1658,18 @@ liberator.Marks = function () //{{{
if (special) if (special)
{ {
// :delmarks! only deletes a-z marks // :delmarks! only deletes a-z marks
for (var [mark,] in localMarks) for (let [mark,] in localMarks)
removeLocalMark(mark); removeLocalMark(mark);
} }
else else
{ {
var pattern = new RegExp("[" + filter.replace(/\s+/g, "") + "]"); var pattern = new RegExp("[" + filter.replace(/\s+/g, "") + "]");
for (var [mark,] in urlMarks) for (let [mark,] in urlMarks)
{ {
if (pattern.test(mark)) if (pattern.test(mark))
removeURLMark(mark); removeURLMark(mark);
} }
for (var [mark,] in localMarks) for (let [mark,] in localMarks)
{ {
if (pattern.test(mark)) if (pattern.test(mark))
removeLocalMark(mark); removeLocalMark(mark);
@@ -1716,7 +1716,7 @@ liberator.Marks = function () //{{{
var win = window.content; var win = window.content;
var slice = localMarks.get(mark) || []; 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) if (win.location.href == slice[i].location)
{ {
@@ -1756,7 +1756,7 @@ liberator.Marks = function () //{{{
var list = ":" + liberator.util.escapeHTML(liberator.commandline.getCommand()) + "<br/>" + var list = ":" + liberator.util.escapeHTML(liberator.commandline.getCommand()) + "<br/>" +
"<table><tr class=\"hl-Title\" align=\"left\"><th>mark</th><th>line</th><th>col</th><th>file</th></tr>"; "<table><tr class=\"hl-Title\" align=\"left\"><th>mark</th><th>line</th><th>col</th><th>file</th></tr>";
for (var i = 0; i < marks.length; i++) for (let i = 0; i < marks.length; i++)
{ {
list += "<tr>" + list += "<tr>" +
"<td> " + marks[i][0] + "</td>" + "<td> " + marks[i][0] + "</td>" +

30
content/commands.js
View File

@@ -44,7 +44,7 @@ liberator.Command = function (specs, description, action, extraInfo) //{{{
var shortNames = []; var shortNames = [];
var longNames = []; var longNames = [];
var names = []; var names = [];
for (var i = 0; i < specs.length; i++) for (let i = 0; i < specs.length; i++)
{ {
var match; var match;
if (match = specs[i].match(/(\w+|!)\[(\w+)\]/)) if (match = specs[i].match(/(\w+|!)\[(\w+)\]/))
@@ -114,7 +114,7 @@ liberator.Command.prototype = {
return false; 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 if (this.specs[i] == name) // literal command name
{ {
@@ -142,7 +142,7 @@ liberator.Commands = function () //{{{
function getMatchingUserCommands(name) function getMatchingUserCommands(name)
{ {
var matches = []; var matches = [];
for (var i = 0; i < exCommands.length; i++) for (let i = 0; i < exCommands.length; i++)
{ {
if (exCommands[i].isUserCommand) if (exCommands[i].isUserCommand)
{ {
@@ -186,7 +186,7 @@ liberator.Commands = function () //{{{
__iterator__: function () __iterator__: function ()
{ {
var sorted = exCommands.sort(function (cmd1, cmd2) { return cmd1.name > cmd2.name; }); 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]; yield sorted[i];
}, },
@@ -196,7 +196,7 @@ liberator.Commands = function () //{{{
if (!command) if (!command)
return false; return false;
for (var i = 0; i < exCommands.length; i++) for (let i = 0; i < exCommands.length; i++)
{ {
if (exCommands[i].name == command.name) if (exCommands[i].name == command.name)
{ {
@@ -220,7 +220,7 @@ liberator.Commands = function () //{{{
if (!command) if (!command)
return false; return false;
for (var i = 0; i < exCommands.length; i++) for (let i = 0; i < exCommands.length; i++)
{ {
if (exCommands[i].name == command.name) if (exCommands[i].name == command.name)
{ {
@@ -242,7 +242,7 @@ liberator.Commands = function () //{{{
get: function (name) get: function (name)
{ {
for (var i = 0; i < exCommands.length; i++) for (let i = 0; i < exCommands.length; i++)
{ {
if (exCommands[i].hasName(name)) if (exCommands[i].hasName(name))
return exCommands[i]; return exCommands[i];
@@ -253,7 +253,7 @@ liberator.Commands = function () //{{{
getUserCommand: function (name) 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)) if (exCommands[i].isUserCommand && exCommands[i].hasName(name))
return exCommands[i]; return exCommands[i];
@@ -266,7 +266,7 @@ liberator.Commands = function () //{{{
{ {
var userCommands = []; var userCommands = [];
for (var i = 0; i < exCommands.length; i++) for (let i = 0; i < exCommands.length; i++)
{ {
if (exCommands[i].isUserCommand) if (exCommands[i].isUserCommand)
userCommands.push(exCommands[i]); userCommands.push(exCommands[i]);
@@ -309,7 +309,7 @@ liberator.Commands = function () //{{{
var arg = ""; var arg = "";
outer: outer:
for (var i = 0; i < str.length; i++) for (let i = 0; i < str.length; i++)
{ {
switch (str[i]) switch (str[i])
{ {
@@ -436,9 +436,9 @@ liberator.Commands = function () //{{{
var optname = ""; var optname = "";
if (!onlyArgumentsRemaining) 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]; optname = options[opt][0][name];
if (sub.indexOf(optname) == 0) if (sub.indexOf(optname) == 0)
@@ -640,7 +640,7 @@ liberator.Commands = function () //{{{
removeUserCommand: function (name) 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)) if (exCommands[i].isUserCommand && exCommands[i].hasName(name))
{ {
@@ -695,7 +695,7 @@ liberator.Commands = function () //{{{
{ {
var str = ":" + liberator.util.escapeHTML(liberator.commandline.getCommand()) + "<br/>" + var str = ":" + liberator.util.escapeHTML(liberator.commandline.getCommand()) + "<br/>" +
"<table><tr class=\"hl-Title\" align=\"left\"><th>Name</th><th>Args</th><th>Definition</th></tr>"; "<table><tr class=\"hl-Title\" align=\"left\"><th>Name</th><th>Args</th><th>Definition</th></tr>";
for (var i = 0; i < cmdlist.length; i++) for (let i = 0; i < cmdlist.length; i++)
{ {
// programmatically added user commands have a null replacementText // programmatically added user commands have a null replacementText
str += "<tr><td>" + cmdlist[i].name + "</td><td>" + "*" + "</td><td>" + liberator.util.escapeHTML(cmdlist[i].replacementText || "function () { ... }") + "</td></tr>"; str += "<tr><td>" + cmdlist[i].name + "</td><td>" + "*" + "</td><td>" + liberator.util.escapeHTML(cmdlist[i].replacementText || "function () { ... }") + "</td></tr>";
@@ -737,7 +737,7 @@ liberator.Commands = function () //{{{
var name = args.arguments[0]; var name = args.arguments[0];
var cmdlist = liberator.commands.getUserCommands(); 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) if (cmdlist[i].name == name)
{ {

34
content/completion.js
View File

@@ -51,10 +51,10 @@ liberator.Completion = function () //{{{
if (liberator.options["wildmode"].indexOf("longest") >= 0) if (liberator.options["wildmode"].indexOf("longest") >= 0)
longest = true; 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]]; 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]; var item = complist[j];
if (ignorecase) if (ignorecase)
@@ -71,9 +71,9 @@ liberator.Completion = function () //{{{
{ {
var lastIndex = item.lastIndexOf(filter); var lastIndex = item.lastIndexOf(filter);
var length = item.length; 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)); substrings.push(complist[j].substring(k, l));
} }
} }
@@ -99,10 +99,10 @@ liberator.Completion = function () //{{{
if (liberator.options["wildmode"].indexOf("longest") >= 0) if (liberator.options["wildmode"].indexOf("longest") >= 0)
longest = true; 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]]; 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) if (complist[j].indexOf(filter) != 0)
continue; continue;
@@ -114,7 +114,7 @@ liberator.Completion = function () //{{{
if (substrings.length == 0) if (substrings.length == 0)
{ {
var length = complist[j].length; 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)); substrings.push(complist[j].substring(0, k));
} }
else else
@@ -144,7 +144,7 @@ liberator.Completion = function () //{{{
return ""; return "";
var longest = substrings[0]; 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) if (substrings[i].length > longest.length)
longest = substrings[i]; longest = substrings[i];
@@ -172,7 +172,7 @@ liberator.Completion = function () //{{{
var num = getBrowser().browsers.length; var num = getBrowser().browsers.length;
var title, url; var title, url;
for (var i = 0; i < num; i++) for (let i = 0; i < num; i++)
{ {
try try
{ {
@@ -208,12 +208,12 @@ liberator.Completion = function () //{{{
if (!filter) if (!filter)
{ {
for (var command in liberator.commands) for (let command in liberator.commands)
completions.push([command.name, command.description]); completions.push([command.name, command.description]);
return [0, completions]; return [0, completions];
} }
for (var command in liberator.commands) for (let command in liberator.commands)
completions.push([command.longNames, command.description]); completions.push([command.longNames, command.description]);
return [0, buildLongestStartingSubstring(completions, filter)]; return [0, buildLongestStartingSubstring(completions, filter)];
@@ -312,7 +312,7 @@ liberator.Completion = function () //{{{
var completions = []; var completions = [];
try try
{ {
for (var o = 0; o < objects.length; o++) for (let o = 0; o < objects.length; o++)
{ {
completions = completions.concat(eval( completions = completions.concat(eval(
"var comp = [];" + "var comp = [];" +
@@ -443,7 +443,7 @@ liberator.Completion = function () //{{{
var autoCompletions = liberator.options["wildoptions"].indexOf("auto") >= 0; var autoCompletions = liberator.options["wildoptions"].indexOf("auto") >= 0;
var suggestEngineAlias = liberator.options["suggestengines"] || "google"; var suggestEngineAlias = liberator.options["suggestengines"] || "google";
// join all completion arrays together // 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") if (cpt[i] == "s")
completions = completions.concat(this.search(filter)[1]); completions = completions.concat(this.search(filter)[1]);
@@ -470,7 +470,7 @@ liberator.Completion = function () //{{{
//if (result.searchResult == result.RESULT_SUCCESS) //if (result.searchResult == result.RESULT_SUCCESS)
// urlResultsCache = result; // 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)]); comp.push([result.getValueAt(i), result.getCommentAt(i)]);
} }
@@ -497,7 +497,7 @@ liberator.Completion = function () //{{{
// TODO: add appropriate getters to l.mappings // TODO: add appropriate getters to l.mappings
var mappings = []; var mappings = [];
for (var map in liberator.mappings.getUserIterator(modes)) for (let map in liberator.mappings.getUserIterator(modes))
mappings.push([map.names[0], ""]); mappings.push([map.names[0], ""]);
return [0, this.filter(mappings, filter)]; return [0, this.filter(mappings, filter)];
@@ -571,9 +571,9 @@ liberator.Completion = function () //{{{
var urlLength = url.length; var urlLength = url.length;
if (lastIndex >= 0 && lastIndex < urlLength) // do not build substrings, if we don't match filter 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)); substrings.push(url.substring(k, l));
} }
} }

28
content/editor.js
View File

@@ -522,7 +522,7 @@ liberator.Editor = function () //{{{
{ {
var line = 1; var line = 1;
var text = editor().value; var text = editor().value;
for (var i = 0; i < editor().selectionStart; i++) for (let i = 0; i < editor().selectionStart; i++)
if (text[i] == "\n") if (text[i] == "\n")
line++; line++;
return line; return line;
@@ -532,7 +532,7 @@ liberator.Editor = function () //{{{
{ {
var col = 1; var col = 1;
var text = editor().value; var text = editor().value;
for (var i = 0; i < editor().selectionStart; i++) for (let i = 0; i < editor().selectionStart; i++)
{ {
col++; col++;
if (text[i] == "\n") if (text[i] == "\n")
@@ -742,7 +742,7 @@ liberator.Editor = function () //{{{
if (!typeof count == "number" || count < 1) if (!typeof count == "number" || count < 1)
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") if (text[i] == "\n")
break; break;
@@ -769,7 +769,7 @@ liberator.Editor = function () //{{{
if (!typeof count == "number" || count < 1) if (!typeof count == "number" || count < 1)
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") if (text[i] == "\n")
break; break;
@@ -900,9 +900,9 @@ liberator.Editor = function () //{{{
__iterator__: function () __iterator__: function ()
{ {
var tmpCmd; 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"; tmpCmd = (abbrev[lhs][i][0] == "!") ? "abbreviate" : abbrev[lhs][i][0] + "abbrev";
yield (tmpCmd + " " + lhs + " " + abbrev[lhs][i][1] + "\n"); yield (tmpCmd + " " + lhs + " " + abbrev[lhs][i][1] + "\n");
@@ -918,7 +918,7 @@ liberator.Editor = function () //{{{
{ {
if (abbrev[lhs]) 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) if (abbrev[lhs][i][0] == filter)
liberator.echo(abbrev[lhs][i][0] + " " + lhs + " " + abbrev[lhs][i][1]); liberator.echo(abbrev[lhs][i][0] + " " + lhs + " " + abbrev[lhs][i][1]);
@@ -933,9 +933,9 @@ liberator.Editor = function () //{{{
var flagFound = false; var flagFound = false;
var searchFilter = (filter == "!") ? "!ci" : filter + "!"; // ! -> list all, on c or i ! matches too) var searchFilter = (filter == "!") ? "!ci" : filter + "!"; // ! -> list all, on c or i ! matches too)
var list = "<table>"; var list = "<table>";
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) if (searchFilter.indexOf(abbrev[tmplhs][i][0]) > -1)
{ {
@@ -1003,7 +1003,7 @@ liberator.Editor = function () //{{{
return; 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) if (abbrev[lhs][i][1] == rhs)
{ {
@@ -1097,9 +1097,9 @@ liberator.Editor = function () //{{{
} }
else 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) if (abbrev[lhs][i][0] == "!" || abbrev[lhs][i][0] == filter)
this.removeAbbreviation(filter, lhs); this.removeAbbreviation(filter, lhs);
@@ -1118,9 +1118,9 @@ liberator.Editor = function () //{{{
if (!foundWord) if (!foundWord)
return true; 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] == "!")) if (lhs == foundWord && (abbrev[lhs][i][0] == filter || abbrev[lhs][i][0] == "!"))
{ {

32
content/events.js
View File

@@ -36,8 +36,8 @@ liberator.AutoCommands = function () //{{{
function autoCommandsIterator() function autoCommandsIterator()
{ {
for (var item in autoCommands) for (let item in autoCommands)
for (var i = 0; i < autoCommands[item].length; i++) for (let i = 0; i < autoCommands[item].length; i++)
yield item + " " + autoCommands[item][i][0] + " " + autoCommands[item][i][1]; yield item + " " + autoCommands[item][i][0] + " " + autoCommands[item][i][1];
} }
@@ -122,15 +122,15 @@ liberator.AutoCommands = function () //{{{
add: function (auEvent, regex, cmds) add: function (auEvent, regex, cmds)
{ {
var eventsIter = auEvent.split(","); var eventsIter = auEvent.split(",");
for (var i = 0; i < eventsIter.length; i++) for (let i = 0; i < eventsIter.length; i++)
{ {
if (!autoCommands[eventsIter[i]]) if (!autoCommands[eventsIter[i]])
autoCommands[eventsIter[i]] = []; autoCommands[eventsIter[i]] = [];
var flag = true; 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; flag = false;
break; break;
@@ -149,7 +149,7 @@ liberator.AutoCommands = function () //{{{
} }
else if (!regex) // remove all on this auEvent else if (!regex) // remove all on this auEvent
{ {
for (var item in autoCommands) for (let item in autoCommands)
{ {
if (item == auEvent) if (item == auEvent)
delete autoCommands[item]; delete autoCommands[item];
@@ -157,7 +157,7 @@ liberator.AutoCommands = function () //{{{
} }
else if (!auEvent) // delete all matches to this regex else if (!auEvent) // delete all matches to this regex
{ {
for (var item in autoCommands) for (let item in autoCommands)
{ {
var i = 0; var i = 0;
while (i < autoCommands[item].length) while (i < autoCommands[item].length)
@@ -174,11 +174,11 @@ liberator.AutoCommands = function () //{{{
} }
else // delete matching `auEvent && regex' items else // delete matching `auEvent && regex' items
{ {
for (var item in autoCommands) for (let item in autoCommands)
{ {
if (item == auEvent) 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]) if (regex == autoCommands[item][i][0])
autoCommands[item].splice(i, 1); // remove array autoCommands[item].splice(i, 1); // remove array
@@ -194,12 +194,12 @@ liberator.AutoCommands = function () //{{{
var list = ":" + liberator.util.escapeHTML(liberator.commandline.getCommand()) + "<br/>" + var list = ":" + liberator.util.escapeHTML(liberator.commandline.getCommand()) + "<br/>" +
"<table><tr><td class=\"hl-Title\" colspan=\"2\">---- Auto-Commands ----</td></tr>"; "<table><tr><td class=\"hl-Title\" colspan=\"2\">---- Auto-Commands ----</td></tr>";
for (var item in autoCommands) for (let item in autoCommands)
{ {
flag = true; flag = true;
if (!auEvent || item == auEvent) // filter event 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 if (!regex || regex == autoCommands[item][i][0]) // filter regex
{ {
@@ -234,7 +234,7 @@ liberator.AutoCommands = function () //{{{
if (autoCommands[auEvent]) 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)) if (autoCommands[auEvent][i][2].test(url))
liberator.execute(autoCommands[auEvent][i][1]); liberator.execute(autoCommands[auEvent][i][1]);
@@ -503,7 +503,7 @@ liberator.Events = function () //{{{
var ms = 25000; // maximum time to wait - TODO: add option var ms = 25000; // maximum time to wait - TODO: add option
var then = new Date().getTime(); 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); mainThread.processNextEvent(true);
if ((now - then) % 1000 < 10) if ((now - then) % 1000 < 10)
@@ -541,7 +541,7 @@ liberator.Events = function () //{{{
try try
{ {
var files = liberator.io.readDirectory(liberator.io.getSpecialDirectory("macros")); 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]; var file = files[i];
if (!file.exists() || file.isDirectory() || if (!file.exists() || file.isDirectory() ||
@@ -632,7 +632,7 @@ liberator.Events = function () //{{{
{ {
var str = "<table>"; var str = "<table>";
var macroRef = liberator.events.getMacros(args); var macroRef = liberator.events.getMacros(args);
for (var [macro, keys] in macroRef) for (let [macro, keys] in macroRef)
str += "<tr><td> " + macro + " &nbsp; </td><td>" + str += "<tr><td> " + macro + " &nbsp; </td><td>" +
liberator.util.escapeHTML(keys) + "</td></tr>"; liberator.util.escapeHTML(keys) + "</td></tr>";
@@ -769,7 +769,7 @@ liberator.Events = function () //{{{
{ {
var re = new RegExp(filter); var re = new RegExp(filter);
for (var [item,] in macros) for (let [item,] in macros)
{ {
if (re.test(item)) if (re.test(item))
macros.remove(item); macros.remove(item);

22
content/hints.js
View File

@@ -137,7 +137,7 @@ liberator.Hints = function () //{{{
docs.push({ doc: doc, start: start, end: hints.length - 1 }); docs.push({ doc: doc, start: start, end: hints.length - 1 });
// also generate hints for frames // 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]); generate(win.frames[i]);
return true; return true;
@@ -168,7 +168,7 @@ liberator.Hints = function () //{{{
var activeHint = hintNumber || 1; var activeHint = hintNumber || 1;
validHints = []; validHints = [];
for (var j = 0; j < docs.length; j++) for (let j = 0; j < docs.length; j++)
{ {
var doc = docs[j].doc; var doc = docs[j].doc;
var start = docs[j].start; var start = docs[j].start;
@@ -177,7 +177,7 @@ liberator.Hints = function () //{{{
var scrollY = doc.defaultView.scrollY; var scrollY = doc.defaultView.scrollY;
inner: inner:
for (var i = start; i <= end; i++) for (let i = start; i <= end; i++)
{ {
elem = hints[i][0]; elem = hints[i][0];
text = hints[i][1]; text = hints[i][1];
@@ -238,13 +238,13 @@ liberator.Hints = function () //{{{
var firstElemBgColor = ""; var firstElemBgColor = "";
var firstElemColor = ""; var firstElemColor = "";
for (var j = 0; j < docs.length; j++) for (let j = 0; j < docs.length; j++)
{ {
var doc = docs[j].doc; var doc = docs[j].doc;
var start = docs[j].start; var start = docs[j].start;
var end = docs[j].end; 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 // remove the span for the numeric display part
doc.body.removeChild(hints[i][2]); doc.body.removeChild(hints[i][2]);
@@ -386,7 +386,7 @@ liberator.Hints = function () //{{{
function contains(textOfLink) 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) if (textOfLink.indexOf(tokens[i]) < 0)
return false; return false;
@@ -407,7 +407,7 @@ liberator.Hints = function () //{{{
{ {
var charIdx = 0; var charIdx = 0;
var numMatchedWords = 0; var numMatchedWords = 0;
for (var wIdx = 0; wIdx < words.length; wIdx++) for (let wIdx = 0; wIdx < words.length; wIdx++)
{ {
var word = words[wIdx]; var word = words[wIdx];
if (word.length == 0) if (word.length == 0)
@@ -419,7 +419,7 @@ liberator.Hints = function () //{{{
if (charIdx > numMatchedWords) if (charIdx > numMatchedWords)
{ {
var matchingStarted = false; var matchingStarted = false;
for (var i = numMatchedWords; i < charIdx; i++) for (let i = numMatchedWords; i < charIdx; i++)
{ {
if (chars[i] == word[wcIdx]) if (chars[i] == word[wcIdx])
{ {
@@ -450,7 +450,7 @@ liberator.Hints = function () //{{{
// if yes, then consume them // if yes, then consume them
if (prevCharIdx == charIdx) 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]) if (word[i] != chars[charIdx])
break; break;
@@ -464,7 +464,7 @@ liberator.Hints = function () //{{{
else else
{ {
var prevCharIdx = charIdx; 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]) if (word[i] != chars[charIdx])
break; break;
@@ -489,7 +489,7 @@ liberator.Hints = function () //{{{
function stringsAtBeginningOfWords(strings, words, allowWordOverleaping) function stringsAtBeginningOfWords(strings, words, allowWordOverleaping)
{ {
var strIdx = 0; var strIdx = 0;
for (var wIdx = 0; wIdx < words.length; wIdx++) for (let wIdx = 0; wIdx < words.length; wIdx++)
{ {
var word = words[wIdx]; var word = words[wIdx];
if (word.length == 0) if (word.length == 0)

18
content/io.js
View File

@@ -213,15 +213,15 @@ liberator.IO = function () //{{{
var modes = [[[liberator.modes.NORMAL], ""], [[liberator.modes.COMMAND_LINE], "c"], var modes = [[[liberator.modes.NORMAL], ""], [[liberator.modes.COMMAND_LINE], "c"],
[[liberator.modes.INSERT, liberator.modes.TEXTAREA], "i"]]; [[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 // 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 += modes[i][1] + (map.noremap ? "nore" : "") + "map " + map.names[0] + " " + map.rhs + "\n";
} }
line += "\n\" Options\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: options should be queried for this info
// TODO: string/list options might need escaping in future // 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 // :mkvimrc doesn't save autocommands, so we don't either - remove this code at some point
// line += "\n\" Auto-Commands\n"; // line += "\n\" Auto-Commands\n";
// for (var item in liberator.autocommands) // for (let item in liberator.autocommands)
// line += "autocmd " + item + "\n"; // line += "autocmd " + item + "\n";
line += "\n\" Abbreviations\n"; line += "\n\" Abbreviations\n";
for (var abbrCmd in liberator.editor.abbreviations) for (let abbrCmd in liberator.editor.abbreviations)
line += abbrCmd; line += abbrCmd;
// if (liberator.mappings.getMapLeader() != "\\") // if (liberator.mappings.getMapLeader() != "\\")
@@ -259,7 +259,7 @@ liberator.IO = function () //{{{
{ {
var list = "<table>"; var list = "<table>";
for (var i = 0; i < scriptNames.length; i++) for (let i = 0; i < scriptNames.length; i++)
list += "<tr><td style=\"text-align: right\">" + (i + 1) + ".</td><td>" + scriptNames[i] + "</td></tr>"; list += "<tr><td style=\"text-align: right\">" + (i + 1) + ".</td><td>" + scriptNames[i] + "</td></tr>";
list += "</table>"; list += "</table>";
@@ -354,7 +354,7 @@ liberator.IO = function () //{{{
{ {
var expansion; var expansion;
for (var i = 0; i < envVars.length; i++) for (let i = 0; i < envVars.length; i++)
{ {
expansion = environmentService.get(envVars[i].replace("$", "")); expansion = environmentService.get(envVars[i].replace("$", ""));
if (expansion) if (expansion)
@@ -371,7 +371,7 @@ liberator.IO = function () //{{{
.createInstance(Components.interfaces.nsILocalFile); .createInstance(Components.interfaces.nsILocalFile);
var dirs = [cwd, "$PWD", "~"]; var dirs = [cwd, "$PWD", "~"];
for (var i = 0; i < dirs.length; i++) for (let i = 0; i < dirs.length; i++)
{ {
if (!dirs[i]) if (!dirs[i])
continue; continue;
@@ -603,7 +603,7 @@ liberator.IO = function () //{{{
{ {
var dirs = environmentService.get("PATH").split(WINDOWS ? ";" : ":"); var dirs = environmentService.get("PATH").split(WINDOWS ? ";" : ":");
lookup: lookup:
for (var i = 0; i < dirs.length; i++) for (let i = 0; i < dirs.length; i++)
{ {
var path = dirs[i] + (WINDOWS ? "\\" : "/") + program; var path = dirs[i] + (WINDOWS ? "\\" : "/") + program;
try try

14
content/liberator.js
View File

@@ -189,7 +189,7 @@ const liberator = (function () //{{{
var menubar = document.getElementById(liberator.config.guioptions["m"]); var menubar = document.getElementById(liberator.config.guioptions["m"]);
var items = []; var items = [];
for (var i = 0; i < menubar.childNodes.length; i++) for (let i = 0; i < menubar.childNodes.length; i++)
{ {
(function (item, path) (function (item, path)
{ {
@@ -204,7 +204,7 @@ const liberator = (function () //{{{
if (item.localName == "menu") if (item.localName == "menu")
path += item.label + "."; 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); arguments.callee(item.childNodes[j], path);
} }
})(menubar.childNodes[i], ""); })(menubar.childNodes[i], "");
@@ -226,7 +226,7 @@ const liberator = (function () //{{{
return; return;
} }
for (var i = 0; i < items.length; i++) for (let i = 0; i < items.length; i++)
{ {
if (items[i].fullMenuPath == item) if (items[i].fullMenuPath == item)
items[i].doCommand(); items[i].doCommand();
@@ -516,7 +516,7 @@ const liberator = (function () //{{{
var files = liberator.config.helpFiles || []; var files = liberator.config.helpFiles || [];
var res = []; var res = [];
for (var i = 0; i < files.length; i++) for (let i = 0; i < files.length; i++)
{ {
try try
{ {
@@ -531,7 +531,7 @@ const liberator = (function () //{{{
} }
var doc = xmlhttp.responseXML; var doc = xmlhttp.responseXML;
var elems = doc.getElementsByClassName("tag"); 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]]); res.push([elems[j].textContent, files[i]]);
} }
@@ -830,7 +830,7 @@ const liberator = (function () //{{{
var [, items] = getHelpCompletions(topic); var [, items] = getHelpCompletions(topic);
var partialMatch = -1; var partialMatch = -1;
for (var i = 0; i < items.length; i++) for (let i = 0; i < items.length; i++)
{ {
if (items[i][0] == topic) if (items[i][0] == topic)
{ {
@@ -946,7 +946,7 @@ const liberator = (function () //{{{
return true; return true;
// all other URLs are always loaded in background // 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]; url = typeof urls[i] == "string" ? urls[i] : urls[i][0];
postdata = typeof urls[i] == "string" ? null : urls[i][1]; postdata = typeof urls[i] == "string" ? null : urls[i][1];

8
content/mail.js
View File

@@ -60,7 +60,7 @@ liberator.Mail = function () //{{{
var indices = []; var indices = [];
if (selectMessageKeys.length > 0) 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.push([gDBView.findIndexFromKey(selectMessageKeys[j], true), selectMessageKeys[j]]);
indices.sort(); indices.sort();
@@ -861,7 +861,7 @@ liberator.Mail = function () //{{{
: this.getFolders("", true, false); : this.getFolders("", true, false);
var unreadCount = 0, totalCount = 0, newCount = 0; 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]; var account = accounts[i];
unreadCount += account.getNumUnread(true); // true == deep (includes subfolders) unreadCount += account.getNumUnread(true); // true == deep (includes subfolders)
@@ -935,7 +935,7 @@ liberator.Mail = function () //{{{
// first try to find in current folder // first try to find in current folder
if (gDBView) 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 >= 0) : (i < gDBView.rowCount);
reverse ? i-- : i++) reverse ? i-- : i++)
{ {
@@ -987,7 +987,7 @@ liberator.Mail = function () //{{{
var folders = this.getFolders("", true, true); var folders = this.getFolders("", true, true);
var ci = GetFolderTree().currentIndex; 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; let index = (i + ci) % folders.length;
if (reverse) if (reverse)

42
content/mappings.js
View File

@@ -79,7 +79,7 @@ liberator.Mappings = function () //{{{
var main = []; // default mappings var main = []; // default mappings
var user = []; // user created mappings var user = []; // user created mappings
for (var mode in liberator.modes) for (let mode in liberator.modes)
{ {
main[mode] = []; main[mode] = [];
user[mode] = []; user[mode] = [];
@@ -95,7 +95,7 @@ liberator.Mappings = function () //{{{
{ {
var maps = stack[mode]; 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)) if (maps[i].hasName(cmd))
return maps[i]; return maps[i];
@@ -109,10 +109,10 @@ liberator.Mappings = function () //{{{
var maps = user[mode]; var maps = user[mode];
var names; var names;
for (var i = 0; i < maps.length; i++) for (let i = 0; i < maps.length; i++)
{ {
names = maps[i].names; names = maps[i].names;
for (var j = 0; j < names.length; j++) for (let j = 0; j < names.length; j++)
{ {
if (names[j] == cmd) if (names[j] == cmd)
{ {
@@ -139,17 +139,17 @@ liberator.Mappings = function () //{{{
var output; var output;
var maps = stack[modes[0]]; var maps = stack[modes[0]];
for (var i = 0; i < maps.length; i++) for (let i = 0; i < maps.length; i++)
{ {
output = true; 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 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]. // 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. // 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; output = true;
break; // found on this mode - check next mode, if there is one, where it could still fail... 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 else
{ {
for (var index = 0; index < mode.length; index++) for (let index = 0; index < mode.length; index++)
{ {
liberator.mappings.addUserMap([mode[index]], [lhs], liberator.mappings.addUserMap([mode[index]], [lhs],
"User defined mapping", "User defined mapping",
@@ -300,9 +300,9 @@ liberator.Mappings = function () //{{{
var map = new liberator.Map(modes, keys, description || "User defined mapping", action, extra); var map = new liberator.Map(modes, keys, description || "User defined mapping", action, extra);
// remove all old mappings to this key sequence // 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]); removeMap(map.modes[j], map.names[i]);
} }
@@ -327,10 +327,10 @@ liberator.Mappings = function () //{{{
var mappings = user[mode].concat(main[mode]); var mappings = user[mode].concat(main[mode]);
var matches = []; var matches = [];
for (var i = 0; i < mappings.length; i++) for (let i = 0; i < mappings.length; i++)
{ {
var map = mappings[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) if (map.names[j].indexOf(cmd) == 0 && map.names[j].length > cmd.length)
{ {
@@ -378,7 +378,7 @@ liberator.Mappings = function () //{{{
return; 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); output.push(true);
if (filter && maps[i].names[0] != filter) // does it match the filter first of all? 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; output[output.length - 1] = false;
continue; 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 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]. // 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. // 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; output[output.length - 1] = true;
break; // found on this mode - ok, check next mode... break; // found on this mode - ok, check next mode...
@@ -405,7 +405,7 @@ liberator.Mappings = function () //{{{
// anything found? // anything found?
var flag = false; var flag = false;
for (var i = 0; i < output.length; i++) for (let i = 0; i < output.length; i++)
if (output[i]) if (output[i])
flag = true; flag = true;
@@ -416,7 +416,7 @@ liberator.Mappings = function () //{{{
} }
var modeSign = ""; var modeSign = "";
for (var i = 0; i < modes.length; i++) for (let i = 0; i < modes.length; i++)
{ {
if (modes[i] == liberator.modes.NORMAL) if (modes[i] == liberator.modes.NORMAL)
modeSign += "n"; modeSign += "n";
@@ -429,11 +429,11 @@ liberator.Mappings = function () //{{{
} }
var list = "<table>"; var list = "<table>";
for (i = 0; i < maps.length; i++) for (let i = 0; i < maps.length; i++)
{ {
if (!output[i]) if (!output[i])
continue; continue;
for (var j = 0; j < maps[i].names.length; j++) for (let j = 0; j < maps[i].names.length; j++)
{ {
list += "<tr>"; list += "<tr>";
list += "<td> " + modeSign + " " + liberator.util.escapeHTML(maps[i].names[j]) + "</td>"; list += "<td> " + modeSign + " " + liberator.util.escapeHTML(maps[i].names[j]) + "</td>";

2
content/modes.js
View File

@@ -187,7 +187,7 @@ liberator.modes = (function () //{{{
{ {
var modes = this.all; var modes = this.all;
for (var i = 0; i < modes.length; i++) for (let i = 0; i < modes.length; i++)
yield modes[i]; yield modes[i];
}, },

28
content/options.js
View File

@@ -61,7 +61,7 @@ liberator.Option = function (names, description, type, defaultValue, extraInfo)
if (this.type == "boolean") if (this.type == "boolean")
{ {
this.names = []; // reset since order is important 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(names[i]);
this.names.push("no" + names[i]); this.names.push("no" + names[i]);
@@ -269,7 +269,7 @@ liberator.Options = function () //{{{
if (!args) if (!args)
{ {
var str = ""; var str = "";
for (var i in liberator.globalVariables) for (let i in liberator.globalVariables)
{ {
var value = liberator.globalVariables[i]; var value = liberator.globalVariables[i];
if (typeof value == "number") if (typeof value == "number")
@@ -669,7 +669,7 @@ liberator.Options = function () //{{{
if (filter.length > 0 && filter.lastIndexOf("=") == filter.length - 1) 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]; var name = prefArray[i];
if (name.match("^" + filter.substr(0, filter.length - 1) + "$" )) if (name.match("^" + filter.substr(0, filter.length - 1) + "$" ))
@@ -681,7 +681,7 @@ liberator.Options = function () //{{{
return [0, []]; 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])]); optionCompletions.push([prefArray[i], liberator.options.getPref(prefArray[i])]);
return [0, liberator.completion.filter(optionCompletions, filter)]; return [0, liberator.completion.filter(optionCompletions, filter)];
@@ -695,7 +695,7 @@ liberator.Options = function () //{{{
{ {
var options = []; var options = [];
for (var option in liberator.options) for (let option in liberator.options)
{ {
if (!(option.scope & scope)) if (!(option.scope & scope))
continue; continue;
@@ -709,7 +709,7 @@ liberator.Options = function () //{{{
else if (filter.length > 0 && filter.lastIndexOf("=") == filter.length - 1) else if (filter.length > 0 && filter.lastIndexOf("=") == filter.length - 1)
{ {
filter = filter.substr(0, 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)) if (!(option.scope & scope))
continue; continue;
@@ -724,14 +724,14 @@ liberator.Options = function () //{{{
} }
var filterLength = filter.length; var filterLength = filter.length;
for (var option in liberator.options) for (let option in liberator.options)
{ {
if (!(option.scope & scope)) if (!(option.scope & scope))
continue; continue;
if (prefix && option.type != "boolean") if (prefix && option.type != "boolean")
continue; 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) if (option.names[j].indexOf(filter) != 0)
continue; continue;
@@ -753,8 +753,8 @@ liberator.Options = function () //{{{
//if (typeof names == "string") names = [names]; //if (typeof names == "string") names = [names];
//var length = names.length; //var length = names.length;
//for (var i = 0, name = names[i]; i < length; name = names[++i]) //for (let i = 0, name = names[i]; i < length; name = names[++i])
for (var i = 0; i < args.arguments.length; i++) for (let i = 0; i < args.arguments.length; i++)
{ {
var name = args.arguments[i]; var name = args.arguments[i];
var reference = liberator.variableReference(name); var reference = liberator.variableReference(name);
@@ -782,7 +782,7 @@ liberator.Options = function () //{{{
__iterator__: function () __iterator__: function ()
{ {
for (var i = 0; i < options.length; i++) for (let i = 0; i < options.length; i++)
yield options[i]; yield options[i];
}, },
@@ -796,7 +796,7 @@ liberator.Options = function () //{{{
if (!option) if (!option)
return false; return false;
for (var opt in Iterator(this)) for (let opt in Iterator(this))
{ {
if (opt.name == option.name) if (opt.name == option.name)
{ {
@@ -829,7 +829,7 @@ liberator.Options = function () //{{{
if (!scope) if (!scope)
scope = liberator.options.OPTION_SCOPE_BOTH; 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)) if (options[i].hasName(name) && (options[i].scope & scope))
return options[i]; return options[i];
@@ -847,7 +847,7 @@ liberator.Options = function () //{{{
if (!scope) if (!scope)
scope = liberator.options.OPTION_SCOPE_BOTH; scope = liberator.options.OPTION_SCOPE_BOTH;
for (var opt in Iterator(this)) for (let opt in Iterator(this))
{ {
name = opt.name; name = opt.name;
value = opt.value; value = opt.value;

20
content/tabs.js
View File

@@ -548,7 +548,7 @@ liberator.Tabs = function () //{{{
if (count < 1) if (count < 1)
count = 1; count = 1;
for (var i = 0; i < count; i++) for (let i = 0; i < count; i++)
liberator.tabs.cloneTab(tab, activate); liberator.tabs.cloneTab(tab, activate);
}, },
{ argCount: "0" }); { argCount: "0" });
@@ -569,7 +569,7 @@ liberator.Tabs = function () //{{{
var ss = Components.classes["@mozilla.org/browser/sessionstore;1"] var ss = Components.classes["@mozilla.org/browser/sessionstore;1"]
.getService(Components.interfaces.nsISessionStore); .getService(Components.interfaces.nsISessionStore);
var undoItems = eval("(" + ss.getClosedTabData(window) + ")"); 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) if (undoItems[i].state.entries[0].url == args)
{ {
@@ -588,7 +588,7 @@ liberator.Tabs = function () //{{{
.getService(Components.interfaces.nsISessionStore); .getService(Components.interfaces.nsISessionStore);
var undoItems = eval("(" + ss.getClosedTabData(window) + ")"); var undoItems = eval("(" + ss.getClosedTabData(window) + ")");
var completions = []; 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 url = undoItems[i].state.entries[0].url;
var title = undoItems[i].title; var title = undoItems[i].title;
@@ -617,7 +617,7 @@ liberator.Tabs = function () //{{{
var ss = Components.classes["@mozilla.org/browser/sessionstore;1"] var ss = Components.classes["@mozilla.org/browser/sessionstore;1"]
.getService(Components.interfaces.nsISessionStore); .getService(Components.interfaces.nsISessionStore);
var undoItems = eval("(" + ss.getClosedTabData(window) + ")"); 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 undoCloseTab(); // doesn't work with i as the index to undoCloseTab
}, },
{ argCount: "0" }); { argCount: "0" });
@@ -665,7 +665,7 @@ liberator.Tabs = function () //{{{
if (tab) if (tab)
{ {
var length = getBrowser().mTabs.length; var length = getBrowser().mTabs.length;
for (var i = 0; i < length; i++) for (let i = 0; i < length; i++)
{ {
if (getBrowser().mTabs[i] == tab) if (getBrowser().mTabs[i] == tab)
return i; return i;
@@ -682,7 +682,7 @@ liberator.Tabs = function () //{{{
{ {
var buffers = []; var buffers = [];
var browsers = getBrowser().browsers; 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 title = browsers[i].contentTitle || "(Untitled)";
var uri = browsers[i].currentURI.spec; var uri = browsers[i].currentURI.spec;
@@ -708,7 +708,7 @@ liberator.Tabs = function () //{{{
var number, indicator, title, url; var number, indicator, title, url;
var list = ":" + (liberator.util.escapeHTML(liberator.commandline.getCommand()) || "buffers") + "<br/>" + "<table>"; var list = ":" + (liberator.util.escapeHTML(liberator.commandline.getCommand()) || "buffers") + "<br/>" + "<table>";
for (var i = 0; i < items.length; i++) for (let i = 0; i < items.length; i++)
{ {
if (i == liberator.tabs.index()) if (i == liberator.tabs.index())
indicator = " <span style=\"color: blue\">%</span> "; indicator = " <span style=\"color: blue\">%</span> ";
@@ -786,7 +786,7 @@ liberator.Tabs = function () //{{{
if (focusLeftTab) if (focusLeftTab)
{ {
var lastRemovedTab = 0; 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)); removeOrBlankTab(this.getTab(i));
lastRemovedTab = i > 0 ? i : 1; lastRemovedTab = i > 0 ? i : 1;
@@ -839,7 +839,7 @@ liberator.Tabs = function () //{{{
{ {
if (bypassCache) if (bypassCache)
{ {
for (var i = 0; i < getBrowser().mTabs.length; i++) for (let i = 0; i < getBrowser().mTabs.length; i++)
{ {
try try
{ {
@@ -899,7 +899,7 @@ liberator.Tabs = function () //{{{
var matches = []; var matches = [];
var lowerBuffer = buffer.toLowerCase(); var lowerBuffer = buffer.toLowerCase();
var first = liberator.tabs.index() + (reverse ? 0 : 1); 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 index = (i + first) % getBrowser().browsers.length;
var url = getBrowser().getBrowserAtIndex(index).contentDocument.location.href; var url = getBrowser().getBrowserAtIndex(index).contentDocument.location.href;

6
content/ui.js
View File

@@ -1269,7 +1269,7 @@ liberator.ItemList = function (id) //{{{
var tbody = doc.createElement("tbody"); var tbody = doc.createElement("tbody");
table.appendChild(tbody); table.appendChild(tbody);
for (var i = 0; i < completions.length; i++) for (let i = 0; i < completions.length; i++)
{ {
var elem = completions[i]; var elem = completions[i];
if (i >= listOffset && i - listOffset < maxItems) if (i >= listOffset && i - listOffset < maxItems)
@@ -1529,12 +1529,12 @@ liberator.StatusLine = function () //{{{
{ {
progressStr = "["; progressStr = "[";
var done = Math.floor(progress * 20); var done = Math.floor(progress * 20);
for (var i = 0; i < done; i++) for (let i = 0; i < done; i++)
progressStr += "="; progressStr += "=";
progressStr += ">"; progressStr += ">";
for (var i = 19; i > done; i--) for (let i = 19; i > done; i--)
progressStr += " "; progressStr += " ";
progressStr += "]"; progressStr += "]";

8
content/util.js
View File

@@ -129,7 +129,7 @@ liberator.util = { //{{{
strNum[1] += "0"; 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); strNum[0] = strNum[0].substring(0, u) + "," + strNum[0].substring(u, strNum[0].length);
if (unitIndex) // decimalPlaces only when > Bytes if (unitIndex) // decimalPlaces only when > Bytes
@@ -153,7 +153,7 @@ liberator.util = { //{{{
longHelp = true; longHelp = true;
// the tags which are printed on the top right // 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 + "| "; ret += "|" + start + command.names[j] + end + "| ";
if (longHelp) if (longHelp)
@@ -225,7 +225,7 @@ liberator.util = { //{{{
try // window.content often does not want to be queried with "var i in object" 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; var value;
try try
@@ -287,7 +287,7 @@ liberator.util = { //{{{
{ {
var urls = str.split(new RegExp("\s*" + liberator.options["urlseparator"] + "\s*")); 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]); var file = liberator.io.getFile(urls[url]);
if (file.exists() && file.isReadable()) if (file.exists() && file.isReadable())

6
content/vimperator.js
View File

@@ -216,7 +216,7 @@ liberator.config = { //{{{
count = 1; count = 1;
var url = liberator.buffer.URL; var url = liberator.buffer.URL;
for (var i = 0; i < count; i++) for (let i = 0; i < count; i++)
{ {
if (isDirectory(url)) if (isDirectory(url))
url = url.replace(/^(.*?:)(.*?)([^\/]+\/*)$/, "$1$2/"); url = url.replace(/^(.*?:)(.*?)([^\/]+\/*)$/, "$1$2/");
@@ -317,7 +317,7 @@ liberator.config = { //{{{
} }
var menu = document.getElementById("viewSidebarMenu"); 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) if (menu.childNodes[i].label == args.string)
{ {
@@ -334,7 +334,7 @@ liberator.config = { //{{{
var menu = document.getElementById("viewSidebarMenu"); var menu = document.getElementById("viewSidebarMenu");
var nodes = []; 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, ""]); nodes.push([menu.childNodes[i].label, ""]);
return [0, liberator.completion.filter(nodes, filter)]; return [0, liberator.completion.filter(nodes, filter)];