Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Correct the skip-waiting-installed.html behavior #7251

Merged
merged 1 commit into from
Sep 4, 2017
Merged

Correct the skip-waiting-installed.html behavior #7251

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 10 additions & 12 deletions service-workers/service-worker/resources/skip-waiting-installed-worker.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,29 +1,27 @@
self.state = 'starting';

self.addEventListener('install', function() {
self.state = 'installing';
});
var saw_activate_event = false

self.addEventListener('activate', function() {
self.state = 'activating';
saw_activate_event = true;
});

self.addEventListener('message', function(event) {
var port = event.data.port;
if (self.state !== 'installing') {
port.postMessage('FAIL: Worker should be waiting in installed state');
return;
}
event.waitUntil(self.skipWaiting()
.then(function(result) {
if (result !== undefined) {
port.postMessage('FAIL: Promise should be resolved with undefined');
return;
}

if (self.state === 'activating') {
if (!saw_activate_event) {
port.postMessage(
'FAIL: Promise should be resolved after activate event is dispatched');
return;
}

if (self.registration.active.state !== 'activating') {
port.postMessage(
'FAIL: Promise should be resolved before worker is activated');
'FAITL: Promise should be resolved before ServiceWorker#state is set to activated');
return;
}

Expand Down