Bug 923801 - Case-sensitive still affects all find bars globally. r=gavin

toolkit/content/tests/browser/browser_findbar.js

@@ -1,51 +1,65 @@
 XPCOMUtils.defineLazyModuleGetter(this, "Promise",
   "resource://gre/modules/Promise.jsm");
-XPCOMUtils.defineLazyModuleGetter(this, "Task",
-  "resource://gre/modules/Task.jsm");
 Components.utils.import("resource://gre/modules/Timer.jsm", this);
 
-let gTabs = [];
+add_task(function* test_not_found() {
+  info("Check correct 'Phrase not found' on new tab");
 
-registerCleanupFunction(function() {
-  for (let tab of gTabs) {
-    if (!tab)
-      continue;
-    gBrowser.removeTab(tab);
-  }
+  let tab = yield promiseTestPageLoad();
+
+  // Search for the first word.
+  yield promiseFindFinished("--- THIS SHOULD NEVER MATCH ---", false);
+  let findbar = gBrowser.getFindBar();
+  is(findbar._findStatusDesc.textContent, findbar._notFoundStr,
+     "Findbar status text should be 'Phrase not found'");
+
+  gBrowser.removeTab(tab);
 });
 
-function test() {
-  waitForExplicitFinish();
+add_task(function* test_found() {
+  let tab = yield promiseTestPageLoad();
 
-  Task.spawn(function() {
-    info("Check correct 'Phrase not found' on new tab");
+  // Search for a string that WILL be found, with 'Highlight All' on
+  yield promiseFindFinished("S", true);
+  ok(!gBrowser.getFindBar()._findStatusDesc.textContent,
+     "Findbar status should be empty");
 
-    // Create a tab to run the test.
-    yield promiseTestPageLoad();
+  gBrowser.removeTab(tab);
+});
 
-    // Search for the first word.
-    yield promiseFindFinished("--- THIS SHOULD NEVER MATCH ---", false);
-    let findbar = gBrowser.getFindBar();
-    is(findbar._findStatusDesc.textContent, findbar._notFoundStr,
-       "Findbar status text should be 'Phrase not found'");
+// Setting first findbar to case-sensitive mode should not affect
+// new tab find bar.
+add_task(function* test_tabwise_case_sensitive() {
+  let tab1 = yield promiseTestPageLoad();
+  let findbar1 = gBrowser.getFindBar();
 
-    // Create second tab.
-    yield promiseTestPageLoad();
+  let tab2 = yield promiseTestPageLoad();
+  let findbar2 = gBrowser.getFindBar();
 
-    // Search for a string that WILL be found, with 'Highlight All' on
-    yield promiseFindFinished("s", true);
-    ok(!gBrowser.getFindBar()._findStatusDesc.textContent,
-       "Findbar status should be empty");
+  // Toggle case sensitivity for first findbar
+  findbar1.getElement("find-case-sensitive").click();
 
-    finish();
-  });
-}
+  gBrowser.selectedTab = tab1;
+
+  // Not found for first tab.
+  yield promiseFindFinished("S", true);
+  is(findbar1._findStatusDesc.textContent, findbar1._notFoundStr,
+     "Findbar status text should be 'Phrase not found'");
+
+  gBrowser.selectedTab = tab2;
+
+  // But it didn't affect the second findbar.
+  yield promiseFindFinished("S", true);
+  ok(!findbar2._findStatusDesc.textContent, "Findbar status should be empty");
+
+  gBrowser.removeTab(tab1);
+  gBrowser.removeTab(tab2);
+});
 
 function promiseTestPageLoad() {
   let deferred = Promise.defer();
 
   let tab = gBrowser.selectedTab = gBrowser.addTab("data:text/html;charset=utf-8,The letter s.");
-  gTabs.push(tab);
   let browser = gBrowser.selectedBrowser;
   browser.addEventListener("load", function listener() {
     if (browser.currentURI.spec == "about:blank")
@@ -53,7 +67,7 @@ function promiseTestPageLoad() {
     info("Page loaded: " + browser.currentURI.spec);
     browser.removeEventListener("load", listener, true);
 
-    deferred.resolve();
+    deferred.resolve(tab);
   }, true);
 
   return deferred.promise;

toolkit/content/widgets/findbar.xml

@@ -187,7 +187,7 @@
                          label="&caseSensitive.label;"
                          accesskey="&caseSensitive.accesskey;"
                          tooltiptext="&caseSensitive.tooltiptext;"
-                         oncommand="_setCaseSensitivity(this.checked);"
+                         oncommand="_setCaseSensitivity(this.checked ? 1 : 0);"
                          type="checkbox"
                          xbl:inherits="accesskey=matchcaseaccesskey"/>
       <xul:label anonid="match-case-status" class="findbar-find-fast"/>
@@ -305,10 +305,7 @@
               this._self._typeAheadLinksOnly = prefsvc.getBoolPref(aPrefName);
               break;
             case "accessibility.typeaheadfind.casesensitive":
-              this._self._typeAheadCaseSensitive = prefsvc.getIntPref(aPrefName);
-              this._self._updateCaseSensitivity();
-              if (this._self.getElement("highlight").checked)
-                this._self._setHighlightTimeout();
+              this._self._setCaseSensitivity(prefsvc.getIntPref(aPrefName));
               break;
           }
         }
@@ -546,19 +543,19 @@
 
       <!--
         - Sets the findbar case-sensitivity mode
-        - @param aCaseSensitive (boolean)
-        -        Whether or not case-sensitivity should be turned on.
+        - @param aCaseSensitivity (int)
+        -   0 - case insensitive
+        -   1 - case sensitive
+        -   2 - auto = case sensitive iff match string contains upper case letters
+        -   @see _shouldBeCaseSensitive
         -->
       <method name="_setCaseSensitivity">
-        <parameter name="aCaseSensitive"/>
+        <parameter name="aCaseSensitivity"/>
         <body><![CDATA[
-          let prefsvc =
-            Components.classes["@mozilla.org/preferences-service;1"]
-                      .getService(Components.interfaces.nsIPrefBranch);
-
-          // Just set the pref; our observer will change the find bar behavior
-          prefsvc.setIntPref("accessibility.typeaheadfind.casesensitive",
-                             aCaseSensitive ? 1 : 0);
+          this._typeAheadCaseSensitive = aCaseSensitivity;
+          this._updateCaseSensitivity();
+          if (this.getElement("highlight").checked)
+            this._setHighlightTimeout();
 
           this._dispatchFindEvent("casesensitivitychange");
         ]]></body>