mirror of
https://gitlab.winehq.org/wine/wine-gecko.git
synced 2024-09-13 09:24:08 -07:00
Bug 1191520: Hide the search settings footer in non-nightly builds. r=adw
This commit is contained in:
parent
0121fa196f
commit
419d7a6dc2
@ -147,10 +147,12 @@
|
|||||||
|
|
||||||
<!-- for url bar autocomplete -->
|
<!-- for url bar autocomplete -->
|
||||||
<panel type="autocomplete-richlistbox" id="PopupAutoCompleteRichResult" noautofocus="true" hidden="true">
|
<panel type="autocomplete-richlistbox" id="PopupAutoCompleteRichResult" noautofocus="true" hidden="true">
|
||||||
|
#ifdef NIGHTLY_BUILD
|
||||||
<hbox id="urlbar-search-footer" flex="1" align="stretch" pack="end">
|
<hbox id="urlbar-search-footer" flex="1" align="stretch" pack="end">
|
||||||
<button id="urlbar-search-settings" label="&changeSearchSettings.button;"
|
<button id="urlbar-search-settings" label="&changeSearchSettings.button;"
|
||||||
oncommand="BrowserUITelemetry.countSearchSettingsEvent('urlbar'); openPreferences('paneSearch')"/>
|
oncommand="BrowserUITelemetry.countSearchSettingsEvent('urlbar'); openPreferences('paneSearch')"/>
|
||||||
</hbox>
|
</hbox>
|
||||||
|
#endif
|
||||||
</panel>
|
</panel>
|
||||||
|
|
||||||
<!-- for select dropdowns. The menupopup is what shows the list of options,
|
<!-- for select dropdowns. The menupopup is what shows the list of options,
|
||||||
|
@ -4,6 +4,12 @@
|
|||||||
"use strict";
|
"use strict";
|
||||||
|
|
||||||
add_task(function*() {
|
add_task(function*() {
|
||||||
|
let button = document.getElementById("urlbar-search-settings");
|
||||||
|
if (!button) {
|
||||||
|
ok("Skipping test");
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
yield BrowserTestUtils.withNewTab({ gBrowser, url: "about:blank" }, function* () {
|
yield BrowserTestUtils.withNewTab({ gBrowser, url: "about:blank" }, function* () {
|
||||||
let popupopened = BrowserTestUtils.waitForEvent(gURLBar.popup, "popupshown");
|
let popupopened = BrowserTestUtils.waitForEvent(gURLBar.popup, "popupshown");
|
||||||
|
|
||||||
@ -14,7 +20,7 @@ add_task(function*() {
|
|||||||
// Since the current tab is blank the preferences pane will load there
|
// Since the current tab is blank the preferences pane will load there
|
||||||
let loaded = BrowserTestUtils.browserLoaded(gBrowser.selectedBrowser);
|
let loaded = BrowserTestUtils.browserLoaded(gBrowser.selectedBrowser);
|
||||||
let popupclosed = BrowserTestUtils.waitForEvent(gURLBar.popup, "popuphidden");
|
let popupclosed = BrowserTestUtils.waitForEvent(gURLBar.popup, "popuphidden");
|
||||||
EventUtils.synthesizeMouseAtCenter(document.getElementById("urlbar-search-settings"), {});
|
EventUtils.synthesizeMouseAtCenter(button, {});
|
||||||
yield loaded;
|
yield loaded;
|
||||||
yield popupclosed;
|
yield popupclosed;
|
||||||
|
|
||||||
|
@ -27,6 +27,8 @@ BROWSER_CHROME_MANIFESTS += [
|
|||||||
DEFINES['MOZ_APP_VERSION'] = CONFIG['MOZ_APP_VERSION']
|
DEFINES['MOZ_APP_VERSION'] = CONFIG['MOZ_APP_VERSION']
|
||||||
DEFINES['MOZ_APP_VERSION_DISPLAY'] = CONFIG['MOZ_APP_VERSION_DISPLAY']
|
DEFINES['MOZ_APP_VERSION_DISPLAY'] = CONFIG['MOZ_APP_VERSION_DISPLAY']
|
||||||
|
|
||||||
|
DEFINES['NIGHTLY_BUILD'] = CONFIG['NIGHTLY_BUILD']
|
||||||
|
|
||||||
DEFINES['APP_LICENSE_BLOCK'] = '%s/content/overrides/app-license.html' % SRCDIR
|
DEFINES['APP_LICENSE_BLOCK'] = '%s/content/overrides/app-license.html' % SRCDIR
|
||||||
|
|
||||||
if CONFIG['MOZ_WIDGET_TOOLKIT'] in ('windows', 'gtk2', 'gtk3', 'cocoa'):
|
if CONFIG['MOZ_WIDGET_TOOLKIT'] in ('windows', 'gtk2', 'gtk3', 'cocoa'):
|
||||||
|
Loading…
Reference in New Issue
Block a user