mirror of
https://github.com/mozilla/gecko-dev.git
synced 2024-10-19 00:05:36 +00:00
Merge mozilla-central to mozilla-inbound.
--HG-- rename : browser/base/content/test/urlbar/Panel.jsm => browser/components/urlbar/tests/browser/Panel.jsm rename : browser/base/content/test/urlbar/authenticate.sjs => browser/components/urlbar/tests/browser/authenticate.sjs rename : browser/base/content/test/urlbar/browser_URLBarSetURI.js => browser/components/urlbar/tests/browser/browser_URLBarSetURI.js rename : browser/base/content/test/urlbar/browser_bug1025195_switchToTabHavingURI_aOpenParams.js => browser/components/urlbar/tests/browser/browser_bug1025195_switchToTabHavingURI_aOpenParams.js rename : browser/base/content/test/urlbar/browser_bug562649.js => browser/components/urlbar/tests/browser/browser_bug562649.js rename : browser/base/content/test/urlbar/browser_bug623155.js => browser/components/urlbar/tests/browser/browser_bug623155.js rename : browser/base/content/test/urlbar/browser_bug783614.js => browser/components/urlbar/tests/browser/browser_bug783614.js rename : browser/base/content/test/urlbar/browser_locationBarExternalLoad.js => browser/components/urlbar/tests/browser/browser_locationBarExternalLoad.js rename : browser/base/content/test/urlbar/browser_moz_action_link.js => browser/components/urlbar/tests/browser/browser_moz_action_link.js rename : browser/base/content/test/urlbar/browser_page_action_menu_add_search_engine.js => browser/components/urlbar/tests/browser/browser_page_action_menu_add_search_engine.js rename : browser/base/content/test/urlbar/browser_page_action_menu_clipboard.js => browser/components/urlbar/tests/browser/browser_page_action_menu_clipboard.js rename : browser/base/content/test/urlbar/browser_page_action_menu_share_mac.js => browser/components/urlbar/tests/browser/browser_page_action_menu_share_mac.js rename : browser/base/content/test/urlbar/browser_page_action_menu_share_win.html => browser/components/urlbar/tests/browser/browser_page_action_menu_share_win.html rename : browser/base/content/test/urlbar/browser_page_action_menu_share_win.js => browser/components/urlbar/tests/browser/browser_page_action_menu_share_win.js rename : browser/base/content/test/urlbar/browser_populateAfterPushState.js => browser/components/urlbar/tests/browser/browser_populateAfterPushState.js rename : browser/base/content/test/urlbar/browser_urlbarCopying.js => browser/components/urlbar/tests/browser/browser_urlbarCopying.js rename : browser/base/content/test/urlbar/browser_urlbarEnter.js => browser/components/urlbar/tests/browser/browser_urlbarEnter.js rename : browser/base/content/test/urlbar/browser_urlbarFocusedCmdK.js => browser/components/urlbar/tests/browser/browser_urlbarFocusedCmdK.js rename : browser/base/content/test/urlbar/browser_urlbarHashChangeProxyState.js => browser/components/urlbar/tests/browser/browser_urlbarHashChangeProxyState.js rename : browser/base/content/test/urlbar/browser_urlbarPlaceholder.js => browser/components/urlbar/tests/browser/browser_urlbarPlaceholder.js rename : browser/base/content/test/urlbar/browser_urlbarRevert.js => browser/components/urlbar/tests/browser/browser_urlbarRevert.js rename : browser/base/content/test/urlbar/browser_urlbarSearchSingleWordNotification.js => browser/components/urlbar/tests/browser/browser_urlbarSearchSingleWordNotification.js rename : browser/base/content/test/urlbar/browser_urlbarUpdateForDomainCompletion.js => browser/components/urlbar/tests/browser/browser_urlbarUpdateForDomainCompletion.js rename : browser/base/content/test/urlbar/browser_urlbar_blanking.js => browser/components/urlbar/tests/browser/browser_urlbar_blanking.js rename : browser/base/content/test/urlbar/browser_urlbar_locationchange_urlbar_edit_dos.js => browser/components/urlbar/tests/browser/browser_urlbar_locationchange_urlbar_edit_dos.js rename : browser/base/content/test/urlbar/browser_urlbar_remoteness_switch.js => browser/components/urlbar/tests/browser/browser_urlbar_remoteness_switch.js rename : browser/base/content/test/urlbar/browser_urlbar_searchsettings.js => browser/components/urlbar/tests/browser/browser_urlbar_searchsettings.js rename : browser/base/content/test/urlbar/browser_urlbar_whereToOpen.js => browser/components/urlbar/tests/browser/browser_urlbar_whereToOpen.js rename : browser/base/content/test/urlbar/browser_wyciwyg_urlbarCopying.js => browser/components/urlbar/tests/browser/browser_wyciwyg_urlbarCopying.js rename : browser/base/content/test/urlbar/dummy_page.html => browser/components/urlbar/tests/browser/dummy_page.html rename : browser/base/content/test/urlbar/file_blank_but_not_blank.html => browser/components/urlbar/tests/browser/file_blank_but_not_blank.html rename : browser/base/content/test/urlbar/file_bug562649.html => browser/components/urlbar/tests/browser/file_bug562649.html rename : browser/base/content/test/urlbar/file_urlbar_edit_dos.html => browser/components/urlbar/tests/browser/file_urlbar_edit_dos.html rename : browser/base/content/test/urlbar/head.js => browser/components/urlbar/tests/browser/head-common.js rename : browser/base/content/test/urlbar/moz.png => browser/components/urlbar/tests/browser/moz.png rename : browser/base/content/test/urlbar/page_action_menu_add_search_engine_0.xml => browser/components/urlbar/tests/browser/page_action_menu_add_search_engine_0.xml rename : browser/base/content/test/urlbar/page_action_menu_add_search_engine_1.xml => browser/components/urlbar/tests/browser/page_action_menu_add_search_engine_1.xml rename : browser/base/content/test/urlbar/page_action_menu_add_search_engine_2.xml => browser/components/urlbar/tests/browser/page_action_menu_add_search_engine_2.xml rename : browser/base/content/test/urlbar/page_action_menu_add_search_engine_many.html => browser/components/urlbar/tests/browser/page_action_menu_add_search_engine_many.html rename : browser/base/content/test/urlbar/page_action_menu_add_search_engine_one.html => browser/components/urlbar/tests/browser/page_action_menu_add_search_engine_one.html rename : browser/base/content/test/urlbar/page_action_menu_add_search_engine_same_names.html => browser/components/urlbar/tests/browser/page_action_menu_add_search_engine_same_names.html rename : browser/base/content/test/urlbar/print_postdata.sjs => browser/components/urlbar/tests/browser/print_postdata.sjs rename : browser/base/content/test/urlbar/redirect_bug623155.sjs => browser/components/urlbar/tests/browser/redirect_bug623155.sjs rename : browser/base/content/test/urlbar/searchSuggestionEngine.sjs => browser/components/urlbar/tests/browser/searchSuggestionEngine.sjs rename : browser/base/content/test/urlbar/searchSuggestionEngine.xml => browser/components/urlbar/tests/browser/searchSuggestionEngine.xml rename : browser/base/content/test/urlbar/searchSuggestionEngine2.xml => browser/components/urlbar/tests/browser/searchSuggestionEngine2.xml rename : browser/base/content/test/urlbar/searchSuggestionEngineSlow.xml => browser/components/urlbar/tests/browser/searchSuggestionEngineSlow.xml rename : browser/base/content/test/urlbar/slow-page.sjs => browser/components/urlbar/tests/browser/slow-page.sjs rename : browser/base/content/test/urlbar/test_wyciwyg_copying.html => browser/components/urlbar/tests/browser/test_wyciwyg_copying.html rename : browser/base/content/test/urlbar/urlbarAddonIframe.js => browser/components/urlbar/tests/browser/urlbarAddonIframe.js rename : browser/base/content/test/urlbar/urlbarAddonIframeContentScript.js => browser/components/urlbar/tests/browser/urlbarAddonIframeContentScript.js rename : browser/base/content/test/urlbar/.eslintrc.js => browser/components/urlbar/tests/legacy/.eslintrc.js rename : browser/base/content/test/urlbar/browser_action_keyword.js => browser/components/urlbar/tests/legacy/browser_action_keyword.js rename : browser/base/content/test/urlbar/browser_action_keyword_override.js => browser/components/urlbar/tests/legacy/browser_action_keyword_override.js rename : browser/base/content/test/urlbar/browser_action_searchengine.js => browser/components/urlbar/tests/legacy/browser_action_searchengine.js rename : browser/base/content/test/urlbar/browser_action_searchengine_alias.js => browser/components/urlbar/tests/legacy/browser_action_searchengine_alias.js rename : browser/base/content/test/urlbar/browser_autocomplete_a11y_label.js => browser/components/urlbar/tests/legacy/browser_autocomplete_a11y_label.js rename : browser/base/content/test/urlbar/browser_autocomplete_autoselect.js => browser/components/urlbar/tests/legacy/browser_autocomplete_autoselect.js rename : browser/base/content/test/urlbar/browser_autocomplete_cursor.js => browser/components/urlbar/tests/legacy/browser_autocomplete_cursor.js rename : browser/base/content/test/urlbar/browser_autocomplete_edit_completed.js => browser/components/urlbar/tests/legacy/browser_autocomplete_edit_completed.js rename : browser/base/content/test/urlbar/browser_autocomplete_enter_race.js => browser/components/urlbar/tests/legacy/browser_autocomplete_enter_race.js rename : browser/base/content/test/urlbar/browser_autocomplete_no_title.js => browser/components/urlbar/tests/legacy/browser_autocomplete_no_title.js rename : browser/base/content/test/urlbar/browser_autocomplete_readline_navigation.js => browser/components/urlbar/tests/legacy/browser_autocomplete_readline_navigation.js rename : browser/base/content/test/urlbar/browser_autocomplete_tag_star_visibility.js => browser/components/urlbar/tests/legacy/browser_autocomplete_tag_star_visibility.js rename : browser/base/content/test/urlbar/browser_bug1003461-switchtab-override.js => browser/components/urlbar/tests/legacy/browser_bug1003461-switchtab-override.js rename : browser/base/content/test/urlbar/browser_bug1024133-switchtab-override-keynav.js => browser/components/urlbar/tests/legacy/browser_bug1024133-switchtab-override-keynav.js rename : browser/base/content/test/urlbar/browser_bug1070778.js => browser/components/urlbar/tests/legacy/browser_bug1070778.js rename : browser/base/content/test/urlbar/browser_bug1104165-switchtab-decodeuri.js => browser/components/urlbar/tests/legacy/browser_bug1104165-switchtab-decodeuri.js rename : browser/base/content/test/urlbar/browser_bug1225194-remotetab.js => browser/components/urlbar/tests/legacy/browser_bug1225194-remotetab.js rename : browser/base/content/test/urlbar/browser_bug304198.js => browser/components/urlbar/tests/legacy/browser_bug304198.js rename : browser/base/content/test/urlbar/browser_bug556061.js => browser/components/urlbar/tests/legacy/browser_bug556061.js rename : browser/base/content/test/urlbar/browser_canonizeURL.js => browser/components/urlbar/tests/legacy/browser_canonizeURL.js rename : browser/base/content/test/urlbar/browser_dragdropURL.js => browser/components/urlbar/tests/legacy/browser_dragdropURL.js rename : browser/base/content/test/urlbar/browser_locationBarCommand.js => browser/components/urlbar/tests/legacy/browser_locationBarCommand.js rename : browser/base/content/test/urlbar/browser_new_tab_urlbar_reset.js => browser/components/urlbar/tests/legacy/browser_new_tab_urlbar_reset.js rename : browser/base/content/test/urlbar/browser_page_action_menu.js => browser/components/urlbar/tests/legacy/browser_page_action_menu.js rename : browser/base/content/test/urlbar/browser_pasteAndGo.js => browser/components/urlbar/tests/legacy/browser_pasteAndGo.js rename : browser/base/content/test/urlbar/browser_removeUnsafeProtocolsFromURLBarPaste.js => browser/components/urlbar/tests/legacy/browser_removeUnsafeProtocolsFromURLBarPaste.js rename : browser/base/content/test/urlbar/browser_search_favicon.js => browser/components/urlbar/tests/legacy/browser_search_favicon.js rename : browser/base/content/test/urlbar/browser_tabMatchesInAwesomebar.js => browser/components/urlbar/tests/legacy/browser_tabMatchesInAwesomebar.js rename : browser/base/content/test/urlbar/browser_tabMatchesInAwesomebar_perwindowpb.js => browser/components/urlbar/tests/legacy/browser_tabMatchesInAwesomebar_perwindowpb.js rename : browser/base/content/test/urlbar/browser_urlbarAboutHomeLoading.js => browser/components/urlbar/tests/legacy/browser_urlbarAboutHomeLoading.js rename : browser/base/content/test/urlbar/browser_urlbarAddonIframe.js => browser/components/urlbar/tests/legacy/browser_urlbarAddonIframe.js rename : browser/base/content/test/urlbar/browser_urlbarAutoFillTrimURLs.js => browser/components/urlbar/tests/legacy/browser_urlbarAutoFillTrimURLs.js rename : browser/base/content/test/urlbar/browser_urlbarAutofillPreserveCase.js => browser/components/urlbar/tests/legacy/browser_urlbarAutofillPreserveCase.js rename : browser/base/content/test/urlbar/browser_urlbarDecode.js => browser/components/urlbar/tests/legacy/browser_urlbarDecode.js rename : browser/base/content/test/urlbar/browser_urlbarDelete.js => browser/components/urlbar/tests/legacy/browser_urlbarDelete.js rename : browser/base/content/test/urlbar/browser_urlbarEnterAfterMouseOver.js => browser/components/urlbar/tests/legacy/browser_urlbarEnterAfterMouseOver.js rename : browser/base/content/test/urlbar/browser_urlbarKeepStateAcrossTabSwitches.js => browser/components/urlbar/tests/legacy/browser_urlbarKeepStateAcrossTabSwitches.js rename : browser/base/content/test/urlbar/browser_urlbarOneOffs.js => browser/components/urlbar/tests/legacy/browser_urlbarOneOffs.js rename : browser/base/content/test/urlbar/browser_urlbarOneOffs_searchSuggestions.js => browser/components/urlbar/tests/legacy/browser_urlbarOneOffs_searchSuggestions.js rename : browser/base/content/test/urlbar/browser_urlbarOneOffs_settings.js => browser/components/urlbar/tests/legacy/browser_urlbarOneOffs_settings.js rename : browser/base/content/test/urlbar/browser_urlbarPrivateBrowsingWindowChange.js => browser/components/urlbar/tests/legacy/browser_urlbarPrivateBrowsingWindowChange.js rename : browser/base/content/test/urlbar/browser_urlbarRaceWithTabs.js => browser/components/urlbar/tests/legacy/browser_urlbarRaceWithTabs.js rename : browser/base/content/test/urlbar/browser_urlbarSearchFunction.js => browser/components/urlbar/tests/legacy/browser_urlbarSearchFunction.js rename : browser/base/content/test/urlbar/browser_urlbarSearchSuggestions.js => browser/components/urlbar/tests/legacy/browser_urlbarSearchSuggestions.js rename : browser/base/content/test/urlbar/browser_urlbarSearchSuggestions_opt-out.js => browser/components/urlbar/tests/legacy/browser_urlbarSearchSuggestions_opt-out.js rename : browser/base/content/test/urlbar/browser_urlbarSearchTelemetry.js => browser/components/urlbar/tests/legacy/browser_urlbarSearchTelemetry.js rename : browser/base/content/test/urlbar/browser_urlbarStop.js => browser/components/urlbar/tests/legacy/browser_urlbarStop.js rename : browser/base/content/test/urlbar/browser_urlbarStopSearchOnSelection.js => browser/components/urlbar/tests/legacy/browser_urlbarStopSearchOnSelection.js rename : browser/base/content/test/urlbar/browser_urlbarTokenAlias.js => browser/components/urlbar/tests/legacy/browser_urlbarTokenAlias.js rename : browser/base/content/test/urlbar/browser_urlbar_autoFill_backspaced.js => browser/components/urlbar/tests/legacy/browser_urlbar_autoFill_backspaced.js rename : browser/base/content/test/urlbar/browser_urlbar_canonize_on_autofill.js => browser/components/urlbar/tests/legacy/browser_urlbar_canonize_on_autofill.js rename : browser/base/content/test/urlbar/browser_urlbar_remove_match.js => browser/components/urlbar/tests/legacy/browser_urlbar_remove_match.js rename : browser/base/content/test/urlbar/browser_urlbar_search_no_speculative_connect_with_client_cert.js => browser/components/urlbar/tests/legacy/browser_urlbar_search_no_speculative_connect_with_client_cert.js rename : browser/base/content/test/urlbar/browser_urlbar_search_speculative_connect.js => browser/components/urlbar/tests/legacy/browser_urlbar_search_speculative_connect.js rename : browser/base/content/test/urlbar/browser_urlbar_search_speculative_connect_engine.js => browser/components/urlbar/tests/legacy/browser_urlbar_search_speculative_connect_engine.js rename : browser/base/content/test/urlbar/browser_urlbar_search_speculative_connect_mousedown.js => browser/components/urlbar/tests/legacy/browser_urlbar_search_speculative_connect_mousedown.js rename : browser/base/content/test/urlbar/browser_urlbar_stop_pending.js => browser/components/urlbar/tests/legacy/browser_urlbar_stop_pending.js extra : rebase_source : fbf080c3d6caf9e4e501aebc4c085fe8babc3e27
This commit is contained in:
Cosmin Sabou
commit
dad27b903a
@ -20,7 +20,7 @@ ad75e912fbc1d64ed63c1d0a51d7157566de1887 # gecko-dev
|
||||
|
||||
# Bug 1513205 - Also update the tests to match the Google coding style
|
||||
# https://hg.mozilla.org/integration/autoland/rev/09c71a7cf75a
|
||||
13452f36fb36ad09d81f6b53eaf7928ee63f05e3 # cinnabar
|
||||
13452f36fb36ad09d81f6b53eaf7928ee63f05e3 # cinnabar
|
||||
6f45c666bc7f98c3e3250a7c2cf8dc3fb95d12d7 # gecko-dev
|
||||
|
||||
# Bug 1519636 - Reformat everything to the Google coding style
|
||||
@ -39,5 +39,6 @@ d25e4032d4d15e732a78082505d62b6d6ffa1445 # cinnabar
|
||||
e5e885ae3128a6878d08df4ff6baaf3fc4a4b9e8 # gecko-dev
|
||||
# Bug 1513205 - Ride along, update some code to match the Google coding style
|
||||
# https://hg.mozilla.org/integration/autoland/rev/039a7c0c18fb
|
||||
1ce955dcb2e09fd9ce19c1ec6c470f75db486bd2 # cinnabar
|
||||
1ce955dcb2e09fd9ce19c1ec6c470f75db486bd2 # cinnabar
|
||||
7cf43b9bc01d650f87deceb65f336cdac7c0e78f # gecko-dev
|
||||
|
||||
|
||||
4
Cargo.lock
generated
4
Cargo.lock
generated
@ -2990,7 +2990,7 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "webrender"
|
||||
version = "0.58.0"
|
||||
version = "0.59.0"
|
||||
dependencies = [
|
||||
"app_units 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
"bincode 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
@ -3060,7 +3060,7 @@ dependencies = [
|
||||
"rayon 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
"thread_profiler 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
"uuid 0.6.5 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
"webrender 0.58.0",
|
||||
"webrender 0.59.0",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
|
||||
@ -973,6 +973,9 @@ pref("security.certerrors.recordEventTelemetry", true);
|
||||
// Whether to start the private browsing mode at application startup
|
||||
pref("browser.privatebrowsing.autostart", false);
|
||||
|
||||
// Whether to show the new private browsing UI with in-content search box.
|
||||
pref("browser.privatebrowsing.searchUI", true);
|
||||
|
||||
// Whether the bookmark panel should be shown when bookmarking a page.
|
||||
pref("browser.bookmarks.editDialog.showForNewBookmarks", true);
|
||||
|
||||
|
||||
@ -97,9 +97,6 @@ with Files("test/touch/**"):
|
||||
with Files("test/trackingUI/**"):
|
||||
BUG_COMPONENT = ("Firefox", "Tracking Protection")
|
||||
|
||||
with Files("test/urlbar/**"):
|
||||
BUG_COMPONENT = ("Firefox", "Address Bar")
|
||||
|
||||
with Files("test/webextensions/**"):
|
||||
BUG_COMPONENT = ("WebExtensions", "Untriaged")
|
||||
|
||||
|
||||
@ -77,4 +77,6 @@ function onLoad() {
|
||||
document.documentElement.getButton("extra1").hidden = true;
|
||||
document.getElementById("resetProfileInstead").hidden = true;
|
||||
}
|
||||
document.l10n.translateElements(document.querySelectorAll("label, description")).then(
|
||||
() => window.sizeToContent());
|
||||
}
|
||||
|
||||
@ -4,46 +4,43 @@
|
||||
- License, v. 2.0. If a copy of the MPL was not distributed with this
|
||||
- file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
|
||||
|
||||
<!DOCTYPE prefwindow [
|
||||
<!ENTITY % brandDTD SYSTEM "chrome://branding/locale/brand.dtd" >
|
||||
%brandDTD;
|
||||
<!ENTITY % safeModeDTD SYSTEM "chrome://browser/locale/safeMode.dtd" >
|
||||
%safeModeDTD;
|
||||
<!ENTITY % resetProfileDTD SYSTEM "chrome://global/locale/resetProfile.dtd" >
|
||||
%resetProfileDTD;
|
||||
]>
|
||||
|
||||
<?xml-stylesheet href="chrome://global/skin/"?>
|
||||
<?xml-stylesheet href="chrome://browser/content/safeMode.css"?>
|
||||
|
||||
<dialog id="safeModeDialog"
|
||||
xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
|
||||
title="&safeModeDialog.title;"
|
||||
data-l10n-id="safe-mode-window"
|
||||
data-l10n-attrs="title,style"
|
||||
buttons="accept,extra1"
|
||||
buttonlabelaccept="&startSafeMode.label;"
|
||||
buttonlabelextra1="&refreshProfile.label;"
|
||||
maxwidth="&window.maxWidth;"
|
||||
buttonidaccept="start-safe-mode"
|
||||
buttonidextra1="refresh-profile"
|
||||
ondialogaccept="return onDefaultButton()"
|
||||
ondialogcancel="onCancel();"
|
||||
ondialogextra1="return onExtra1()"
|
||||
onload="onLoad()">
|
||||
|
||||
<linkset>
|
||||
<link rel="localization" href="branding/brand.ftl"/>
|
||||
<link rel="localization" href="browser/safeMode.ftl"/>
|
||||
</linkset>
|
||||
|
||||
<script type="application/javascript" src="chrome://browser/content/safeMode.js"/>
|
||||
|
||||
|
||||
<vbox id="autoSafeMode" hidden="true">
|
||||
<description>&autoSafeModeDescription3.label;</description>
|
||||
<description data-l10n-id="auto-safe-mode-description"/>
|
||||
</vbox>
|
||||
|
||||
<vbox id="safeMode">
|
||||
<label>&safeModeDescription3.label;</label>
|
||||
<label data-l10n-id="safe-mode-description" />
|
||||
<separator class="thin"/>
|
||||
<label>&safeModeDescription5.label;</label>
|
||||
<label data-l10n-id="safe-mode-description-details" />
|
||||
<separator class="thin"/>
|
||||
<label id="resetProfileInstead">&refreshProfileInstead.label;</label>
|
||||
<label id="resetProfileInstead" data-l10n-id="refresh-profile-instead"/>
|
||||
</vbox>
|
||||
|
||||
<vbox id="resetProfile" hidden="true">
|
||||
<label id="resetProfileInstead">&refreshProfileInstead.label;</label>
|
||||
<label data-l10n-id="refresh-profile-instead" />
|
||||
</vbox>
|
||||
|
||||
<separator class="thin"/>
|
||||
|
||||
@ -1,164 +0,0 @@
|
||||
[DEFAULT]
|
||||
support-files =
|
||||
dummy_page.html
|
||||
head.js
|
||||
|
||||
[browser_URLBarSetURI.js]
|
||||
skip-if = (os == "linux" || os == "mac") && debug # bug 970052, bug 970053
|
||||
[browser_action_keyword.js]
|
||||
skip-if = os == "linux" # Bug 1188154
|
||||
support-files =
|
||||
print_postdata.sjs
|
||||
[browser_action_keyword_override.js]
|
||||
[browser_action_searchengine.js]
|
||||
[browser_action_searchengine_alias.js]
|
||||
[browser_autocomplete_a11y_label.js]
|
||||
skip-if = (verify && !debug && (os == 'win'))
|
||||
[browser_autocomplete_autoselect.js]
|
||||
[browser_autocomplete_cursor.js]
|
||||
skip-if = verify
|
||||
[browser_autocomplete_edit_completed.js]
|
||||
[browser_autocomplete_enter_race.js]
|
||||
[browser_autocomplete_no_title.js]
|
||||
[browser_autocomplete_readline_navigation.js]
|
||||
skip-if = os != "mac" # Mac only feature
|
||||
[browser_autocomplete_tag_star_visibility.js]
|
||||
[browser_bug1104165-switchtab-decodeuri.js]
|
||||
[browser_bug1003461-switchtab-override.js]
|
||||
skip-if = (verify && debug && (os == 'win'))
|
||||
[browser_bug1024133-switchtab-override-keynav.js]
|
||||
[browser_bug1025195_switchToTabHavingURI_aOpenParams.js]
|
||||
[browser_bug1070778.js]
|
||||
[browser_bug1225194-remotetab.js]
|
||||
[browser_bug304198.js]
|
||||
[browser_bug556061.js]
|
||||
subsuite = clipboard
|
||||
[browser_bug562649.js]
|
||||
support-files = file_bug562649.html
|
||||
[browser_bug623155.js]
|
||||
support-files =
|
||||
redirect_bug623155.sjs
|
||||
[browser_bug783614.js]
|
||||
[browser_canonizeURL.js]
|
||||
[browser_dragdropURL.js]
|
||||
[browser_locationBarCommand.js]
|
||||
[browser_locationBarExternalLoad.js]
|
||||
[browser_moz_action_link.js]
|
||||
[browser_new_tab_urlbar_reset.js]
|
||||
[browser_page_action_menu.js]
|
||||
[browser_page_action_menu_add_search_engine.js]
|
||||
support-files =
|
||||
page_action_menu_add_search_engine_one.html
|
||||
page_action_menu_add_search_engine_many.html
|
||||
page_action_menu_add_search_engine_same_names.html
|
||||
page_action_menu_add_search_engine_0.xml
|
||||
page_action_menu_add_search_engine_1.xml
|
||||
page_action_menu_add_search_engine_2.xml
|
||||
[browser_page_action_menu_clipboard.js]
|
||||
subsuite = clipboard
|
||||
[browser_page_action_menu_share_mac.js]
|
||||
skip-if = os != "mac" # Mac only feature
|
||||
[browser_page_action_menu_share_win.js]
|
||||
support-files =
|
||||
browser_page_action_menu_share_win.html
|
||||
skip-if = os != "win" # Windows only feature
|
||||
[browser_pasteAndGo.js]
|
||||
subsuite = clipboard
|
||||
[browser_populateAfterPushState.js]
|
||||
[browser_removeUnsafeProtocolsFromURLBarPaste.js]
|
||||
subsuite = clipboard
|
||||
[browser_search_favicon.js]
|
||||
[browser_tabMatchesInAwesomebar.js]
|
||||
support-files =
|
||||
moz.png
|
||||
[browser_tabMatchesInAwesomebar_perwindowpb.js]
|
||||
skip-if = os == 'linux' # Bug 1104755
|
||||
[browser_urlbarAddonIframe.js]
|
||||
support-files =
|
||||
Panel.jsm
|
||||
urlbarAddonIframe.html
|
||||
urlbarAddonIframe.js
|
||||
urlbarAddonIframeContentScript.js
|
||||
[browser_urlbarAboutHomeLoading.js]
|
||||
[browser_urlbarAutofillPreserveCase.js]
|
||||
[browser_urlbarAutoFillTrimURLs.js]
|
||||
[browser_urlbarCopying.js]
|
||||
subsuite = clipboard
|
||||
support-files =
|
||||
authenticate.sjs
|
||||
[browser_urlbarDecode.js]
|
||||
[browser_urlbarDelete.js]
|
||||
[browser_urlbarEnter.js]
|
||||
[browser_urlbar_whereToOpen.js]
|
||||
[browser_urlbarEnterAfterMouseOver.js]
|
||||
skip-if = os == "linux" # Bug 1073339 - Investigate autocomplete test unreliability on Linux/e10s
|
||||
[browser_urlbarFocusedCmdK.js]
|
||||
[browser_urlbarHashChangeProxyState.js]
|
||||
[browser_urlbarKeepStateAcrossTabSwitches.js]
|
||||
[browser_urlbarOneOffs.js]
|
||||
support-files =
|
||||
searchSuggestionEngine.xml
|
||||
searchSuggestionEngine.sjs
|
||||
[browser_urlbarOneOffs_searchSuggestions.js]
|
||||
support-files =
|
||||
searchSuggestionEngine.xml
|
||||
searchSuggestionEngine.sjs
|
||||
[browser_urlbarOneOffs_settings.js]
|
||||
support-files =
|
||||
searchSuggestionEngine.xml
|
||||
searchSuggestionEngine.sjs
|
||||
[browser_urlbarPlaceholder.js]
|
||||
support-files =
|
||||
searchSuggestionEngine.xml
|
||||
searchSuggestionEngine.sjs
|
||||
[browser_urlbarPrivateBrowsingWindowChange.js]
|
||||
[browser_urlbarRaceWithTabs.js]
|
||||
skip-if = os == "linux" # Bug 1382456
|
||||
[browser_urlbarRevert.js]
|
||||
[browser_urlbarSearchFunction.js]
|
||||
[browser_urlbarSearchSingleWordNotification.js]
|
||||
[browser_urlbarSearchSuggestions.js]
|
||||
support-files =
|
||||
searchSuggestionEngine.xml
|
||||
searchSuggestionEngine.sjs
|
||||
[browser_urlbarSearchSuggestions_opt-out.js]
|
||||
support-files =
|
||||
searchSuggestionEngine.xml
|
||||
searchSuggestionEngine.sjs
|
||||
[browser_urlbarSearchTelemetry.js]
|
||||
support-files =
|
||||
searchSuggestionEngine.xml
|
||||
searchSuggestionEngine.sjs
|
||||
[browser_urlbarStop.js]
|
||||
[browser_urlbarTokenAlias.js]
|
||||
[browser_urlbarUpdateForDomainCompletion.js]
|
||||
[browser_urlbar_autoFill_backspaced.js]
|
||||
[browser_urlbar_canonize_on_autofill.js]
|
||||
[browser_urlbar_blanking.js]
|
||||
support-files =
|
||||
file_blank_but_not_blank.html
|
||||
[browser_urlbar_locationchange_urlbar_edit_dos.js]
|
||||
support-files =
|
||||
file_urlbar_edit_dos.html
|
||||
[browser_urlbar_remove_match.js]
|
||||
[browser_urlbar_searchsettings.js]
|
||||
[browser_urlbar_search_speculative_connect.js]
|
||||
[browser_urlbar_search_speculative_connect_engine.js]
|
||||
support-files =
|
||||
searchSuggestionEngine2.xml
|
||||
searchSuggestionEngine.sjs
|
||||
[browser_urlbar_search_speculative_connect_mousedown.js]
|
||||
[browser_urlbar_search_no_speculative_connect_with_client_cert.js]
|
||||
[browser_urlbar_stop_pending.js]
|
||||
support-files =
|
||||
slow-page.sjs
|
||||
[browser_urlbar_remoteness_switch.js]
|
||||
run-if = e10s
|
||||
[browser_wyciwyg_urlbarCopying.js]
|
||||
subsuite = clipboard
|
||||
support-files =
|
||||
test_wyciwyg_copying.html
|
||||
[browser_urlbarStopSearchOnSelection.js]
|
||||
support-files =
|
||||
searchSuggestionEngineSlow.xml
|
||||
searchSuggestionEngine.sjs
|
||||
@ -1,8 +0,0 @@
|
||||
<html>
|
||||
<head>
|
||||
<script src="http://mochi.test:8888/browser/browser/base/content/test/urlbar/urlbarAddonIframe.js"></script>
|
||||
</head>
|
||||
<body>
|
||||
Hello
|
||||
</body>
|
||||
</html>
|
||||
@ -53,7 +53,6 @@ BROWSER_CHROME_MANIFESTS += [
|
||||
'content/test/tabs/browser.ini',
|
||||
'content/test/touch/browser.ini',
|
||||
'content/test/trackingUI/browser.ini',
|
||||
'content/test/urlbar/browser.ini',
|
||||
'content/test/webextensions/browser.ini',
|
||||
'content/test/webrtc/browser.ini',
|
||||
]
|
||||
|
||||
@ -7,11 +7,13 @@
|
||||
var EXPORTED_SYMBOLS = ["AboutPrivateBrowsingHandler"];
|
||||
|
||||
ChromeUtils.import("resource://gre/modules/remotepagemanager/RemotePageManagerParent.jsm");
|
||||
ChromeUtils.import("resource://gre/modules/Services.jsm");
|
||||
|
||||
var AboutPrivateBrowsingHandler = {
|
||||
_topics: [
|
||||
"DontShowIntroPanelAgain",
|
||||
"OpenPrivateWindow",
|
||||
"SearchHandoff",
|
||||
],
|
||||
|
||||
init() {
|
||||
@ -40,6 +42,67 @@ var AboutPrivateBrowsingHandler = {
|
||||
win.ContentBlocking.dontShowIntroPanelAgain();
|
||||
break;
|
||||
}
|
||||
case "SearchHandoff": {
|
||||
let searchAlias = "";
|
||||
let searchAliases = Services.search.defaultEngine.wrappedJSObject.__internalAliases;
|
||||
if (searchAliases && searchAliases.length > 0) {
|
||||
searchAlias = `${searchAliases[0]} `;
|
||||
}
|
||||
let urlBar = aMessage.target.browser.ownerGlobal.gURLBar;
|
||||
let isFirstChange = true;
|
||||
|
||||
if (!aMessage.data || !aMessage.data.text) {
|
||||
urlBar.hiddenFocus();
|
||||
} else {
|
||||
// Pass the provided text to the awesomebar. Prepend the @engine shortcut.
|
||||
urlBar.search(`${searchAlias}${aMessage.data.text}`);
|
||||
isFirstChange = false;
|
||||
}
|
||||
|
||||
let checkFirstChange = () => {
|
||||
// Check if this is the first change since we hidden focused. If it is,
|
||||
// remove hidden focus styles, prepend the search alias and hide the
|
||||
// in-content search.
|
||||
if (isFirstChange) {
|
||||
isFirstChange = false;
|
||||
urlBar.removeHiddenFocus();
|
||||
urlBar.search(searchAlias);
|
||||
aMessage.target.sendAsyncMessage("HideSearch");
|
||||
urlBar.removeEventListener("compositionstart", checkFirstChange);
|
||||
urlBar.removeEventListener("paste", checkFirstChange);
|
||||
}
|
||||
};
|
||||
|
||||
let onKeydown = ev => {
|
||||
// Check if the keydown will cause a value change.
|
||||
if (ev.key.length === 1 && !ev.altKey && !ev.ctrlKey && !ev.metaKey) {
|
||||
checkFirstChange();
|
||||
}
|
||||
// If the Esc button is pressed, we are done. Show in-content search and cleanup.
|
||||
if (ev.key === "Escape") {
|
||||
onDone();
|
||||
}
|
||||
};
|
||||
|
||||
let onDone = () => {
|
||||
// We are done. Show in-content search again and cleanup.
|
||||
aMessage.target.sendAsyncMessage("ShowSearch");
|
||||
urlBar.removeHiddenFocus();
|
||||
|
||||
urlBar.removeEventListener("keydown", onKeydown);
|
||||
urlBar.removeEventListener("mousedown", onDone);
|
||||
urlBar.removeEventListener("blur", onDone);
|
||||
urlBar.removeEventListener("compositionstart", checkFirstChange);
|
||||
urlBar.removeEventListener("paste", checkFirstChange);
|
||||
};
|
||||
|
||||
urlBar.addEventListener("keydown", onKeydown);
|
||||
urlBar.addEventListener("mousedown", onDone);
|
||||
urlBar.addEventListener("blur", onDone);
|
||||
urlBar.addEventListener("compositionstart", checkFirstChange);
|
||||
urlBar.addEventListener("paste", checkFirstChange);
|
||||
break;
|
||||
}
|
||||
}
|
||||
},
|
||||
};
|
||||
|
||||
@ -93,6 +93,8 @@ for (const src of ${JSON.stringify(scripts, null, 2)}) {
|
||||
script.src = src;
|
||||
}
|
||||
</script>`;
|
||||
// Comment to indicate if prerendered version of html is used. See Bug 1516034
|
||||
const isPrerenderedStatus = "<!-- Prerendered version html not shown -->";
|
||||
return `<!doctype html>
|
||||
<html lang="${options.locale}" dir="${options.direction}">
|
||||
<head>
|
||||
@ -108,6 +110,7 @@ for (const src of ${JSON.stringify(scripts, null, 2)}) {
|
||||
<div id="snippets-container">
|
||||
<div id="snippets"></div>
|
||||
</div>${options.noscripts ? "" : scriptTag}
|
||||
${isPrerendered ? "" : isPrerenderedStatus}
|
||||
</body>
|
||||
</html>
|
||||
`;
|
||||
|
||||
@ -28,11 +28,22 @@ class _PrerenderData {
|
||||
return result.concat(next.oneOf);
|
||||
} else if (next && next.indexedDB) {
|
||||
return result.concat(next.indexedDB);
|
||||
} else if (next && next.jsonPrefs) {
|
||||
return result.concat(next.jsonPrefs);
|
||||
}
|
||||
throw new Error("Your validation configuration is not properly configured");
|
||||
}, []);
|
||||
}
|
||||
|
||||
_isPrefEnabled(prefObj) {
|
||||
try {
|
||||
let data = JSON.parse(prefObj);
|
||||
return data && data.enabled;
|
||||
} catch (e) {
|
||||
return null;
|
||||
}
|
||||
}
|
||||
|
||||
arePrefsValid(getPref, indexedDBPrefs) {
|
||||
for (const prefs of this.validation) {
|
||||
// {oneOf: ["foo", "bar"]}
|
||||
@ -45,6 +56,13 @@ class _PrerenderData {
|
||||
if (anyModifiedPrefs) {
|
||||
return false;
|
||||
}
|
||||
// {jsonPrefs: ["foo", "bar"]}
|
||||
} else if (prefs && prefs.jsonPrefs) {
|
||||
const isPrefModified =
|
||||
prefs.jsonPrefs.some(name => this._isPrefEnabled(getPref(name)) !== this.initialPrefs[name].enabled);
|
||||
if (isPrefModified) {
|
||||
return false;
|
||||
}
|
||||
// "foo"
|
||||
} else if (getPref(prefs) !== this.initialPrefs[prefs]) {
|
||||
return false;
|
||||
@ -64,6 +82,7 @@ this.PrerenderData = new _PrerenderData({
|
||||
"feeds.section.highlights": true,
|
||||
"sectionOrder": "topsites,topstories,highlights",
|
||||
"collapsed": false,
|
||||
"discoverystream.config": {"enabled": false},
|
||||
},
|
||||
// Prefs listed as invalidating will prevent the prerendered version
|
||||
// of AS from being used if their value is something other than what is listed
|
||||
@ -82,6 +101,9 @@ this.PrerenderData = new _PrerenderData({
|
||||
// If any component has the following preference set to `true` it will
|
||||
// invalidate the prerendered version.
|
||||
{indexedDB: ["collapsed"]},
|
||||
// For below prefs, parse value to check enabled property. If enabled property
|
||||
// differs from initial prefs enabled value, prerendering cannot be used
|
||||
{jsonPrefs: ["discoverystream.config"]},
|
||||
],
|
||||
initialSections: [
|
||||
{
|
||||
|
||||
@ -161,11 +161,13 @@ export class _DiscoveryStreamBase extends React.PureComponent {
|
||||
case "HorizontalRule":
|
||||
return (<HorizontalRule />);
|
||||
case "List":
|
||||
rows = this.extractRows(component, MAX_ROWS_LIST);
|
||||
rows = this.extractRows(component,
|
||||
Math.min(component.properties.items, MAX_ROWS_LIST));
|
||||
return (
|
||||
<ImpressionStats rows={rows} dispatch={this.props.dispatch} source={component.type}>
|
||||
<List
|
||||
feed={component.feed}
|
||||
items={component.properties.items}
|
||||
type={component.type}
|
||||
header={component.header} />
|
||||
</ImpressionStats>
|
||||
|
||||
@ -19,7 +19,7 @@
|
||||
|
||||
// "Full width layout"
|
||||
.ds-column-9 &,
|
||||
.dscolumn-10 &,
|
||||
.ds-column-10 &,
|
||||
.ds-column-11 &,
|
||||
.ds-column-12 & {
|
||||
grid-template-columns: repeat(4, 1fr);
|
||||
|
||||
@ -28,13 +28,31 @@ $item-line-height: 20;
|
||||
|
||||
.ds-list {
|
||||
display: grid;
|
||||
grid-template-columns: repeat(3, 1fr);
|
||||
grid-row-gap: 18px;
|
||||
grid-row-gap: 24px;
|
||||
grid-column-gap: 24px;
|
||||
|
||||
// reset some stuff from <ul>. Should maybe be hoisted when we have better
|
||||
// regression detection?
|
||||
padding-inline-start: 0;
|
||||
|
||||
// "2/3 width layout"
|
||||
.ds-column-5 &,
|
||||
.ds-column-6 &,
|
||||
.ds-column-7 &,
|
||||
.ds-column-8 & {
|
||||
grid-template-columns: repeat(2, 1fr);
|
||||
grid-row-gap: 24px;
|
||||
}
|
||||
|
||||
// "Full width layout"
|
||||
.ds-column-9 &,
|
||||
.ds-column-10 &,
|
||||
.ds-column-11 &,
|
||||
.ds-column-12 & {
|
||||
grid-template-columns: repeat(3, 1fr);
|
||||
grid-row-gap: 18px;
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
// XXX this is gross, and attaches the bottom-border to the item above.
|
||||
|
||||
@ -1829,7 +1829,7 @@ main {
|
||||
grid-template-columns: repeat(2, 1fr);
|
||||
grid-gap: 24px; }
|
||||
.ds-column-9 .ds-card-grid,
|
||||
.dscolumn-10 .ds-card-grid,
|
||||
.ds-column-10 .ds-card-grid,
|
||||
.ds-column-11 .ds-card-grid,
|
||||
.ds-column-12 .ds-card-grid {
|
||||
grid-template-columns: repeat(4, 1fr);
|
||||
@ -1962,10 +1962,21 @@ main {
|
||||
|
||||
.ds-list {
|
||||
display: grid;
|
||||
grid-template-columns: repeat(3, 1fr);
|
||||
grid-row-gap: 18px;
|
||||
grid-row-gap: 24px;
|
||||
grid-column-gap: 24px;
|
||||
padding-inline-start: 0; }
|
||||
.ds-column-5 .ds-list,
|
||||
.ds-column-6 .ds-list,
|
||||
.ds-column-7 .ds-list,
|
||||
.ds-column-8 .ds-list {
|
||||
grid-template-columns: repeat(2, 1fr);
|
||||
grid-row-gap: 24px; }
|
||||
.ds-column-9 .ds-list,
|
||||
.ds-column-10 .ds-list,
|
||||
.ds-column-11 .ds-list,
|
||||
.ds-column-12 .ds-list {
|
||||
grid-template-columns: repeat(3, 1fr);
|
||||
grid-row-gap: 18px; }
|
||||
|
||||
.ds-list-item:nth-child(-n+3) {
|
||||
border-bottom: 2px solid rgba(177, 177, 179, 0.36);
|
||||
|
||||
File diff suppressed because one or more lines are too long
@ -1832,7 +1832,7 @@ main {
|
||||
grid-template-columns: repeat(2, 1fr);
|
||||
grid-gap: 24px; }
|
||||
.ds-column-9 .ds-card-grid,
|
||||
.dscolumn-10 .ds-card-grid,
|
||||
.ds-column-10 .ds-card-grid,
|
||||
.ds-column-11 .ds-card-grid,
|
||||
.ds-column-12 .ds-card-grid {
|
||||
grid-template-columns: repeat(4, 1fr);
|
||||
@ -1965,10 +1965,21 @@ main {
|
||||
|
||||
.ds-list {
|
||||
display: grid;
|
||||
grid-template-columns: repeat(3, 1fr);
|
||||
grid-row-gap: 18px;
|
||||
grid-row-gap: 24px;
|
||||
grid-column-gap: 24px;
|
||||
padding-inline-start: 0; }
|
||||
.ds-column-5 .ds-list,
|
||||
.ds-column-6 .ds-list,
|
||||
.ds-column-7 .ds-list,
|
||||
.ds-column-8 .ds-list {
|
||||
grid-template-columns: repeat(2, 1fr);
|
||||
grid-row-gap: 24px; }
|
||||
.ds-column-9 .ds-list,
|
||||
.ds-column-10 .ds-list,
|
||||
.ds-column-11 .ds-list,
|
||||
.ds-column-12 .ds-list {
|
||||
grid-template-columns: repeat(3, 1fr);
|
||||
grid-row-gap: 18px; }
|
||||
|
||||
.ds-list-item:nth-child(-n+3) {
|
||||
border-bottom: 2px solid rgba(177, 177, 179, 0.36);
|
||||
|
||||
File diff suppressed because one or more lines are too long
@ -1829,7 +1829,7 @@ main {
|
||||
grid-template-columns: repeat(2, 1fr);
|
||||
grid-gap: 24px; }
|
||||
.ds-column-9 .ds-card-grid,
|
||||
.dscolumn-10 .ds-card-grid,
|
||||
.ds-column-10 .ds-card-grid,
|
||||
.ds-column-11 .ds-card-grid,
|
||||
.ds-column-12 .ds-card-grid {
|
||||
grid-template-columns: repeat(4, 1fr);
|
||||
@ -1962,10 +1962,21 @@ main {
|
||||
|
||||
.ds-list {
|
||||
display: grid;
|
||||
grid-template-columns: repeat(3, 1fr);
|
||||
grid-row-gap: 18px;
|
||||
grid-row-gap: 24px;
|
||||
grid-column-gap: 24px;
|
||||
padding-inline-start: 0; }
|
||||
.ds-column-5 .ds-list,
|
||||
.ds-column-6 .ds-list,
|
||||
.ds-column-7 .ds-list,
|
||||
.ds-column-8 .ds-list {
|
||||
grid-template-columns: repeat(2, 1fr);
|
||||
grid-row-gap: 24px; }
|
||||
.ds-column-9 .ds-list,
|
||||
.ds-column-10 .ds-list,
|
||||
.ds-column-11 .ds-list,
|
||||
.ds-column-12 .ds-list {
|
||||
grid-template-columns: repeat(3, 1fr);
|
||||
grid-row-gap: 18px; }
|
||||
|
||||
.ds-list-item:nth-child(-n+3) {
|
||||
border-bottom: 2px solid rgba(177, 177, 179, 0.36);
|
||||
|
||||
File diff suppressed because one or more lines are too long
@ -6145,11 +6145,22 @@ class _PrerenderData {
|
||||
return result.concat(next.oneOf);
|
||||
} else if (next && next.indexedDB) {
|
||||
return result.concat(next.indexedDB);
|
||||
} else if (next && next.jsonPrefs) {
|
||||
return result.concat(next.jsonPrefs);
|
||||
}
|
||||
throw new Error("Your validation configuration is not properly configured");
|
||||
}, []);
|
||||
}
|
||||
|
||||
_isPrefEnabled(prefObj) {
|
||||
try {
|
||||
let data = JSON.parse(prefObj);
|
||||
return data && data.enabled;
|
||||
} catch (e) {
|
||||
return null;
|
||||
}
|
||||
}
|
||||
|
||||
arePrefsValid(getPref, indexedDBPrefs) {
|
||||
for (const prefs of this.validation) {
|
||||
// {oneOf: ["foo", "bar"]}
|
||||
@ -6162,6 +6173,12 @@ class _PrerenderData {
|
||||
if (anyModifiedPrefs) {
|
||||
return false;
|
||||
}
|
||||
// {jsonPrefs: ["foo", "bar"]}
|
||||
} else if (prefs && prefs.jsonPrefs) {
|
||||
const isPrefModified = prefs.jsonPrefs.some(name => this._isPrefEnabled(getPref(name)) !== this.initialPrefs[name].enabled);
|
||||
if (isPrefModified) {
|
||||
return false;
|
||||
}
|
||||
// "foo"
|
||||
} else if (getPref(prefs) !== this.initialPrefs[prefs]) {
|
||||
return false;
|
||||
@ -6179,7 +6196,8 @@ var PrerenderData = new _PrerenderData({
|
||||
"feeds.section.topstories": true,
|
||||
"feeds.section.highlights": true,
|
||||
"sectionOrder": "topsites,topstories,highlights",
|
||||
"collapsed": false
|
||||
"collapsed": false,
|
||||
"discoverystream.config": { "enabled": false }
|
||||
},
|
||||
// Prefs listed as invalidating will prevent the prerendered version
|
||||
// of AS from being used if their value is something other than what is listed
|
||||
@ -6193,7 +6211,10 @@ var PrerenderData = new _PrerenderData({
|
||||
{ oneOf: ["feeds.section.topstories", "feeds.section.highlights"] },
|
||||
// If any component has the following preference set to `true` it will
|
||||
// invalidate the prerendered version.
|
||||
{ indexedDB: ["collapsed"] }],
|
||||
{ indexedDB: ["collapsed"] },
|
||||
// For below prefs, parse value to check enabled property. If enabled property
|
||||
// differs from initial prefs enabled value, prerendering cannot be used
|
||||
{ jsonPrefs: ["discoverystream.config"] }],
|
||||
initialSections: [{
|
||||
enabled: true,
|
||||
icon: "pocket",
|
||||
@ -7726,12 +7747,13 @@ class DiscoveryStreamBase_DiscoveryStreamBase extends external_React_default.a.P
|
||||
case "HorizontalRule":
|
||||
return external_React_default.a.createElement(HorizontalRule_HorizontalRule, null);
|
||||
case "List":
|
||||
rows = this.extractRows(component, MAX_ROWS_LIST);
|
||||
rows = this.extractRows(component, Math.min(component.properties.items, MAX_ROWS_LIST));
|
||||
return external_React_default.a.createElement(
|
||||
ImpressionStats["ImpressionStats"],
|
||||
{ rows: rows, dispatch: this.props.dispatch, source: component.type },
|
||||
external_React_default.a.createElement(List, {
|
||||
feed: component.feed,
|
||||
items: component.properties.items,
|
||||
type: component.type,
|
||||
header: component.header })
|
||||
);
|
||||
|
||||
File diff suppressed because one or more lines are too long
@ -91,6 +91,11 @@ section_disclaimer_topstories_buttontext=Okay, got it
|
||||
# what is shown for the homepage, new windows, and new tabs.
|
||||
prefs_home_header=Firefox Home Content
|
||||
prefs_home_description=Choose what content you want on your Firefox Home screen.
|
||||
|
||||
prefs_content_discovery_header=Firefox Home
|
||||
prefs_content_discovery_description=Content Discovery in Firefox Home allows you to discover high-quality, relevant articles from across the web.
|
||||
prefs_content_discovery_button=Turn Off Content Discovery
|
||||
|
||||
# LOCALIZATION NOTE (prefs_section_rows_option): This is a semi-colon list of
|
||||
# plural forms used in a drop down of multiple row options (1 row, 2 rows).
|
||||
# See: http://developer.mozilla.org/en/docs/Localization_and_Plurals
|
||||
@ -144,7 +149,6 @@ pocket_read_more=Popular Topics:
|
||||
# end of the list of popular topic links.
|
||||
pocket_read_even_more=View More Stories
|
||||
pocket_more_reccommendations=More Recommendations
|
||||
pocket_learn_more=Learn More
|
||||
pocket_how_it_works=How it works
|
||||
pocket_cta_button=Get Pocket
|
||||
pocket_cta_text=Save the stories you love in Pocket, and fuel your mind with fascinating reads.
|
||||
|
||||
@ -94,7 +94,7 @@ prefs_home_description=Välj vilket innehåll du vill ha på din startskärm i F
|
||||
|
||||
prefs_content_discovery_header=Firefox startsida
|
||||
prefs_content_discovery_description=Content Discovery på Firefox startsida låter dig upptäcka högkvalitativa, relevanta artiklar från hela webben.
|
||||
prefs_content_discovery_button=Stäng av innehållsupptäckt
|
||||
prefs_content_discovery_button=Stäng av Content Discovery
|
||||
|
||||
# LOCALIZATION NOTE (prefs_section_rows_option): This is a semi-colon list of
|
||||
# plural forms used in a drop down of multiple row options (1 row, 2 rows).
|
||||
|
||||
@ -13,5 +13,6 @@
|
||||
<div id="snippets-container">
|
||||
<div id="snippets"></div>
|
||||
</div>
|
||||
<!-- Prerendered version html not shown -->
|
||||
</body>
|
||||
</html>
|
||||
|
||||
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
@ -35,5 +35,6 @@ for (const src of [
|
||||
script.src = src;
|
||||
}
|
||||
</script>
|
||||
<!-- Prerendered version html not shown -->
|
||||
</body>
|
||||
</html>
|
||||
|
||||
@ -13,5 +13,6 @@
|
||||
<div id="snippets-container">
|
||||
<div id="snippets"></div>
|
||||
</div>
|
||||
<!-- Prerendered version html not shown -->
|
||||
</body>
|
||||
</html>
|
||||
|
||||
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
@ -35,5 +35,6 @@ for (const src of [
|
||||
script.src = src;
|
||||
}
|
||||
</script>
|
||||
<!-- Prerendered version html not shown -->
|
||||
</body>
|
||||
</html>
|
||||
|
||||
@ -13,5 +13,6 @@
|
||||
<div id="snippets-container">
|
||||
<div id="snippets"></div>
|
||||
</div>
|
||||
<!-- Prerendered version html not shown -->
|
||||
</body>
|
||||
</html>
|
||||
|
||||
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
@ -35,5 +35,6 @@ for (const src of [
|
||||
script.src = src;
|
||||
}
|
||||
</script>
|
||||
<!-- Prerendered version html not shown -->
|
||||
</body>
|
||||
</html>
|
||||
|
||||
@ -13,5 +13,6 @@
|
||||
<div id="snippets-container">
|
||||
<div id="snippets"></div>
|
||||
</div>
|
||||
<!-- Prerendered version html not shown -->
|
||||
</body>
|
||||
</html>
|
||||
|
||||
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
@ -35,5 +35,6 @@ for (const src of [
|
||||
script.src = src;
|
||||
}
|
||||
</script>
|
||||
<!-- Prerendered version html not shown -->
|
||||
</body>
|
||||
</html>
|
||||
|
||||
@ -13,5 +13,6 @@
|
||||
<div id="snippets-container">
|
||||
<div id="snippets"></div>
|
||||
</div>
|
||||
<!-- Prerendered version html not shown -->
|
||||
</body>
|
||||
</html>
|
||||
|
||||
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
@ -35,5 +35,6 @@ for (const src of [
|
||||
script.src = src;
|
||||
}
|
||||
</script>
|
||||
<!-- Prerendered version html not shown -->
|
||||
</body>
|
||||
</html>
|
||||
|
||||
@ -13,5 +13,6 @@
|
||||
<div id="snippets-container">
|
||||
<div id="snippets"></div>
|
||||
</div>
|
||||
<!-- Prerendered version html not shown -->
|
||||
</body>
|
||||
</html>
|
||||
|
||||
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
@ -35,5 +35,6 @@ for (const src of [
|
||||
script.src = src;
|
||||
}
|
||||
</script>
|
||||
<!-- Prerendered version html not shown -->
|
||||
</body>
|
||||
</html>
|
||||
|
||||
@ -13,5 +13,6 @@
|
||||
<div id="snippets-container">
|
||||
<div id="snippets"></div>
|
||||
</div>
|
||||
<!-- Prerendered version html not shown -->
|
||||
</body>
|
||||
</html>
|
||||
|
||||
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
@ -35,5 +35,6 @@ for (const src of [
|
||||
script.src = src;
|
||||
}
|
||||
</script>
|
||||
<!-- Prerendered version html not shown -->
|
||||
</body>
|
||||
</html>
|
||||
|
||||
@ -13,5 +13,6 @@
|
||||
<div id="snippets-container">
|
||||
<div id="snippets"></div>
|
||||
</div>
|
||||
<!-- Prerendered version html not shown -->
|
||||
</body>
|
||||
</html>
|
||||
|
||||
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
@ -35,5 +35,6 @@ for (const src of [
|
||||
script.src = src;
|
||||
}
|
||||
</script>
|
||||
<!-- Prerendered version html not shown -->
|
||||
</body>
|
||||
</html>
|
||||
|
||||
@ -13,5 +13,6 @@
|
||||
<div id="snippets-container">
|
||||
<div id="snippets"></div>
|
||||
</div>
|
||||
<!-- Prerendered version html not shown -->
|
||||
</body>
|
||||
</html>
|
||||
|
||||
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
@ -35,5 +35,6 @@ for (const src of [
|
||||
script.src = src;
|
||||
}
|
||||
</script>
|
||||
<!-- Prerendered version html not shown -->
|
||||
</body>
|
||||
</html>
|
||||
|
||||
@ -13,5 +13,6 @@
|
||||
<div id="snippets-container">
|
||||
<div id="snippets"></div>
|
||||
</div>
|
||||
<!-- Prerendered version html not shown -->
|
||||
</body>
|
||||
</html>
|
||||
|
||||
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
@ -35,5 +35,6 @@ for (const src of [
|
||||
script.src = src;
|
||||
}
|
||||
</script>
|
||||
<!-- Prerendered version html not shown -->
|
||||
</body>
|
||||
</html>
|
||||
|
||||
@ -13,5 +13,6 @@
|
||||
<div id="snippets-container">
|
||||
<div id="snippets"></div>
|
||||
</div>
|
||||
<!-- Prerendered version html not shown -->
|
||||
</body>
|
||||
</html>
|
||||
|
||||
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
@ -35,5 +35,6 @@ for (const src of [
|
||||
script.src = src;
|
||||
}
|
||||
</script>
|
||||
<!-- Prerendered version html not shown -->
|
||||
</body>
|
||||
</html>
|
||||
|
||||
@ -13,5 +13,6 @@
|
||||
<div id="snippets-container">
|
||||
<div id="snippets"></div>
|
||||
</div>
|
||||
<!-- Prerendered version html not shown -->
|
||||
</body>
|
||||
</html>
|
||||
|
||||
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
@ -35,5 +35,6 @@ for (const src of [
|
||||
script.src = src;
|
||||
}
|
||||
</script>
|
||||
<!-- Prerendered version html not shown -->
|
||||
</body>
|
||||
</html>
|
||||
|
||||
@ -13,5 +13,6 @@
|
||||
<div id="snippets-container">
|
||||
<div id="snippets"></div>
|
||||
</div>
|
||||
<!-- Prerendered version html not shown -->
|
||||
</body>
|
||||
</html>
|
||||
|
||||
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
@ -35,5 +35,6 @@ for (const src of [
|
||||
script.src = src;
|
||||
}
|
||||
</script>
|
||||
<!-- Prerendered version html not shown -->
|
||||
</body>
|
||||
</html>
|
||||
|
||||
@ -13,5 +13,6 @@
|
||||
<div id="snippets-container">
|
||||
<div id="snippets"></div>
|
||||
</div>
|
||||
<!-- Prerendered version html not shown -->
|
||||
</body>
|
||||
</html>
|
||||
|
||||
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
@ -35,5 +35,6 @@ for (const src of [
|
||||
script.src = src;
|
||||
}
|
||||
</script>
|
||||
<!-- Prerendered version html not shown -->
|
||||
</body>
|
||||
</html>
|
||||
|
||||
@ -13,5 +13,6 @@
|
||||
<div id="snippets-container">
|
||||
<div id="snippets"></div>
|
||||
</div>
|
||||
<!-- Prerendered version html not shown -->
|
||||
</body>
|
||||
</html>
|
||||
|
||||
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
@ -35,5 +35,6 @@ for (const src of [
|
||||
script.src = src;
|
||||
}
|
||||
</script>
|
||||
<!-- Prerendered version html not shown -->
|
||||
</body>
|
||||
</html>
|
||||
|
||||
@ -13,5 +13,6 @@
|
||||
<div id="snippets-container">
|
||||
<div id="snippets"></div>
|
||||
</div>
|
||||
<!-- Prerendered version html not shown -->
|
||||
</body>
|
||||
</html>
|
||||
|
||||
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
@ -35,5 +35,6 @@ for (const src of [
|
||||
script.src = src;
|
||||
}
|
||||
</script>
|
||||
<!-- Prerendered version html not shown -->
|
||||
</body>
|
||||
</html>
|
||||
|
||||
@ -13,5 +13,6 @@
|
||||
<div id="snippets-container">
|
||||
<div id="snippets"></div>
|
||||
</div>
|
||||
<!-- Prerendered version html not shown -->
|
||||
</body>
|
||||
</html>
|
||||
|
||||
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
@ -35,5 +35,6 @@ for (const src of [
|
||||
script.src = src;
|
||||
}
|
||||
</script>
|
||||
<!-- Prerendered version html not shown -->
|
||||
</body>
|
||||
</html>
|
||||
|
||||
@ -13,5 +13,6 @@
|
||||
<div id="snippets-container">
|
||||
<div id="snippets"></div>
|
||||
</div>
|
||||
<!-- Prerendered version html not shown -->
|
||||
</body>
|
||||
</html>
|
||||
|
||||
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
@ -35,5 +35,6 @@ for (const src of [
|
||||
script.src = src;
|
||||
}
|
||||
</script>
|
||||
<!-- Prerendered version html not shown -->
|
||||
</body>
|
||||
</html>
|
||||
|
||||
@ -13,5 +13,6 @@
|
||||
<div id="snippets-container">
|
||||
<div id="snippets"></div>
|
||||
</div>
|
||||
<!-- Prerendered version html not shown -->
|
||||
</body>
|
||||
</html>
|
||||
|
||||
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in New Issue
Block a user