Backed out changeset 147b55311d53 (bug 1333256) because xpcshell test test_user_autocomplete_result.js and mochitest test_insecure_form_field_autocomplete.html need to be updated with the new, extended text. r=backout l10n=backout a=backout
authorSebastian Hengst <archaeopteryx@coole-files.de>
Tue, 31 Jan 2017 20:17:33 +0100
changeset 353975 dd9844a556dc657a878fbbc7d61fc68ec4cc5de1
parent 353974 4217fbc0d4feea059a47b6360c627061ab0dd451
child 353976 5a707e447edf4e57996cc591a585901860ae94b3
push id6851
push userarchaeopteryx@coole-files.de
push dateTue, 31 Jan 2017 19:19:01 +0000
treeherdermozilla-esr52@dd9844a556dc [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersbackout, backout
bugs1333256
milestone52.0
backs out147b55311d5350e6d7022d031f725934d6c717a0
Backed out changeset 147b55311d53 (bug 1333256) because xpcshell test test_user_autocomplete_result.js and mochitest test_insecure_form_field_autocomplete.html need to be updated with the new, extended text. r=backout l10n=backout a=backout
toolkit/components/passwordmgr/LoginManagerContent.jsm
toolkit/content/widgets/autocomplete.xml
toolkit/locales/en-US/chrome/passwordmgr/passwordmgr.properties
--- a/toolkit/components/passwordmgr/LoginManagerContent.jsm
+++ b/toolkit/components/passwordmgr/LoginManagerContent.jsm
@@ -1314,18 +1314,17 @@ UserAutoCompleteResult.prototype = {
   },
 
   getLabelAt(index) {
     if (index < 0 || index >= this.matchCount) {
       throw new Error("Index out of range.");
     }
 
     if (this._showInsecureFieldWarning && index === 0) {
-      return this._stringBundle.GetStringFromName("insecureFieldWarningDescription") + " " +
-        this._stringBundle.GetStringFromName("insecureFieldWarningLearnMore");
+      return this._stringBundle.GetStringFromName("insecureFieldWarningDescription");
     }
 
     let that = this;
 
     function getLocalizedString(key, formatArgs) {
       if (formatArgs) {
         return that._stringBundle.formatStringFromName(key, formatArgs, formatArgs.length);
       }
--- a/toolkit/content/widgets/autocomplete.xml
+++ b/toolkit/content/widgets/autocomplete.xml
@@ -1531,37 +1531,16 @@ extends="chrome://global/content/binding
 
     <implementation>
       <constructor><![CDATA[
         // Unlike other autocomplete items, the height of the insecure warning
         // increases by wrapping. So "forceHandleUnderflow" is for container to
         // recalculate an item's height and width.
         this.classList.add("forceHandleUnderflow");
       ]]></constructor>
-
-      <property name="_learnMoreString">
-        <getter><![CDATA[
-          if (!this.__learnMoreString) {
-            this.__learnMoreString =
-              Services.strings.createBundle("chrome://passwordmgr/locale/passwordmgr.properties").
-              GetStringFromName("insecureFieldWarningLearnMore");
-          }
-          return this.__learnMoreString;
-        ]]></getter>
-      </property>
-
-      <method name="_getSearchTokens">
-        <parameter name="aSearch"/>
-        <body>
-          <![CDATA[
-            return [this._learnMoreString.toLowerCase()];
-          ]]>
-        </body>
-      </method>
-
     </implementation>
   </binding>
 
   <binding id="autocomplete-richlistitem" extends="chrome://global/content/bindings/richlistbox.xml#richlistitem">
 
     <content align="center"
              onoverflow="this._onOverflow();"
              onunderflow="this._onUnderflow();">
--- a/toolkit/locales/en-US/chrome/passwordmgr/passwordmgr.properties
+++ b/toolkit/locales/en-US/chrome/passwordmgr/passwordmgr.properties
@@ -62,9 +62,9 @@ loginsDescriptionFiltered=The following 
 loginHostAge=%1$S (%2$S)
 # LOCALIZATION NOTE (noUsername):
 # String is used on the context menu when a login doesn't have a username.
 noUsername=No username
 duplicateLoginTitle=Login already exists
 duplicateLogin=A duplicate login already exists.
 
 insecureFieldWarningDescription = This connection is not secure. Logins entered here could be compromised.
-insecureFieldWarningLearnMore = Learn More
+insecureFieldWarningLearnMore = Learn More