Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-08-07 06:25:32 +01:00
Code Issues Projects Releases Packages Wiki Activity

Auto merge of #12682 - creativcoder:fire-fetch, r=jdm

Browse source 
Dispatch lifecycle events to service worker object and refactor html tests

<!-- Please describe your changes on the following line: -->

Changes introduced to dispatch `controllerchange`, `activate` and `fetch` simple events to Service Worker interfaces. The html tests under `tests/html/service-workers` was also updated to demo the changes.
r? @jdm

---
<!-- Thank you for contributing to Servo! Please replace each `[ ]` by `[X]` when the step is complete, and replace `__` with appropriate data: -->
- [X] `./mach build -d` does not report any errors
- [X] `./mach test-tidy` does not report any errors
- [ ] These changes fix #__ (github issue number if applicable).

<!-- Either: -->
- [X] These changes do not require tests because refactor.
<!-- Pull requests that do not address these steps are welcome, but they will require additional verification as part of the review process. -->

<!-- Reviewable:start -->
---
This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/12682)
<!-- Reviewable:end -->
This commit is contained in:
bors-servo 2016-08-04 01:25:23 -05:00 • committed by GitHub
commit 20b9ce6cff
11 changed files with 55 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

BIN
tests/html/service-worker/assets/tty.gif
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 62 KiB

3
tests/html/service-worker/dashboard_helper.js Normal file
View file

@ -0,0 +1,3 @@
function status_from_dashboard() {
console.log("Dashboard Service worker is active");
}

2
tests/html/service-worker/demo_iframe.html
View file

@ -2,7 +2,7 @@
<html lang="en">
<head>
<meta charset="UTF-8">
<title>An iframe</title>
<title>Servo Browser Engine</title>
</head>
<body>
<div>

1
tests/html/service-worker/dummy.js
View file

@ -1 +0,0 @@
console.log("dummy test file");

8
tests/html/service-worker/iframe_sw.js
View file

@ -1 +1,7 @@
console.log("iframe service worker active");
self.addEventListener('activate', function(e) {
console.log("iframe service worker active");
});
self.addEventListener('fetch', function(e) {
console.log("A fetch event detected by /iframe service worker");
});

28
tests/html/service-worker/index.html
View file

@ -6,38 +6,46 @@
</head>
<body>
<p>This page tests the registration and initialization of Service Workers in Servo.</p>
<div id="registration">
<a href="/dashboard-page.html">Go to Dashboard</a>
<a href="/profile.html">Go to Profile</a>
<div id="sw_demo">
<iframe id="iframe_sw" width="" height="200"></iframe>
<br>
<button onclick="register_zero()">Register for Root</button>
<button onclick="register_one()">Register for Dashboard</button>
<button onclick="register_two()">Register for Profile</button>
<a href="/dashboard-page.html">Go to Dashboard</a>
<a href="/profile.html">Go to Profile</a>
<br>
<button onclick="register_zero()">Register for Root (/)</button>
<button onclick="register_one()">Register for Dashboard (/dashboard)</button>
<button onclick="register_two()">Register for Profile (/profile)</button>
</div>
<script>
var reg = navigator.serviceWorker.register('iframe_sw.js', { 'scope': '/demo_iframe.html' });
console.log("From client worker registered: ", navigator.serviceWorker.controller);
console.log("Registered script source: ", navigator.serviceWorker.controller.scriptURL);
console.log("Registered script source: "+ navigator.serviceWorker.controller.scriptURL);
document.getElementById('iframe_sw').src = 'demo_iframe.html';
function register_zero() {
var reg = navigator.serviceWorker.register('sw.js', { 'scope': './' });
console.log("From client worker registered: ", navigator.serviceWorker.controller);
console.log("Registered script source: ", navigator.serviceWorker.controller.scriptURL);
console.log("Registered script source: "+ navigator.serviceWorker.controller.scriptURL);
}
function register_one() {
var reg = navigator.serviceWorker.register('sw_dashboard.js', { 'scope': '/dashboard' });
console.log("From client worker registered: ", navigator.serviceWorker.controller);
console.log("Registered script source: ", navigator.serviceWorker.controller.scriptURL);
console.log("Registered script source: "+ navigator.serviceWorker.controller.scriptURL);
}
function register_two() {
var reg = navigator.serviceWorker.register('sw_profile.js', { 'scope': '/profile' });
console.log("From client worker registered: ", navigator.serviceWorker.controller);
console.log("Registered script source: ", navigator.serviceWorker.controller.scriptURL);
console.log("Registered script source: "+ navigator.serviceWorker.controller.scriptURL);
}
navigator.serviceWorker.addEventListener('controllerchange', function(e) {
console.log("active Service Worker changed");
});
</script>
</body>
</html>

1
tests/html/service-worker/sw.js
View file

@ -1 +0,0 @@
console.log("root service worker: active");

11
tests/html/service-worker/sw_dashboard.js
View file

@ -1,2 +1,9 @@
importScripts('dummy.js');
console.log("dashboard service worker: active");
importScripts('dashboard_helper.js');
self.addEventListener('activate', function(e) {
status_from_dashboard();
});
self.addEventListener('fetch', function(e) {
console.log("A fetch event detected by /dashboard service worker");
});

9
tests/html/service-worker/sw_profile.js
View file

@ -1 +1,8 @@
console.log("profile service worker: active");
self.addEventListener('activate', function(e) {
console.log("profile service worker active");
});
self.addEventListener('fetch', function(e) {
console.log("A fetch event detected by /profile service worker");
});