From 31e7355725f204f44ca0a164388cdca59b104be3 Mon Sep 17 00:00:00 2001
From: Felix Schulze <thefeli73@hotmail.com>
Date: Tue, 5 Nov 2019 20:28:56 +0100
Subject: [PATCH] defer, lateLoader, move serviceworker, smallscript

---
 html/Kontakt.html                        | 26 ++++++++----------------
 html/assets/js/smallScript.js            |  9 ++++++++
 html/include/html_script_bottom_head.php |  8 ++------
 html/index.html                          | 13 ++----------
 4 files changed, 22 insertions(+), 34 deletions(-)
 create mode 100644 html/assets/js/smallScript.js

diff --git a/html/Kontakt.html b/html/Kontakt.html
index afe9be1..3e18890 100755
--- a/html/Kontakt.html
+++ b/html/Kontakt.html
@@ -18,12 +18,10 @@
 <script async src="assets/js/modernizer-webp.js"></script>
 <link rel="stylesheet" async href="assets/css/main.min.css">
 <link rel='preload' async href='assets/img/background85.webp' as='image' type='image/webp'>
-<link rel="stylesheet" async href="https://fonts.googleapis.com/css?family=Roboto&display=swap">
-<link rel="stylesheet" defer href="https://fonts.googleapis.com/icon?family=Material+Icons">
-<link rel="stylesheet" defer href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/4.6.3/css/font-awesome.min.css">
-<link rel="stylesheet" defer href="https://cdnjs.cloudflare.com/ajax/libs/materialize/0.98.2/css/materialize.min.css">
-<script data-ad-client="ca-pub-5143923140938916" defer src="https://pagead2.googlesyndication.com/pagead/js/adsbygoogle.js"></script>
-
+<link disabled class="lateLoader" rel='stylesheet' defer href='https://fonts.googleapis.com/icon?family=Material+Icons'>
+<link disabled class="lateLoader" rel="stylesheet" defer href="https://cdnjs.cloudflare.com/ajax/libs/materialize/0.98.2/css/materialize.min.css">
+<!--<script data-ad-client="ca-pub-5143923140938916" defer src="https://pagead2.googlesyndication.com/pagead/js/adsbygoogle.js"></script>
+-->
 
 <!--[if lt IE 9]>
     <script src="https://cdnjs.cloudflare.com/ajax/libs/html5shiv/3.7.3/html5shiv.js"></script>
@@ -81,16 +79,10 @@ Information om själva sidan hittar du i "Om oss" rutan på startsidan.
 </content>
 </div>
 </header>
-<script src="https://cdnjs.cloudflare.com/ajax/libs/jquery/3.4.1/jquery.min.js"></script>
-<script src="assets/js/material.min.js"></script>
-<script src="assets/js/loader.min.js"></script>
-<script src="assets/js/softscrollscript.js"></script>
-<script>
-if('serviceWorker' in navigator) {
-  window.addEventListener('load', function() {
-	navigator.serviceWorker.register('/sw.js');
-  });
-}
-</script>
+<script defer src="https://cdnjs.cloudflare.com/ajax/libs/jquery/3.4.1/jquery.min.js"></script>
+<script defer src="assets/js/material.min.js"></script>
+<script defer src="assets/js/loader.min.js"></script>
+<script defer src="assets/js/softscrollscript.js"></script>
+<script defer src="assets/js/smallscript.js"></script>
 </body>
 </html>
diff --git a/html/assets/js/smallScript.js b/html/assets/js/smallScript.js
new file mode 100644
index 0000000..78ea5b1
--- /dev/null
+++ b/html/assets/js/smallScript.js
@@ -0,0 +1,9 @@
+if('serviceWorker' in navigator) {
+  window.addEventListener('load', function() {
+	navigator.serviceWorker.register('/sw.js');
+  });
+}
+
+window.addEventListener('load', function() {
+  $(".lateLoader").prop('disabled', false);
+});
diff --git a/html/include/html_script_bottom_head.php b/html/include/html_script_bottom_head.php
index be1cd34..e397029 100644
--- a/html/include/html_script_bottom_head.php
+++ b/html/include/html_script_bottom_head.php
@@ -1,6 +1,6 @@
 <?php
 echo "
-<script>
+<script defer>
 ";
 readfile("https://ajax.googleapis.com/ajax/libs/jquery/2.2.4/jquery.min.js");
 readfile("https://code.getmdl.io/1.3.0/material.min.js");
@@ -9,6 +9,7 @@ readfile("assets/js/loader.min.js");
 readfile("assets/js/calcscript.js");
 readfile("assets/js/changeall.js");
 readfile("assets/js/sparabetyg.js");
+readfile("assets/js/smallScript.js");
 echo "
 $(document).ready(function() {
 	$('select').material_select();
@@ -23,10 +24,5 @@ function partB(){
     $('select').material_select();
   });
 }
-if('serviceWorker' in navigator) {
-  window.addEventListener('load', function() {
-	navigator.serviceWorker.register('/sw.js');
-  });
-}
 </script>
 ";
diff --git a/html/index.html b/html/index.html
index 1f830d3..4ac91f5 100755
--- a/html/index.html
+++ b/html/index.html
@@ -25,7 +25,7 @@
 <script async src="assets/js/modernizer-webp.js"></script>
 <link rel="stylesheet" async href="assets/css/main.min.css">
 <link rel='preload' async href='assets/img/background85.webp' as='image' type='image/webp'>
-<link disabled id="test" rel="stylesheet" defer href="https://cdnjs.cloudflare.com/ajax/libs/materialize/0.98.2/css/materialize.min.css">
+<link disabled class="lateLoad" rel="stylesheet" defer href="https://cdnjs.cloudflare.com/ajax/libs/materialize/0.98.2/css/materialize.min.css">
 <!--<script data-ad-client="ca-pub-5143923140938916" defer src="https://pagead2.googlesyndication.com/pagead/js/adsbygoogle.js"></script>
 -->
 
@@ -141,15 +141,6 @@ När jag började informera mig om Universiteter, antagningspoäng och meritvär
 <script defer src="assets/js/material.min.js"></script>
 <script defer src="assets/js/loader.min.js"></script>
 <script defer src="assets/js/softscrollscript.js"></script>
-<script defer>
-if('serviceWorker' in navigator) {
-  window.addEventListener('load', function() {
-	navigator.serviceWorker.register('/sw.js');
-  });
-}
-window.addEventListener('load', function() {
-  $("#test").prop('disabled', false);
-});
-</script>
+<script defer src="assets/js/smallscript.js"></script>
 </body>
 </html>