Merge branch 'new-jquery' into develop

src/Ekonomi.php

@@ -83,8 +83,6 @@ include "include/createCourse_end.php";
 </header>
 <?php
 include "include/html_script_bottom_head.php";
-
-include "include/info.php";
 ?>
 </body>
 </html>

src/Estet.php

@@ -82,8 +82,6 @@ include "include/createCourse_end.php";
 </header>
 <?php
 include "include/html_script_bottom_head.php";
-
-include "include/info.php";
 ?>
 </body>
 </html>

src/Kontakt.html

@@ -77,8 +77,8 @@ Information om själva sidan hittar du i "Om oss" rutan på startsidan.
 </content>
 </div>
 </header>
-<script defer src="https://cdnjs.cloudflare.com/ajax/libs/jquery/3.4.1/jquery.min.js"></script>
+<script src="/js/jquery.js"></script>
-<script defer src="/js/material.min.js"></script>
+<script defer src="/js/material.js"></script>
 <script defer src="/js/smallScript.js"></script>
 </body>
 </html>

src/Natur.php

@@ -81,8 +81,6 @@ include "include/createCourse_end.php";
 </header>
 <?php
 include "include/html_script_bottom_head.php";
-
-include "include/info.php";
 ?>
 </body>
 </html>

src/Samhäll.php

@@ -81,8 +81,6 @@ include "include/createCourse_end.php";
 </header>
 <?php
 include "include/html_script_bottom_head.php";
-
-include "include/info.php";
 ?>
 </body>
 </html>

src/Teknik.php

@@ -81,8 +81,6 @@ include "include/createCourse_end.php";
 </header>
 <?php
 include "include/html_script_bottom_head.php";
-
-include "include/info.php";
 ?>
 </body>
 </html>

src/include/html_script_bottom_head.php

@@ -1,16 +1,15 @@
 <?php
 echo "
+<script src='/js/jquery.js'></script>
+<script src='/js/material.js'></script>
+<script src='/js/materialize.js'></script>
+<script defer src='/js/calcscript.js'></script>
+<script defer src='/js/changeall.js'></script>
+<script defer src='/js/sparabetyg.js'></script>
+<script defer src='/js/smallScript.js'></script>
 <script defer>
-";
-readfile("https://ajax.googleapis.com/ajax/libs/jquery/1.8.2/jquery.min.js");
-readfile("https://code.getmdl.io/1.3.0/material.min.js");
-readfile("https://cdnjs.cloudflare.com/ajax/libs/materialize/0.98.2/js/materialize.min.js");
-readfile("js/calcscript.js");
-readfile("js/changeall.js");
-readfile("js/sparabetyg.js");
-readfile("js/smallScript.js");
-echo "
 $(document).ready(function() {
+	laddaBetyg();
 	$('select').material_select();
 });
 

src/include/info.php

@@ -1,8 +0,0 @@
-<?php
-echo "
-<script>
-$(document).ready(function() {
-	laddaBetyg();
-});
-</script>
-";

src/index.html

@@ -138,8 +138,8 @@ När jag började informera mig om Universiteter, antagningspoäng och meritvär
 </div>
 	</header>
 
-<script defer src="https://cdnjs.cloudflare.com/ajax/libs/jquery/3.4.1/jquery.min.js"></script>
+<script src="/js/jquery.js"></script>
-<script defer src="/js/material.min.js"></script>
+<script defer src="/js/material.js"></script>
 <script defer src="/js/softscrollscript.js"></script>
 <script defer src="/js/smallScript.js"></script>
 </body>

src/js/calcscript.js

@@ -2,11 +2,11 @@ $(document).ready(function() {
 	$('form').change(function() {
 		raknaUtMeritvarde();
 	});
-	$('.add_row').live('click', function() {
+	$(document).on('click','.add_row', function() {
 		$('div.sample_row > div').clone().appendTo('form.courses');
 		raknaUtMeritvarde();
 	});
-	$('.delete_row').live('click', function() {
+	$(document).on('click','.delete_row', function() {
 		$(this).parent().slideUp(function() {
 			$(this).remove();
 			raknaUtMeritvarde();

src/sw.js

@@ -22,11 +22,15 @@ self.addEventListener('install', function(e) {
 		'/img/favicon/favicon-32x32.png',
 		'/img/favicon/favicon-16x16.png',
 		'/img/favicon/favicon.ico',
-		'/js/softscrollscript.js',
+		'/js/calcscript.js',
-		'/js/material.min.js',
+		'/js/changeall.js',
-		'/js/smallScript.js',
+		'/js/jquery.js',
+		'/js/material.js',
+		'/js/materialize.js',
 		'/js/modernizer-webp.js',
-		'https://cdnjs.cloudflare.com/ajax/libs/jquery/3.4.1/jquery.min.js',
+		'/js/smallScript.js',
+		'/js/softscrollscript.js',
+		'/js/sparabetyg.js',
 		'https://fonts.googleapis.com/icon?family=Material+Icons',
 		'https://fonts.gstatic.com/s/materialicons/v48/flUhRq6tzZclQEJ-Vdg-IuiaDsNc.woff2',
 		'https://cdnjs.cloudflare.com/ajax/libs/materialize/0.98.2/fonts/roboto/Roboto-Regular.woff2',