зеркало из https://github.com/mozilla/gecko-dev.git
Bug 1590758 - Fix blank panel when changing to different pages with service workers from the same domain r=jdescottes
Differential Revision: https://phabricator.services.mozilla.com/D52147 --HG-- extra : moz-landing-system : lando
This commit is contained in:
Родитель
96dcd40e06
Коммит
49be1da14e
|
@ -86,7 +86,11 @@ window.Application = {
|
||||||
|
|
||||||
async updateWorkers() {
|
async updateWorkers() {
|
||||||
const { service } = await this.client.mainRoot.listAllWorkers();
|
const { service } = await this.client.mainRoot.listAllWorkers();
|
||||||
this.actions.updateWorkers(service);
|
// filter out workers that don't have an URL or a scope
|
||||||
|
// TODO: Bug 1595138 investigate why we lack those properties
|
||||||
|
const workers = service.filter(x => x.url && x.scope);
|
||||||
|
|
||||||
|
this.actions.updateWorkers(workers);
|
||||||
},
|
},
|
||||||
|
|
||||||
updateDomain() {
|
updateDomain() {
|
||||||
|
|
|
@ -200,12 +200,10 @@ class Worker extends PureComponent {
|
||||||
)
|
)
|
||||||
: null;
|
: null;
|
||||||
|
|
||||||
const scope = worker.scope
|
const scope = span(
|
||||||
? span(
|
{ title: worker.scope, className: "worker__scope js-sw-scope" },
|
||||||
{ title: worker.scope, className: "worker__scope js-sw-scope" },
|
this.formatScope(worker.scope)
|
||||||
this.formatScope(worker.scope)
|
);
|
||||||
)
|
|
||||||
: null;
|
|
||||||
|
|
||||||
return li(
|
return li(
|
||||||
{ className: "worker js-sw-container" },
|
{ className: "worker js-sw-container" },
|
||||||
|
|
|
@ -9,8 +9,8 @@ const PropTypes = require("devtools/client/shared/vendor/react-prop-types");
|
||||||
const worker = {
|
const worker = {
|
||||||
active: PropTypes.bool,
|
active: PropTypes.bool,
|
||||||
name: PropTypes.string.isRequired,
|
name: PropTypes.string.isRequired,
|
||||||
scope: PropTypes.string,
|
scope: PropTypes.string.isRequired,
|
||||||
lastUpdateTime: PropTypes.number.isRequired,
|
lastUpdateTime: PropTypes.number,
|
||||||
url: PropTypes.string.isRequired,
|
url: PropTypes.string.isRequired,
|
||||||
// registrationFront can be missing in e10s.
|
// registrationFront can be missing in e10s.
|
||||||
registrationFront: PropTypes.object,
|
registrationFront: PropTypes.object,
|
||||||
|
|
|
@ -28,16 +28,16 @@ support-files =
|
||||||
|
|
||||||
[browser_application_panel_sidebar.js]
|
[browser_application_panel_sidebar.js]
|
||||||
[browser_application_panel_debug-service-worker.js]
|
[browser_application_panel_debug-service-worker.js]
|
||||||
skip-if = serviceworker_e10s || debug # Bug 1559591
|
skip-if = debug # Bug 1559591
|
||||||
[browser_application_panel_list-domain-workers.js]
|
[browser_application_panel_list-domain-workers.js]
|
||||||
skip-if = serviceworker_e10s || debug # Bug 1559591
|
skip-if = debug # Bug 1559591
|
||||||
[browser_application_panel_list-several-workers.js]
|
[browser_application_panel_list-several-workers.js]
|
||||||
skip-if = serviceworker_e10s || debug # Bug 1559591
|
skip-if = debug # Bug 1559591
|
||||||
[browser_application_panel_list-single-worker.js]
|
[browser_application_panel_list-single-worker.js]
|
||||||
skip-if = serviceworker_e10s || debug # Bug 1559591
|
skip-if = debug # Bug 1559591
|
||||||
[browser_application_panel_list-workers-empty.js]
|
[browser_application_panel_list-workers-empty.js]
|
||||||
[browser_application_panel_list-unicode.js]
|
[browser_application_panel_list-unicode.js]
|
||||||
skip-if = serviceworker_e10s || debug # Bug 1559591
|
skip-if = debug # Bug 1559591
|
||||||
[browser_application_panel_manifest-display.js]
|
[browser_application_panel_manifest-display.js]
|
||||||
[browser_application_panel_manifest-load.js]
|
[browser_application_panel_manifest-load.js]
|
||||||
[browser_application_panel_manifest-open-json.js]
|
[browser_application_panel_manifest-open-json.js]
|
||||||
|
@ -47,4 +47,4 @@ skip-if = true # Bug 1467256, 1559591
|
||||||
[browser_application_panel_unregister-worker.js]
|
[browser_application_panel_unregister-worker.js]
|
||||||
skip-if = debug # Bug 1559591
|
skip-if = debug # Bug 1559591
|
||||||
[browser_application_panel_start-service-worker.js]
|
[browser_application_panel_start-service-worker.js]
|
||||||
skip-if = (os == 'linux' && asan) || debug || serviceworker_e10s # Bug 1559487, 1559591
|
skip-if = (os == 'linux' && asan) || debug || serviceworker_e10s # Bug 1559487, 1559591, 1447197
|
||||||
|
|
Загрузка…
Ссылка в новой задаче