Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2025-03-01 22:07:41 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1676692 - Move contentSearchUI and related files to browser/components/search. r=daleharvey

Browse Source 
Differential Revision: https://phabricator.services.mozilla.com/D96743
This commit is contained in:
Mark Banner 2020-11-12 17:50:24 +00:00
parent b5d8c4bd2c
commit 038e6b977a
12 changed files with 19 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
browser/base/content/test/general/browser.ini
View File

@ -38,9 +38,6 @@ support-files =
page_style_sample.html
ssl_error_reports.sjs
print_postdata.sjs
searchSuggestionEngine.sjs
searchSuggestionEngine.xml
searchSuggestionEngine2.xml
test_bug462673.html
test_bug628179.html
title_test.svg
@ -298,10 +295,6 @@ skip-if = (os == 'mac') || (verify && (os == 'mac')) || (os == 'win' && debug) |
# DO NOT ADD MORE TESTS HERE. USE A TOPICAL DIRECTORY INSTEAD.
[browser_save_video_frame.js]
# DO NOT ADD MORE TESTS HERE. USE A TOPICAL DIRECTORY INSTEAD.
[browser_contentSearchUI.js]
support-files =
contentSearchUI.html
# DO NOT ADD MORE TESTS HERE. USE A TOPICAL DIRECTORY INSTEAD.
[browser_selectTabAtIndex.js]
# DO NOT ADD MORE TESTS HERE. USE A TOPICAL DIRECTORY INSTEAD.
[browser_ssl_error_reports.js]

3
browser/base/jar.mn
View File

@ -91,9 +91,6 @@ browser.jar:
content/browser/sanitize.xhtml (content/sanitize.xhtml)
content/browser/sanitizeDialog.js (content/sanitizeDialog.js)
content/browser/sanitizeDialog.css (content/sanitizeDialog.css)
content/browser/contentSearchUI.js (content/contentSearchUI.js)
content/browser/contentSearchHandoffUI.js (content/contentSearchHandoffUI.js)
content/browser/contentSearchUI.css (content/contentSearchUI.css)
content/browser/tabbrowser.css (content/tabbrowser.css)
content/browser/tabbrowser.js (content/tabbrowser.js)
content/browser/tabbrowser-tab.js (content/tabbrowser-tab.js)

0
browser/base/content/contentSearchHandoffUI.js → browser/components/search/content/contentSearchHandoffUI.js
View File

0
browser/base/content/contentSearchUI.css → browser/components/search/content/contentSearchUI.css
View File

13
browser/base/content/contentSearchUI.js → browser/components/search/content/contentSearchUI.js
View File

@ -19,21 +19,22 @@ this.ContentSearchUIController = (function() {
* The UI consists of an html:table that's inserted into the DOM after the given
* text box and styled so that it appears as a dropdown below the text box.
*
* @param inputElement
* @param {DOMElement} inputElement
* Search suggestions will be based on the text in this text box.
* Assumed to be an html:input.
* @param tableParent
* @param {DOMElement} tableParent
* The suggestion table is appended as a child to this element. Since
* the table is absolutely positioned and its top and left values are set
* to be relative to the top and left of the page, either the parent and
* all its ancestors should not be positioned elements (i.e., their
* positions should be "static"), or the parent's position should be the
* top left of the page.
* @param healthReportKey
* This will be sent with the search data for FHR to record the search.
* @param searchPurpose
* @param {string} healthReportKey
* This will be sent with the search data for BrowserUsageTelemetry to
* record the search.
* @param {string} searchPurpose
* Sent with search data, see nsISearchEngine.getSubmission.
* @param idPrefix
* @param {sring} idPrefix
* The IDs of elements created by the object will be prefixed with this
* string.
*/

3
browser/components/search/jar.mn
View File

@ -5,6 +5,9 @@
browser.jar:
content/browser/search/autocomplete-popup.js (content/autocomplete-popup.js)
content/browser/search/searchbar.js (content/searchbar.js)
content/browser/contentSearchUI.js (content/contentSearchUI.js)
content/browser/contentSearchHandoffUI.js (content/contentSearchHandoffUI.js)
content/browser/contentSearchUI.css (content/contentSearchUI.css)
search-extensions/ (extensions/**)
% resource search-extensions %search-extensions/ contentaccessible=yes

6
browser/components/search/test/browser/browser.ini
View File

@ -21,6 +21,12 @@ support-files =
[browser_addEngine.js]
[browser_contentContextMenu.js]
support-files = browser_contentContextMenu.xhtml
[browser_contentSearchUI.js]
support-files =
contentSearchUI.html
searchSuggestionEngine.sjs
searchSuggestionEngine.xml
searchSuggestionEngine2.xml
[browser_contextmenu.js]
skip-if = (os == "win" && processor == "aarch64") # disabled on aarch64 due to 1531590
[browser_contextSearchTabPosition.js]

2
browser/base/content/test/general/browser_contentSearchUI.js → browser/components/search/test/browser/browser_contentSearchUI.js
View File

@ -890,7 +890,7 @@ var gDidInitialSetUp = false;
async function setUp(aNoEngine) {
if (!gDidInitialSetUp) {
var { ContentSearch } = ChromeUtils.import(
let { ContentSearch } = ChromeUtils.import(
"resource:///actors/ContentSearchParent.jsm"
);
let originalOnMessageSearch = ContentSearch._onMessageSearch;

0
browser/base/content/test/general/contentSearchUI.html → browser/components/search/test/browser/contentSearchUI.html
View File

0
browser/base/content/test/general/searchSuggestionEngine.sjs → browser/components/search/test/browser/searchSuggestionEngine.sjs
View File

2
browser/base/content/test/general/searchSuggestionEngine.xml → browser/components/search/test/browser/searchSuggestionEngine.xml
View File

@ -4,6 +4,6 @@
<SearchPlugin xmlns="http://www.mozilla.org/2006/browser/search/">
<ShortName>browser_searchSuggestionEngine searchSuggestionEngine.xml</ShortName>
<Url type="application/x-suggestions+json" method="GET" template="http://mochi.test:8888/browser/browser/base/content/test/general/searchSuggestionEngine.sjs?{searchTerms}"/>
<Url type="application/x-suggestions+json" method="GET" template="http://mochi.test:8888/browser/browser/components/search/test/browser/searchSuggestionEngine.sjs?{searchTerms}"/>
<Url type="text/html" method="GET" template="http://mochi.test:8888/" rel="searchform"/>
</SearchPlugin>

2
browser/base/content/test/general/searchSuggestionEngine2.xml → browser/components/search/test/browser/searchSuggestionEngine2.xml
View File

@ -4,6 +4,6 @@
<SearchPlugin xmlns="http://www.mozilla.org/2006/browser/search/">
<ShortName>browser_searchSuggestionEngine searchSuggestionEngine2.xml</ShortName>
<Url type="application/x-suggestions+json" method="GET" template="http://mochi.test:8888/browser/browser/base/content/test/general/searchSuggestionEngine.sjs?{searchTerms}"/>
<Url type="application/x-suggestions+json" method="GET" template="http://mochi.test:8888/browser/browser/components/search/test/browser/searchSuggestionEngine.sjs?{searchTerms}"/>
<Url type="text/html" method="GET" template="http://www.browser-searchSuggestionEngine.com/searchSuggestionEngine2&amp;terms={searchTerms}" rel="searchform"/>
</SearchPlugin>