Bug 1492522 - Port Bug 1465219: Replace MenuBoxObject with XULElement subclass in suite/. r=frg

2018-09-19 10:25:00 +02:00 · 2018-09-19 10:25:00 +02:00 · cb144da856
--- a/suite/browser/nsTypeAheadFind.js
+++ b/suite/browser/nsTypeAheadFind.js
@ -159,7 +159,8 @@ typeAheadFind.prototype = {
      return true;

    // Don't start a find if the focus is on a form element.
-    if (ChromeUtils.getClassName(element) === "XULElement" ||
+    if ((element.nodeType == element.ELEMENT_NODE &&
+         element.namespaceURI == "http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul") ||
        ChromeUtils.getClassName(element) === "HTMLEmbedElement" ||
        ChromeUtils.getClassName(element) === "HTMLObjectElement" ||
        ChromeUtils.getClassName(element) === "HTMLSelectElement" ||
--- a/suite/components/sync/content/syncSetup.js
+++ b/suite/components/sync/content/syncSetup.js
@ -649,7 +649,7 @@ var gSyncSetup = {
      Weave.Svc.Prefs.reset("serverURL");
    } else {
      // Prevent double selection upon using down key.
-      control.menuBoxObject.activeChild = null;
+      control.activeChild = null;
      control.editable = true;
      control.value = "";
    }
--- a/suite/mailnews/mailWidgets.xml
+++ b/suite/mailnews/mailWidgets.xml
@ -1646,7 +1646,7 @@
        <parameter name="event"/>
        <body>
          <![CDATA[
-            this.boxObject.openMenu(false);
+            this.openMenu(false);
          ]]>
        </body>
      </method>