Skip to content

Fix relative path of service worker script #1

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

Merged
jasonwilliams merged 1 commit into from
Oct 25, 2019
Merged

Fix relative path of service worker script #1

Show file tree
Hide file tree
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
1 change: 1 addition & 0 deletions book-example/book.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ language = "en"

[output.html]
mathjax-support = true
offline-support = true

[output.html.playpen]
editable = true
Expand Down
4 changes: 4 additions & 0 deletions src/renderer/html_handlebars/hbs_renderer.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -548,6 +548,10 @@ fn make_data(
)
}

if html_config.offline_support {
data.insert("offline_support".to_owned(), json!(true));
}

if let Some(ref git_repository_url) = html_config.git_repository_url {
data.insert("git_repository_url".to_owned(), json!(git_repository_url));
}
Expand Down
14 changes: 10 additions & 4 deletions src/theme/book.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -600,9 +600,15 @@ function playpen_text(playpen) {
var isLocalhost =
["localhost", "127.0.0.1", ""].indexOf(document.location.hostname) !== -1;

if ("serviceWorker" in navigator && !isLocalhost) {
navigator.serviceWorker.register("sw.js").catch(function(error) {
console.error("Service worker registration failed:", error);
});
if (
window.sevice_worker_script_src &&
"serviceWorker" in navigator &&
!isLocalhost
) {
navigator.serviceWorker
.register(window.sevice_worker_script_src)
.catch(function(error) {
console.error("Service worker registration failed:", error);
});
}
})();
9 changes: 8 additions & 1 deletion src/theme/index.hbs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -235,7 +235,7 @@
window.playpen_line_numbers = true;
</script>
{{/if}}

{{#if playpen_copyable}}
<script type="text/javascript">
window.playpen_copyable = true;
Expand All @@ -256,6 +256,13 @@
<script src="{{ path_to_root }}searcher.js" type="text/javascript" charset="utf-8"></script>
{{/if}}

{{#if offline_support}}
<script type="text/javascript">
// Must insert before loading book.js
window.sevice_worker_script_src = "{{ path_to_root }}sw.js";
</script>
{{/if}}

<script src="{{ path_to_root }}clipboard.min.js" type="text/javascript" charset="utf-8"></script>
<script src="{{ path_to_root }}highlight.js" type="text/javascript" charset="utf-8"></script>
<script src="{{ path_to_root }}book.js" type="text/javascript" charset="utf-8"></script>
Expand Down