[Pkg-mozext-commits] [adblock-plus-element-hiding-helper] 388/483: Moved shutting down selection if the extension is disabled to a more appropriate place

[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 4fa41360a16ec22aebb795ba0aed31b65f5b1eaa
Author: Wladimir Palant <trev at adblockplus.org>
Date:   Mon Jan 23 16:08:28 2012 +0100

    Moved shutting down selection if the extension is disabled to a more appropriate place
---
 aardvark.js | 13 ++++++++++---
 main.js     |  3 ---
 2 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/aardvark.js b/aardvark.js
index 7076952..20ae486 100644
--- a/aardvark.js
+++ b/aardvark.js
@@ -6,6 +6,9 @@
 
 let {Prefs} = require("prefs");
 
+// Make sure to stop selection when we are uninstalled
+onShutdown.add(function() Aardvark.quit());
+
 // To be replaced when selection starts
 function E(id) {return null;}
 
@@ -164,9 +167,13 @@ let Aardvark = exports.Aardvark =
 
   hideTooltips: function()
   {
-    E("ehh-helpbox").hidePopup();
-    E("ehh-commandlabel").hidePopup();
-    E("ehh-viewsource").hidePopup();
+    let tooltips = ["ehh-helpbox", "ehh-commandlabel", "ehh-viewsource"];
+    for (let i = 0; i < tooltips.length; i++)
+    {
+      let tooltip = E(tooltips[i]);
+      if (tooltip)
+        tooltip.hidePopup();
+    }
   },
 
   onMouseClick: function(event)
diff --git a/main.js b/main.js
index b5d6c0d..81aaf82 100644
--- a/main.js
+++ b/main.js
@@ -14,9 +14,6 @@ let {WindowWrapper} = require("windowWrapper");
 Prefs.migrate("extensions.adblockplus.ehh-selectelement_key", "selectelement_key");
 Prefs.migrate("extensions.adblockplus.ehh.showhelp", "showhelp");
 
-// Make sure to stop selection when we are uninstalled
-onShutdown.add(function() require("aardvark").Aardvark.quit());
-
 // Use random marker class
 let elementMarkerClass = null;
 {

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