Bug 1310942 - Merge browser-autocomplete-result-popup into browser-search-autocomplete-result-popup; r?mak
MozReview-Commit-ID: 2DtwvrsOlQ8
--- a/browser/base/content/urlbarBindings.xml
+++ b/browser/base/content/urlbarBindings.xml
@@ -1254,94 +1254,16 @@ file, You can obtain one at http://mozil
Cc["@mozilla.org/widget/clipboardhelper;1"]
.getService(Ci.nsIClipboardHelper)
.copyStringToClipboard(val, Ci.nsIClipboard.kSelectionClipboard);
]]></handler>
</handlers>
</binding>
- <!-- Note: this binding is applied to the autocomplete popup used in web page content and extended in search.xml for the searchbar. -->
- <binding id="browser-autocomplete-result-popup" extends="chrome://global/content/bindings/autocomplete.xml#autocomplete-result-popup">
- <implementation>
- <field name="AppConstants" readonly="true">
- (Components.utils.import("resource://gre/modules/AppConstants.jsm", {})).AppConstants;
- </field>
-
- <method name="openAutocompletePopup">
- <parameter name="aInput"/>
- <parameter name="aElement"/>
- <body>
- <![CDATA[
- // initially the panel is hidden
- // to avoid impacting startup / new window performance
- aInput.popup.hidden = false;
-
- // this method is defined on the base binding
- this._openAutocompletePopup(aInput, aElement);
- ]]></body>
- </method>
-
- <method name="onPopupClick">
- <parameter name="aEvent"/>
- <body><![CDATA[
- // Ignore all right-clicks
- if (aEvent.button == 2)
- return;
-
- var controller = this.view.QueryInterface(Components.interfaces.nsIAutoCompleteController);
-
- var searchBar = BrowserSearch.searchBar;
- var popupForSearchBar = searchBar && searchBar.textbox == this.mInput;
- if (popupForSearchBar) {
- searchBar.telemetrySearchDetails = {
- index: controller.selection.currentIndex,
- kind: "mouse"
- };
- }
-
- // Check for unmodified left-click, and use default behavior
- if (aEvent.button == 0 && !aEvent.shiftKey && !aEvent.ctrlKey &&
- !aEvent.altKey && !aEvent.metaKey) {
- controller.handleEnter(true, aEvent);
- return;
- }
-
- // Check for middle-click or modified clicks on the search bar
- if (popupForSearchBar) {
- // Handle search bar popup clicks
- var search = controller.getValueAt(this.selectedIndex);
-
- // close the autocomplete popup and revert the entered search term
- this.closePopup();
- controller.handleEscape();
-
- // open the search results according to the clicking subtlety
- var where = whereToOpenLink(aEvent, false, true);
- let params = {};
-
- // But open ctrl/cmd clicks on autocomplete items in a new background tab.
- let modifier = this.AppConstants.platform == "macosx" ?
- aEvent.metaKey :
- aEvent.ctrlKey;
- if (where == "tab" && (aEvent instanceof MouseEvent) &&
- (aEvent.button == 1 || modifier))
- params.inBackground = true;
-
- searchBar.doSearch(search, where, null, params);
- if (where == "tab" && params.inBackground)
- searchBar.focus();
- else
- searchBar.value = search;
- }
- ]]></body>
- </method>
- </implementation>
- </binding>
-
<binding id="urlbar-rich-result-popup" extends="chrome://global/content/bindings/autocomplete.xml#autocomplete-rich-result-popup">
<resources>
<stylesheet src="chrome://browser/content/search/searchbarBindings.css"/>
<stylesheet src="chrome://browser/skin/searchbar.css"/>
</resources>
<content ignorekeys="true" level="top" consumeoutsideclicks="never"--- a/browser/components/search/content/search.xml
+++ b/browser/components/search/content/search.xml
@@ -687,18 +687,18 @@
-->
<method name="openPopup">
<body><![CDATA[
var popup = this.popup;
if (!popup.mPopupOpen) {
// Initially the panel used for the searchbar (PopupSearchAutoComplete
// in browser.xul) is hidden to avoid impacting startup / new
// window performance. The base binding's openPopup would normally
- // call the overriden openAutocompletePopup in urlbarBindings.xml's
- // browser-autocomplete-result-popup binding to unhide the popup,
+ // call the overriden openAutocompletePopup in
+ // browser-search-autocomplete-result-popup binding to unhide the popup,
// but since we're overriding openPopup we need to unhide the panel
// ourselves.
popup.hidden = false;
// Don't roll up on mouse click in the anchor for the search UI.
if (popup.id == "PopupSearchAutoComplete") {
popup.setAttribute("norolluponanchor", "true");
}
@@ -899,17 +899,17 @@
document.getBindingParent(this).openSuggestionsPanel();
}
]]>
</handler>
</handlers>
</binding>
- <binding id="browser-search-autocomplete-result-popup" extends="chrome://browser/content/urlbarBindings.xml#browser-autocomplete-result-popup">
+ <binding id="browser-search-autocomplete-result-popup" extends="chrome://global/content/bindings/autocomplete.xml#autocomplete-result-popup">
<resources>
<stylesheet src="chrome://browser/content/search/searchbarBindings.css"/>
<stylesheet src="chrome://browser/skin/searchbar.css"/>
</resources>
<content ignorekeys="true" level="top" consumeoutsideclicks="never">
<xul:hbox anonid="searchbar-engine" xbl:inherits="showonlysettings"
class="search-panel-header search-panel-current-engine">
<xul:image class="searchbar-engine-image" xbl:inherits="src"/>
@@ -922,16 +922,88 @@
<xul:treecols anonid="treecols">
<xul:treecol id="treecolAutoCompleteValue" class="autocomplete-treecol" flex="1" overflow="true"/>
</xul:treecols>
<xul:treechildren class="autocomplete-treebody"/>
</xul:tree>
<xul:vbox anonid="search-one-off-buttons" class="search-one-offs"/>
</content>
<implementation>
+ <field name="AppConstants" readonly="true">
+ (Components.utils.import("resource://gre/modules/AppConstants.jsm", {})).AppConstants;
+ </field>
+
+ <method name="openAutocompletePopup">
+ <parameter name="aInput"/>
+ <parameter name="aElement"/>
+ <body><![CDATA[
+ // initially the panel is hidden
+ // to avoid impacting startup / new window performance
+ aInput.popup.hidden = false;
+
+ // this method is defined on the base binding
+ this._openAutocompletePopup(aInput, aElement);
+ ]]></body>
+ </method>
+
+ <method name="onPopupClick">
+ <parameter name="aEvent"/>
+ <body><![CDATA[
+ // Ignore all right-clicks
+ if (aEvent.button == 2)
+ return;
+
+ var controller = this.view.QueryInterface(Components.interfaces.nsIAutoCompleteController);
+
+ var searchBar = BrowserSearch.searchBar;
+ var popupForSearchBar = searchBar && searchBar.textbox == this.mInput;
+ if (popupForSearchBar) {
+ searchBar.telemetrySearchDetails = {
+ index: controller.selection.currentIndex,
+ kind: "mouse"
+ };
+ }
+
+ // Check for unmodified left-click, and use default behavior
+ if (aEvent.button == 0 && !aEvent.shiftKey && !aEvent.ctrlKey &&
+ !aEvent.altKey && !aEvent.metaKey) {
+ controller.handleEnter(true, aEvent);
+ return;
+ }
+
+ // Check for middle-click or modified clicks on the search bar
+ if (popupForSearchBar) {
+ // Handle search bar popup clicks
+ var search = controller.getValueAt(this.selectedIndex);
+
+ // close the autocomplete popup and revert the entered search term
+ this.closePopup();
+ controller.handleEscape();
+
+ // open the search results according to the clicking subtlety
+ var where = whereToOpenLink(aEvent, false, true);
+ let params = {};
+
+ // But open ctrl/cmd clicks on autocomplete items in a new background tab.
+ let modifier = this.AppConstants.platform == "macosx" ?
+ aEvent.metaKey :
+ aEvent.ctrlKey;
+ if (where == "tab" && (aEvent instanceof MouseEvent) &&
+ (aEvent.button == 1 || modifier))
+ params.inBackground = true;
+
+ searchBar.doSearch(search, where, null, params);
+ if (where == "tab" && params.inBackground)
+ searchBar.focus();
+ else
+ searchBar.value = search;
+ }
+ ]]></body>
+ </method>
+
<!-- Popup rollup is triggered by native events before the mousedown event
reaches the DOM. The will be set to true by the popuphiding event and
false after the mousedown event has been triggered to detect what
caused rollup. -->
<field name="_isHiding">false</field>
<field name="_bundle">null</field>
<property name="bundle" readonly="true">
<getter>