bug 270697 make autocomplete behave more like IE r=caillon,r=mconnor

browser/base/content/browser.xul

@@ -206,6 +206,7 @@
                  type="autocomplete"
                  autocompletesearch="history" 
                  autocompletepopup="PopupAutoComplete"
+                 completeselectedindex="true"
                  tabscrolling="true"
                  showcommentcolumn="true"
                  enablehistory="true"

browser/base/content/openLocation.xul

@@ -67,6 +67,7 @@
 
       <hbox align="center">
         <textbox id="dialog.input" flex="1" type="autocomplete"
+                  completeselectedindex="true"
                   autocompletesearch="history"
                   enablehistory="true"
                   oninput="doEnabling();"/>

browser/base/content/search.xml

@@ -57,6 +57,7 @@
                    autocompletepopup="PopupAutoComplete"
                    autocompletesearch="form-history"
                    autocompletesearchparam="searchbar-history"
+                   completeselectedindex="true"
                    tabscrolling="true"
                    onfocus="URLBarFocusHandler(event, this);"
                    onmousedown="URLBarMouseDownHandler(event, this);"

toolkit/components/autocomplete/public/nsIAutoCompleteInput.idl

@@ -40,7 +40,7 @@
 
 interface nsIAutoCompletePopup;
 
-[scriptable, uuid(3B6E2742-B136-4588-A6DF-699B9585AF60)]
+[scriptable, uuid(e312267f-8f57-43e8-a904-ff9b5d3f5aef)]
 interface nsIAutoCompleteInput : nsISupports
 {  
   /*
@@ -70,6 +70,12 @@ interface nsIAutoCompleteInput : nsISupports
    */
   attribute boolean completeDefaultIndex;
 
+  /*
+   * complete text in the textbox as the user selects from the dropdown
+   * options if set to true
+   */
+  attribute boolean completeSelectedIndex;
+
   /* 
    * Option for completing to the default result whenever the user hits
    * enter or the textbox loses focus

toolkit/components/autocomplete/src/nsAutoCompleteController.cpp

@@ -304,17 +304,23 @@ nsAutoCompleteController::HandleKeyNavigation(PRUint16 aKey, PRBool *_retval)
       popup->SelectBy(reverse, page);
 
       // Fill in the value of the textbox with whatever is selected in the popup
-      PRInt32 selectedIndex;
+      // if the completeSelectedIndex attribute is set
-      popup->GetSelectedIndex(&selectedIndex);
+      PRBool completeSelection;
-      if (selectedIndex >= 0) {
+      mInput->GetCompleteSelectedIndex(&completeSelection);
-        //  A result is selected, so fill in its value
+      if (completeSelection)
-        nsAutoString value;
+      {
-        if (NS_SUCCEEDED(GetResultValueAt(selectedIndex, PR_TRUE, value)))
+        PRInt32 selectedIndex;
-          CompleteValue(value, PR_FALSE);
+        popup->GetSelectedIndex(&selectedIndex);
-      } else {
+        if (selectedIndex >= 0) {
-        // Nothing is selected, so fill in the last typed value
+          //  A result is selected, so fill in its value
-        mInput->SetTextValue(mSearchString);
+          nsAutoString value;
-        mInput->SelectTextRange(mSearchString.Length(), mSearchString.Length());
+          if (NS_SUCCEEDED(GetResultValueAt(selectedIndex, PR_TRUE, value)))
+            CompleteValue(value, PR_FALSE);
+        } else {
+          // Nothing is selected, so fill in the last typed value
+          mInput->SetTextValue(mSearchString);
+          mInput->SelectTextRange(mSearchString.Length(), mSearchString.Length());
+        }
       }
     } else {
       // Open the popup if there has been a previous search, or else kick off a new search

toolkit/components/satchel/src/nsFormFillController.cpp

@@ -92,6 +92,7 @@ nsFormFillController::nsFormFillController() :
   mMaxRows(0),
   mDisableAutoComplete(PR_FALSE), 
   mCompleteDefaultIndex(PR_FALSE),
+  mCompleteSelectedIndex(PR_FALSE),
   mForceComplete(PR_FALSE),
   mSuppressOnInput(PR_FALSE)
 {
@@ -270,6 +271,20 @@ nsFormFillController::SetCompleteDefaultIndex(PRBool aCompleteDefaultIndex)
   return NS_OK;
 }
 
+NS_IMETHODIMP
+nsFormFillController::GetCompleteSelectedIndex(PRBool *aCompleteSelectedIndex)
+{
+  *aCompleteSelectedIndex = mCompleteSelectedIndex;
+  return NS_OK;
+}
+
+NS_IMETHODIMP
+nsFormFillController::SetCompleteSelectedIndex(PRBool aCompleteSelectedIndex)
+{
+  mCompleteSelectedIndex = aCompleteSelectedIndex;
+  return NS_OK;
+}
+
 NS_IMETHODIMP
 nsFormFillController::GetForceComplete(PRBool *aForceComplete)
 {

toolkit/components/satchel/src/nsFormFillController.h

@@ -137,6 +137,7 @@ protected:
   PRUint32 mMaxRows;
   PRPackedBool mDisableAutoComplete; 
   PRPackedBool mCompleteDefaultIndex;
+  PRPackedBool mCompleteSelectedIndex;
   PRPackedBool mForceComplete;
   PRPackedBool mSuppressOnInput;
   PRPackedBool mIgnoreClick;

toolkit/content/widgets/autocomplete.xml

@@ -137,6 +137,10 @@
                 onset="this.setAttribute('completedefaultindex', val); return val;"
                 onget="return this.getAttribute('completedefaultindex') == 'true';"/>
 
+      <property name="completeSelectedIndex"
+                onset="this.setAttribute('completeselectedindex', val); return val;"
+                onget="return this.getAttribute('completeselectedindex') == 'true';"/>
+
       <property name="forceComplete"
                 onset="this.setAttribute('forcecomplete', val); return val;"
                 onget="return this.getAttribute('forcecomplete') == 'true';"/>