From ddaf4cc074c7e44f47d1f8b1a8e2681d6e34570c Mon Sep 17 00:00:00 2001
From: Mark Finkle <mfinkle@mozilla.com>
Date: Thu, 4 Mar 2010 12:01:07 -0500
Subject: [PATCH] Bug 546273 - Form Assistant misses focus on
 profiles.yahoo.com (bustage fix) [r=vingtetun]

---
 mobile/chrome/content/browser-ui.js | 6 +++---
 mobile/chrome/content/browser.js    | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/mobile/chrome/content/browser-ui.js b/mobile/chrome/content/browser-ui.js
index a11ed0332ee4..e1e0f22744ad 100644
--- a/mobile/chrome/content/browser-ui.js
+++ b/mobile/chrome/content/browser-ui.js
@@ -1094,9 +1094,9 @@ var FormHelper = {
     for (let i=0; i<labels.length; i++) {
       let labelRect = Browser.getBoundingContentRect(labels[i]);
       if (labelRect.left < elRect.left) {
-        let isClosed = Math.abs(labelRect.left - elRect.left) - labelRect.width < kDistanceMax &&
-                       Math.abs(labelRect.top - elRect.top) - labelRect.height < kDistanceMax;
-        if (!isClosed) {
+        let isClose = Math.abs(labelRect.left - elRect.left) - labelRect.width < kDistanceMax &&
+                      Math.abs(labelRect.top - elRect.top) - labelRect.height < kDistanceMax;
+        if (isClose) {
           let width = labelRect.width + elRect.width + (elRect.left - labelRect.left - labelRect.width);
           return new Rect(labelRect.left, labelRect.top, width, elRect.height).expandToIntegers();
         }
diff --git a/mobile/chrome/content/browser.js b/mobile/chrome/content/browser.js
index cd6c0d917ce2..ed1d051aa9b9 100644
--- a/mobile/chrome/content/browser.js
+++ b/mobile/chrome/content/browser.js
@@ -559,7 +559,7 @@ var Browser = {
         let label = PluralForm.get(addons.length, disabledStrings).replace("#1", addons.length);
 
         let alerts = Cc["@mozilla.org/alerts-service;1"].getService(Ci.nsIAlertsService);
-        alerts.showAlertNotification(URI_GENERIC_ICON_XPINSTALL, strings.getString("alertAddons"),
+        alerts.showAlertNotification(URI_GENERIC_ICON_XPINSTALL, Elements.browserBundle.getString("alertAddons"),
                                      label, false, "", null);
       }
       gPrefService.clearUserPref("extensions.disabledAddons");