Bug 1427364 - Remove showCommentColumn and showImageColumn. r=mak
authorPaolo Amadini <paolo.mozmail@amadzone.org>
Wed, 10 Jan 2018 15:22:23 +0000
changeset 402771 c8e7ab77ed3fccf4d99711de3507dae353e16181
parent 402770 86fa284eb0e0efa41c279b6964e0b021a0781e44
child 402772 ec6cd52c3fde993d8672938c135ea7c81c680c0a
push id99657
push userpaolo.mozmail@amadzone.org
push dateWed, 07 Feb 2018 21:20:29 +0000
treeherdermozilla-inbound@c8e7ab77ed3f [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersmak
bugs1427364
milestone60.0a1
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 1427364 - Remove showCommentColumn and showImageColumn. r=mak MozReview-Commit-ID: 8RNVaLvZkrY
browser/base/content/browser.xul
browser/components/places/content/editBookmarkOverlay.xul
browser/components/search/content/search.xml
toolkit/components/autocomplete/nsIAutoCompleteInput.idl
toolkit/components/places/tests/unifiedcomplete/head_autocomplete.js
toolkit/components/satchel/AutoCompletePopup.jsm
toolkit/components/satchel/nsFormFillController.cpp
toolkit/content/widgets/autocomplete.xml
--- a/browser/base/content/browser.xul
+++ b/browser/base/content/browser.xul
@@ -774,18 +774,16 @@
                      placeholder="&urlbar.placeholder2;"
                      type="autocomplete"
                      autocompletesearch="unifiedcomplete"
                      autocompletesearchparam="enable-actions"
                      autocompletepopup="PopupAutoCompleteRichResult"
                      completeselectedindex="true"
                      shrinkdelay="250"
                      tabscrolling="true"
-                     showcommentcolumn="true"
-                     showimagecolumn="true"
                      newlines="stripsurroundingwhitespace"
                      ontextentered="this.handleCommand(param);"
                      ontextreverted="return this.handleRevert();"
                      pageproxystate="invalid">
               <!-- Use onclick instead of normal popup= syntax since the popup
                    code fires onmousedown, and hence eats our favicon drag events. -->
               <box id="identity-box" role="button"
                    align="center"
--- a/browser/components/places/content/editBookmarkOverlay.xul
+++ b/browser/components/places/content/editBookmarkOverlay.xul
@@ -121,17 +121,16 @@
           <hbox flex="1" align="center">
             <textbox id="editBMPanel_tagsField"
                      type="autocomplete"
                      flex="1"
                      autocompletesearch="places-tag-autocomplete"
                      autocompletepopup="PopupAutoComplete"
                      completedefaultindex="true"
                      tabscrolling="true"
-                     showcommentcolumn="true"
                      placeholder="&editBookmarkOverlay.tagsEmptyDesc.label;"
                      onchange="gEditItemOverlay.onTagsFieldChange();"/>
             <button id="editBMPanel_tagsSelectorExpander"
                     class="expander-down"
                     tooltiptext="&editBookmarkOverlay.tagsExpanderDown.tooltip;"
                     tooltiptextdown="&editBookmarkOverlay.tagsExpanderDown.tooltip;"
                     tooltiptextup="&editBookmarkOverlay.expanderUp.tooltip;"
                     oncommand="gEditItemOverlay.toggleTagsSelector();"/>
--- a/browser/components/search/content/search.xml
+++ b/browser/components/search/content/search.xml
@@ -740,19 +740,16 @@
             if (popup.id == "PopupSearchAutoComplete") {
               popup.setAttribute("norolluponanchor", "true");
             }
 
             popup.mInput = this;
             // clear any previous selection, see bugs 400671 and 488357
             popup.selectedIndex = -1;
 
-            popup.showCommentColumn = this.showCommentColumn;
-            popup.showImageColumn = this.showImageColumn;
-
             document.popupNode = null;
 
             const isRTL = getComputedStyle(this, "").direction == "rtl";
 
             var outerRect = this.getBoundingClientRect();
             var innerRect = this.inputField.getBoundingClientRect();
             let width = isRTL ?
                         innerRect.right - outerRect.left :
--- a/toolkit/components/autocomplete/nsIAutoCompleteInput.idl
+++ b/toolkit/components/autocomplete/nsIAutoCompleteInput.idl
@@ -55,28 +55,16 @@ interface nsIAutoCompleteInput : nsISupp
   attribute unsigned long minResultsForPopup;
 
   /*
    * The maximum number of rows to show in the autocomplete popup.
    */
   attribute unsigned long maxRows;
 
   /*
-   * Option to show a second column in the popup which contains
-   * the comment for each autocomplete result
-   */
-  attribute boolean showCommentColumn;
-
-  /*
-   * Option to show a third column in the popup which contains
-   * an additional image for each autocomplete result
-   */
-  attribute boolean showImageColumn;
-
-  /*
    * Number of milliseconds after a keystroke before a search begins
    */
   attribute unsigned long timeout;
 
   /*
    * An extra parameter to configure searches with.
    */
   attribute AString searchParam;
--- a/toolkit/components/places/tests/unifiedcomplete/head_autocomplete.js
+++ b/toolkit/components/places/tests/unifiedcomplete/head_autocomplete.js
@@ -57,19 +57,16 @@ AutoCompleteInput.prototype = {
   disableAutoComplete: false,
   completeDefaultIndex: true,
   completeSelectedIndex: true,
   forceComplete: false,
 
   minResultsForPopup: 0,
   maxRows: 0,
 
-  showCommentColumn: false,
-  showImageColumn: false,
-
   timeout: 10,
   searchParam: "",
 
   get searchCount() {
     return this.searches.length;
   },
   getSearchAt(aIndex) {
     return this.searches[aIndex];
--- a/toolkit/components/satchel/AutoCompletePopup.jsm
+++ b/toolkit/components/satchel/AutoCompletePopup.jsm
@@ -182,18 +182,16 @@ this.AutoCompletePopup = {
       // Reset fields that were set from the last time the search popup was open
       this.openedPopup.mInput = AutoCompleteResultView;
       // Temporarily increase the maxRows as we don't want to show
       // the scrollbar in form autofill popup.
       if (firstResultStyle == "autofill-profile") {
         this.openedPopup._normalMaxRows = this.openedPopup.maxRows;
         this.openedPopup.mInput.maxRows = 100;
       }
-      this.openedPopup.showCommentColumn = false;
-      this.openedPopup.showImageColumn = false;
       this.openedPopup.addEventListener("popuphidden", this);
       this.openedPopup.addEventListener("popupshowing", this);
       this.openedPopup.openPopupAtScreenRect("after_start", rect.left, rect.top,
                                              rect.width, rect.height, false,
                                              false);
       this.openedPopup.invalidate();
     } else {
       this.closePopup();
--- a/toolkit/components/satchel/nsFormFillController.cpp
+++ b/toolkit/components/satchel/nsFormFillController.cpp
@@ -514,41 +514,16 @@ nsFormFillController::GetMaxRows(uint32_
 NS_IMETHODIMP
 nsFormFillController::SetMaxRows(uint32_t aMaxRows)
 {
   mMaxRows = aMaxRows;
   return NS_OK;
 }
 
 NS_IMETHODIMP
-nsFormFillController::GetShowImageColumn(bool *aShowImageColumn)
-{
-  *aShowImageColumn = false;
-  return NS_OK;
-}
-
-NS_IMETHODIMP nsFormFillController::SetShowImageColumn(bool aShowImageColumn)
-{
-  return NS_ERROR_NOT_IMPLEMENTED;
-}
-
-
-NS_IMETHODIMP
-nsFormFillController::GetShowCommentColumn(bool *aShowCommentColumn)
-{
-  *aShowCommentColumn = false;
-  return NS_OK;
-}
-
-NS_IMETHODIMP nsFormFillController::SetShowCommentColumn(bool aShowCommentColumn)
-{
-  return NS_ERROR_NOT_IMPLEMENTED;
-}
-
-NS_IMETHODIMP
 nsFormFillController::GetTimeout(uint32_t *aTimeout)
 {
   *aTimeout = mTimeout;
   return NS_OK;
 }
 
 NS_IMETHODIMP nsFormFillController::SetTimeout(uint32_t aTimeout)
 {
--- a/toolkit/content/widgets/autocomplete.xml
+++ b/toolkit/content/widgets/autocomplete.xml
@@ -111,24 +111,16 @@
       <property name="forceComplete"
                 onset="this.setAttribute('forcecomplete', val); return val;"
                 onget="return this.getAttribute('forcecomplete') == 'true';"/>
 
       <property name="minResultsForPopup"
                 onset="this.setAttribute('minresultsforpopup', val); return val;"
                 onget="var m = parseInt(this.getAttribute('minresultsforpopup')); return isNaN(m) ? 1 : m;"/>
 
-      <property name="showCommentColumn"
-                onset="this.setAttribute('showcommentcolumn', val); return val;"
-                onget="return this.getAttribute('showcommentcolumn') == 'true';"/>
-
-      <property name="showImageColumn"
-                onset="this.setAttribute('showimagecolumn', val); return val;"
-                onget="return this.getAttribute('showimagecolumn') == 'true';"/>
-
       <property name="timeout"
                 onset="this.setAttribute('timeout', val); return val;">
         <getter><![CDATA[
           // For security reasons delay searches on pasted values.
           if (this._valueIsPasted) {
             let t = parseInt(this.getAttribute("pastetimeout"));
             return isNaN(t) ? 1000 : t;
           }