From d2952477b60feaa1fd69fed05ba73cbfb32ded38 Mon Sep 17 00:00:00 2001
From: Jeff Balogh <me@jeffbalogh.org>
Date: Fri, 28 May 2010 15:30:27 -0700
Subject: [PATCH] only show popups on visible elements (bug 564549)

---
 media/js/zamboni/buttons.js | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/media/js/zamboni/buttons.js b/media/js/zamboni/buttons.js
index 670b28b4fa..060edce368 100644
--- a/media/js/zamboni/buttons.js
+++ b/media/js/zamboni/buttons.js
@@ -259,7 +259,7 @@ var installButton = function() {
         addToApp();
     } else if (z.app == 'firefox') {
         $button.addPopup(message('learn_more')).addClass('concealed');
-        versionsAndPlatforms();
+        versionsAndPlatforms({addPopup: false});
     } else if (z.app == 'thunderbird') {
         var msg = function() {
             return $(message('learn_more')()).html();
@@ -277,14 +277,15 @@ jQuery.fn.installButton = function() {
 
 // Create a popup box when the element is clicked.  html can be a function.
 jQuery.fn.addPopup = function(html, allowClick) {
-    this.click(function(e) {
-        if (!allowClick) { e.preventDefault(); }
-
+    return this.click(function(e) {
         var $this = $(this),
             _html = $($.isFunction(html) ? html() : html),
             popup_root = _html.get(0),
             $body = $(document.body);
 
+        if (!$this.filter(':visible').length) { return; }
+        if (!allowClick) { e.preventDefault(); }
+
         if ($this.offset().left > $(window).width() / 2) {
             _html.addClass('left');
         }
@@ -305,7 +306,6 @@ jQuery.fn.addPopup = function(html, allowClick) {
         // Trampoline the binding so it isn't triggered by the current click.
         setTimeout(function(){ $body.bind('click newPopup', cb); }, 0);
     });
-    return this;
 };