Bug 642404 <autocomplete disablehistory="false"> displays incorrectly on Linux; switch SeaMonkey (and Thunderbird) to use enablehistory="true" instead r=Standard8
authorNeil Rashbrook <neil@parkwaycc.co.uk>
Sat, 09 Apr 2011 23:13:04 +0100
changeset 67747 00b34481041ac7ba6fb5b75dee561e2306e159f8
parent 67746 1edfae12015b67eb2275acb3ea84194cd412ef44
child 67748 b05724577538183844f612eff15cfd6c07813811
child 67787 2a2330ab6a2998746b465aba7cdafbd21ba4cda1
push id1
push userroot
push dateTue, 26 Apr 2011 22:38:44 +0000
treeherdermozilla-beta@bfdb6e623a36 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersStandard8
bugs642404
milestone2.2a1pre
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 642404 <autocomplete disablehistory="false"> displays incorrectly on Linux; switch SeaMonkey (and Thunderbird) to use enablehistory="true" instead r=Standard8 DONTBUILD
xpfe/components/autocomplete/resources/content/autocomplete.css
xpfe/components/autocomplete/resources/content/autocomplete.xml
--- a/xpfe/components/autocomplete/resources/content/autocomplete.css
+++ b/xpfe/components/autocomplete/resources/content/autocomplete.css
@@ -12,16 +12,24 @@
 .autocomplete-result-popup[hidden="true"] {
   visibility: hidden;
 }
 
 .autocomplete-tree {
   -moz-user-focus: ignore;
 }
 
+.autocomplete-history-dropmarker {
+  display: none;
+}
+
+.autocomplete-history-dropmarker[enablehistory="true"] {
+  display: -moz-box;
+}
+
 /* The following rule is here to fix bug 96899 (and now 117952).  
    Somehow trees create a situation
    in which a popupset flows itself as if its popup child is directly within it
    instead of the placeholder child that should actually be inside the popupset.
    This is a stopgap measure, and it does not address the real bug.  */
 popupset {
   max-width: 0px;
   width: 0px;
--- a/xpfe/components/autocomplete/resources/content/autocomplete.xml
+++ b/xpfe/components/autocomplete/resources/content/autocomplete.xml
@@ -24,17 +24,17 @@
           <html:input anonid="input" class="autocomplete-textbox textbox-input"
                       flex="1" allowevents="true"
                       xbl:inherits="tooltiptext=inputtooltiptext,onfocus,onblur,value,type,maxlength,disabled,size,readonly,placeholder,tabindex,accesskey,mozactionhint,userAction"/>
         </xul:hbox>
         <children includes="hbox"/>
       </xul:hbox>
 
       <xul:dropmarker class="autocomplete-history-dropmarker" allowevents="true"
-                      xbl:inherits="open,hidden=disablehistory" anonid="historydropmarker"/>
+                      xbl:inherits="open,enablehistory" anonid="historydropmarker"/>
 
       <xul:popupset>
         <xul:panel type="autocomplete" anonid="popup"
                    ignorekeys="true" noautofocus="true" level="top"
                    xbl:inherits="for=id,nomatch"/>
       </xul:popupset>
     </content>
 
@@ -48,17 +48,16 @@
 
         // listen for menubar activation
         window.top.addEventListener("DOMMenuBarActive", this.mMenuBarListener, true);
 
         // set default property values
         this.ifSetAttribute("timeout", 50);
         this.ifSetAttribute("maxrows", 5);
         this.ifSetAttribute("showpopup", true);
-        this.ifSetAttribute("disablehistory", true);
         this.ifSetAttribute("disableKeyNavigation", true);
         
         // initialize the search sessions
         if (this.hasAttribute("autocompletesearch"))
           this.initAutoCompleteSearch();
         if (this.hasAttribute("searchSessions"))
           this.initSearchSessions();
         
@@ -1001,17 +1000,17 @@
               if (!aEvent.altKey) {
                 this.clearTimer();
                 killEvent = this.keyNavigation(aEvent);
                 break;
               }
             // Alt+Down falls through to history popup toggling code
               
             case KeyEvent.DOM_VK_F4:
-              if (!aEvent.ctrlKey && !aEvent.shiftKey && this.getAttribute("disablehistory") != "true") {
+              if (!aEvent.ctrlKey && !aEvent.shiftKey && this.getAttribute("enablehistory") == "true") {
                 var historyPopup = document.getAnonymousElementByAttribute(this, "anonid", "historydropmarker");
                 if (historyPopup)
                   historyPopup.showPopup();
                 else
                   historyPopup.hidePopup();
               }
               break;
             case KeyEvent.DOM_VK_PAGE_UP: