forked from tools/josh
1
0
Fork 0

Remove all inline styles

This commit is contained in:
Florine W. Dekker 2021-04-24 22:29:23 +02:00
parent 301181c122
commit 8dfcba0be4
Signed by: FWDekker
GPG Key ID: B1B567AF58D6EE0F
6 changed files with 33 additions and 21 deletions

View File

@ -16,6 +16,9 @@ module.exports = grunt => {
images: { images: {
files: [{expand: true, cwd: "src/main/", src: ["**/*.{ico,png,svg}"], dest: "dist/", flatten: true}] files: [{expand: true, cwd: "src/main/", src: ["**/*.{ico,png,svg}"], dest: "dist/", flatten: true}]
}, },
js: {
files: [{expand: true, cwd: "src/main/", src: ["**/plain.js"], dest: "dist/", flatten: true}]
},
pwa: { pwa: {
files: [{expand: true, cwd: "src/main/", src: ["manifest.json", "sw.js"], dest: "dist/", flatten: true}] files: [{expand: true, cwd: "src/main/", src: ["manifest.json", "sw.js"], dest: "dist/", flatten: true}]
}, },
@ -56,6 +59,10 @@ module.exports = grunt => {
files: ["src/main/**/*.html"], files: ["src/main/**/*.html"],
tasks: ["copy:html"], tasks: ["copy:html"],
}, },
js: {
files: ["src/main/**/*.js"],
tasks: ["copy:js"],
},
ts: { ts: {
files: ["src/main/**/*.ts"], files: ["src/main/**/*.ts"],
tasks: ["webpack:dev", "replace:dev"], tasks: ["webpack:dev", "replace:dev"],
@ -105,6 +112,7 @@ module.exports = grunt => {
"copy:css", "copy:css",
"copy:html", "copy:html",
"copy:images", "copy:images",
"copy:js",
"copy:pwa", "copy:pwa",
// Compile // Compile
"webpack:dev", "webpack:dev",
@ -119,6 +127,7 @@ module.exports = grunt => {
"copy:css", "copy:css",
"copy:html", "copy:html",
"copy:images", "copy:images",
"copy:js",
"copy:pwa", "copy:pwa",
// Compile JS // Compile JS
"webpack:deploy", "webpack:deploy",

View File

@ -1,6 +1,6 @@
{ {
"name": "fwdekker.com", "name": "fwdekker.com",
"version": "0.40.5", "version": "0.40.6",
"description": "The source code of [my personal website](https://fwdekker.com/).", "description": "The source code of [my personal website](https://fwdekker.com/).",
"author": "Felix W. Dekker", "author": "Felix W. Dekker",
"browser": "dist/bundle.js", "browser": "dist/bundle.js",

View File

@ -40,7 +40,7 @@
-->Please check the <a href="https://www.enable-javascript.com/"><!-- -->Please check the <a href="https://www.enable-javascript.com/"><!--
-->instructions how to enable JavaScript in your web browser</a>.<!-- -->instructions how to enable JavaScript in your web browser</a>.<!--
--></noscript><!-- --></noscript><!--
--><div id="ie-warning" style="display:none;"><!-- --><div id="ie-warning" class="hidden"><!--
-->This website does not function with Internet Explorer. <!-- -->This website does not function with Internet Explorer. <!--
-->Please install a newer browser such as <!-- -->Please install a newer browser such as <!--
--><a href="https://www.microsoft.com/en-us/windows/microsoft-edge">Microsoft Edge</a>.<!-- --><a href="https://www.microsoft.com/en-us/windows/microsoft-edge">Microsoft Edge</a>.<!--
@ -55,19 +55,8 @@
--></div> --></div>
</main> </main>
<script> <!--suppress HtmlUnknownTarget -->
if (/MSIE|Trident/.test(window.navigator.userAgent)) { <script src="plain.js?v=%%VERSION_NUMBER%%"></script>
window.onload = function() {
document.getElementById("ie-warning").style.display = "block";
};
}
if ("serviceWorker" in navigator) {
window.addEventListener("load", function() {
return navigator.serviceWorker.register("sw.js?v=%%VERSION_NUMBER%%");
});
}
</script>
<script src="https://static.fwdekker.com/lib/template/2.x.x/template.js"></script> <script src="https://static.fwdekker.com/lib/template/2.x.x/template.js"></script>
<!--suppress HtmlUnknownTarget --> <!--suppress HtmlUnknownTarget -->
<script type="module" src="bundle.js?v=%%VERSION_NUMBER%%"></script> <script type="module" src="bundle.js?v=%%VERSION_NUMBER%%"></script>

View File

@ -39,8 +39,8 @@ doAfterLoad(() => {
if (Persistence.getWasUpdated()) { if (Persistence.getWasUpdated()) {
$("#terminalOutput").innerHTML = "" + $("#terminalOutput").innerHTML = "" +
"<span style=\"color:red\">The terminal application has been updated. To prevent unexpected errors, all " + "<span class=\"errorMessage\">The terminal application has been updated. To prevent unexpected errors, " +
"previous user changes have been reset.</span>\n\n"; "all previous user changes have been reset.</span>\n\n";
Persistence.setWasUpdated(false); Persistence.setWasUpdated(false);
} }

11
src/main/js/plain.js Normal file
View File

@ -0,0 +1,11 @@
if (/MSIE|Trident/.test(window.navigator.userAgent)) {
window.onload = function() {
document.getElementById("ie-warning").className = "";
};
}
if ("serviceWorker" in navigator) {
window.addEventListener("load", function() {
return navigator.serviceWorker.register("sw.js?v=%%VERSION_NUMBER%%");
});
}

View File

@ -1,16 +1,19 @@
const CACHE_NAME = "fwdekker-%%VERSION_NUMBER%%"; const CACHE_NAME = "fwdekker-%%VERSION_NUMBER%%";
const CACHE_FILES = [ const CACHE_FILES = [
"bundle.js", "bundle.js",
"favicon.ico",
"favicon.png", "favicon.png",
"index.html", "favicon.svg",
"manifest.json",
"main.css",
"icon_128x128.png", "icon_128x128.png",
"icon_144x144.png", "icon_144x144.png",
"icon_152x152.png", "icon_152x152.png",
"icon_192x192.png", "icon_192x192.png",
"icon_512x512.png", "icon_512x512.png",
"icon_ios.png" "icon_ios.png",
"index.html",
"main.css",
"manifest.json",
"plain.js",
]; ];
self.addEventListener("install", event => self.addEventListener("install", event =>