aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorilya2011-02-16 23:37:17 -0800
committerilya2011-02-16 23:37:17 -0800
commit7ea24c1cc144646216c017b43b345c9b56d60370 (patch)
treec806ab5e7c8b1f8b3039fac8a7ad54824e67385b
parentdae2cca50af740eaa95c0924bd64d3127b87e492 (diff)
parente2faa2c815cf74458b4fba0aed3346046d3075ed (diff)
downloadvimium-7ea24c1cc144646216c017b43b345c9b56d60370.tar.bz2
Merge branch 'master' of github.com:philc/vimium
-rw-r--r--linkHints.js14
1 files changed, 7 insertions, 7 deletions
diff --git a/linkHints.js b/linkHints.js
index 58d6e979..45f54a9d 100644
--- a/linkHints.js
+++ b/linkHints.js
@@ -71,7 +71,7 @@ function buildLinkHints() {
// highlight all the links on the page; we don't want some link hints to have more chars than others.
var digitsNeeded = Math.ceil(logXOfBase(visibleElements.length, settings.linkHintCharacters.length));
var linkHintNumber = 0;
- for (var i = 0; i < visibleElements.length; i++) {
+ for (var i = 0, count = visibleElements.length; i < count; i++) {
hintMarkers.push(createMarkerFor(visibleElements[i], linkHintNumber, digitsNeeded));
linkHintNumber++;
}
@@ -104,7 +104,7 @@ function getVisibleClickableElements() {
var visibleElements = [];
// Find all visible clickable elements.
- for (var i = 0; i < resultSet.snapshotLength; i++) {
+ for (var i = 0, count = resultSet.snapshotLength; i < count; i++) {
var element = resultSet.snapshotItem(i);
var clientRect = element.getClientRects()[0];
@@ -114,7 +114,7 @@ function getVisibleClickableElements() {
// If the link has zero dimensions, it may be wrapping visible
// but floated elements. Check for this.
if (clientRect && (clientRect.width == 0 || clientRect.height == 0)) {
- for (var j = 0; j < element.children.length; j++) {
+ for (var j = 0, childrenCount = element.children.length; j < childrenCount; j++) {
if (window.getComputedStyle(element.children[j], null).getPropertyValue('float') != 'none') {
var childClientRect = element.children[j].getClientRects()[0];
if (isVisible(element.children[j], childClientRect)) {
@@ -248,8 +248,9 @@ function highlightLinkMatches(searchString) {
if (linkMarker.getAttribute("hintString").indexOf(searchString) == 0) {
if (linkMarker.style.display == "none")
linkMarker.style.display = "";
- for (var j = 0; j < linkMarker.childNodes.length; j++)
- linkMarker.childNodes[j].className = (j >= searchString.length) ? "" : "matchingCharacter";
+ var childNodes = linkMarker.childNodes;
+ for (var j = 0, childNodesCount = childNodes.length; j < childNodesCount; j++)
+ childNodes[j].className = (j >= searchString.length) ? "" : "matchingCharacter";
linksMatched.push(linkMarker.clickableItem);
} else {
linkMarker.style.display = "none";
@@ -274,8 +275,7 @@ function numberToHintString(number, numHintDigits) {
} while (number > 0);
// Pad the hint string we're returning so that it matches numHintDigits.
- var hintStringLength = hintString.length;
- for (var i = 0; i < numHintDigits - hintStringLength; i++)
+ for (var i = 0; i < numHintDigits - hintString.length; i++)
hintString.unshift(settings.linkHintCharacters[0]);
return hintString.join("");
}