[Pkg-mozext-commits] [adblock-plus-element-hiding-helper] 161/483: Backing out changeset 52d3ba3b5308 (Adding command "lock/unlock selection") - causes focus issues that are hard to resolve

[David Prévot]

This is an automated email from the git hooks/post-receive script.

taffit pushed a commit to branch master
in repository adblock-plus-element-hiding-helper.

commit 7408e557b729cdbfe291a13ed0f4889528960110
Author: Wladimir Palant <trev at adblockplus.org>
Date:   Wed Apr 29 09:35:10 2009 +0200

    Backing out changeset 52d3ba3b5308 (Adding command "lock/unlock selection") - causes focus issues that are hard to resolve
    
    --HG--
    extra : rebase_source : d0aaa320b2be6cadcbd2348d6f57e346e0d5c98e
---
 chrome/content/aardvark.js            | 25 ++++++-------------------
 chrome/locale/en-US/global.properties |  2 --
 2 files changed, 6 insertions(+), 21 deletions(-)

diff --git a/chrome/content/aardvark.js b/chrome/content/aardvark.js
index 387e30b..ee6eea6 100644
--- a/chrome/content/aardvark.js
+++ b/chrome/content/aardvark.js
@@ -29,15 +29,13 @@
 
 var ehhAardvark = {
   browser: null,
-  currentElem: null,
   selectedElem: null,
   commentElem : null,
   mouseX: -1,
   mouseY: -1,
   commandLabelTimeout: 0,
   borderElems: null,
-  labelElem: null,
-  locked: false
+  labelElem: null
 };
 
 ehhAardvark.start = function(browser) {
@@ -167,15 +165,14 @@ ehhAardvark.onMouseOver = function(event) {
 
   if (elem == null || aardvarkLabel)
   {
-    this.currentElem = null;
-    if (!this.locked)
-        this.clearBox();
+    this.clearBox ();
     return;
   }
 
-  this.currentElem = elem;
-  if (!this.locked && this.currentElem != this.selectedElem)
-    this.showBoxAndLabel(this.currentElem, this.makeElementLabelString(this.currentElem));
+  if (elem == this.selectedElem)
+    return;
+  
+  this.showBoxAndLabel (elem, this.makeElementLabelString (elem));
 }
 
 ehhAardvark.onKeyPress = function(event) {
@@ -440,7 +437,6 @@ ehhAardvark.setElementStyleDefault = function (elem, bgColor)
 // 0: name, 1: needs element
 ehhAardvark.commands = [
   "select",
-  "lock",
   "wider",
   "narrower",
   "quit",
@@ -530,15 +526,6 @@ ehhAardvark.select = function (elem)
 }
 
 //------------------------------------------------------------
-ehhAardvark.lock = function (elem)
-{
-  this.locked = !this.locked;
-  if (!this.locked && this.currentElem != this.selectedElem)
-    this.showBoxAndLabel(this.currentElem, this.makeElementLabelString(this.currentElem));
-  return true;
-}
-
-//------------------------------------------------------------
 ehhAardvark.blinkElement = function (elem)
 {
   if (!elem)
diff --git a/chrome/locale/en-US/global.properties b/chrome/locale/en-US/global.properties
index 3678a9e..0c5d2d3 100644
--- a/chrome/locale/en-US/global.properties
+++ b/chrome/locale/en-US/global.properties
@@ -1,7 +1,5 @@
 command.select.key=s
 command.select.label=select element
-command.lock.key=l
-command.lock.label=lock/unlock selection
 command.wider.key=w
 command.wider.label=wider
 command.narrower.key=n

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-mozext/adblock-plus-element-hiding-helper.git