diff options
| author | Jez Ng | 2012-03-28 13:27:42 -0400 | 
|---|---|---|
| committer | Jez Ng | 2012-03-28 13:27:42 -0400 | 
| commit | d15f3abceb2c3ba0006999a194729c1c7cb1a095 (patch) | |
| tree | a45338b9c3c0660d5657a9641bef8e87332af1ae | |
| parent | a26c50d33493782ec6cb19cbec9c12e5e48a0f8f (diff) | |
| download | vimium-d15f3abceb2c3ba0006999a194729c1c7cb1a095.tar.bz2 | |
Style changes.
| -rw-r--r-- | lib/domUtils.js | 4 | ||||
| -rw-r--r-- | linkHints.js | 29 | 
2 files changed, 13 insertions, 20 deletions
diff --git a/lib/domUtils.js b/lib/domUtils.js index c1bdcdde..ee17d45f 100644 --- a/lib/domUtils.js +++ b/lib/domUtils.js @@ -109,9 +109,7 @@ var domUtils = {    flashElement: function(element) {      var oldBorderValue = element.style.border;      element.style.border = '1px solid #66f'; -    setTimeout(function() { -      element.style.border = oldBorderValue; -    }, 400); +    setTimeout(function(){element.style.border = oldBorderValue;}, 400);    },  }; diff --git a/linkHints.js b/linkHints.js index 8f278175..c729b832 100644 --- a/linkHints.js +++ b/linkHints.js @@ -162,15 +162,13 @@ var linkHints = {      if (this.delayMode)        return; -    var that = this; -      if (event.keyCode == keyCodes.shiftKey && this.shouldOpenInNewTab !== null) {        // Toggle whether to open link in a new or current tab.        this.setOpenLinkMode(!this.shouldOpenInNewTab, this.shouldOpenWithQueue, false);        handlerStack.push({          keyup: function(event) {            if (event.keyCode !== keyCodes.shiftKey) return; -          linkHints.setOpenLinkMode(!that.shouldOpenInNewTab, that.shouldOpenWithQueue, false); +          linkHints.setOpenLinkMode(!linkHints.shouldOpenInNewTab, linkHints.shouldOpenWithQueue, false);            handlerStack.pop();          }        }); @@ -200,25 +198,23 @@ var linkHints = {     * When only one link hint remains, this function activates it in the appropriate way.     */    activateLink: function(matchedLink, delay) { -    var that = this;      this.delayMode = true;      if (domUtils.isSelectable(matchedLink)) {        domUtils.simulateSelect(matchedLink); -      this.deactivateMode(delay, function() { that.delayMode = false; }); +      this.deactivateMode(delay, function() { linkHints.delayMode = false; });      } else {        // TODO figure out which other input elements should not receive focus -      if (matchedLink.nodeName.toLowerCase() === 'input' && -          matchedLink.type !== 'button') +      if (matchedLink.nodeName.toLowerCase() === 'input' && matchedLink.type !== 'button')          matchedLink.focus();        domUtils.flashElement(matchedLink);        this.linkActivator(matchedLink);        if (this.shouldOpenWithQueue) {          this.deactivateMode(delay, function() { -          that.delayMode = false; -          that.activateModeWithQueue(); +          linkHints.delayMode = false; +          linkHints.activateModeWithQueue();          });        } else { -        this.deactivateMode(delay, function() { that.delayMode = false; }); +        this.deactivateMode(delay, function() { linkHints.delayMode = false; });        }      }    }, @@ -242,14 +238,13 @@ var linkHints = {     * executes after 'delay' and invokes 'callback' when it is finished.     */    deactivateMode: function(delay, callback) { -    var that = this;      function deactivate() { -      if (that.markerMatcher.deactivate) -        that.markerMatcher.deactivate(); -      if (that.hintMarkerContainingDiv) -        that.hintMarkerContainingDiv.parentNode.removeChild(that.hintMarkerContainingDiv); -      that.hintMarkerContainingDiv = null; -      that.hintMarkers = []; +      if (linkHints.markerMatcher.deactivate) +        linkHints.markerMatcher.deactivate(); +      if (linkHints.hintMarkerContainingDiv) +        linkHints.hintMarkerContainingDiv.parentNode.removeChild(linkHints.hintMarkerContainingDiv); +      linkHints.hintMarkerContainingDiv = null; +      linkHints.hintMarkers = [];        handlerStack.pop();        HUD.hide();      }  | 
