Merge branch 'new-jquery' into develop

This commit is contained in:
Felix Schulze 2019-11-12 17:26:20 +01:00
commit 533ec3a867
15 changed files with 14626 additions and 47 deletions

View File

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

View File

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

View File

@ -77,8 +77,8 @@ Information om själva sidan hittar du i "Om oss" rutan på startsidan.
</content> </content>
</div> </div>
</header> </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> <script defer src="/js/smallScript.js"></script>
</body> </body>
</html> </html>

View File

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

View File

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

View File

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

View File

@ -1,16 +1,15 @@
<?php <?php
echo " 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> <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() { $(document).ready(function() {
laddaBetyg();
$('select').material_select(); $('select').material_select();
}); });

View File

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

View File

@ -138,8 +138,8 @@ När jag började informera mig om Universiteter, antagningspoäng och meritvär
</div> </div>
</header> </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/softscrollscript.js"></script>
<script defer src="/js/smallScript.js"></script> <script defer src="/js/smallScript.js"></script>
</body> </body>

View File

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

10598
src/js/jquery.js vendored Normal file

File diff suppressed because it is too large Load Diff

3996
src/js/material.js Normal file

File diff suppressed because it is too large Load Diff

File diff suppressed because one or more lines are too long

10
src/js/materialize.js vendored Normal file

File diff suppressed because one or more lines are too long

View File

@ -22,11 +22,15 @@ self.addEventListener('install', function(e) {
'/img/favicon/favicon-32x32.png', '/img/favicon/favicon-32x32.png',
'/img/favicon/favicon-16x16.png', '/img/favicon/favicon-16x16.png',
'/img/favicon/favicon.ico', '/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', '/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.googleapis.com/icon?family=Material+Icons',
'https://fonts.gstatic.com/s/materialicons/v48/flUhRq6tzZclQEJ-Vdg-IuiaDsNc.woff2', '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', 'https://cdnjs.cloudflare.com/ajax/libs/materialize/0.98.2/fonts/roboto/Roboto-Regular.woff2',