Merge pull request #14 from thefeli73/develop

release v1.0.0
Merge branch 'master' into develop
2019-11-12 18:53:52 +01:00 · 2019-11-12 18:53:18 +01:00 · 2019-11-12 18:43:32 +01:00 · 2019-11-12 18:37:22 +01:00 · 2019-11-12 18:31:19 +01:00 · 2019-11-12 17:03:11 +00:00
14 changed files with 23 additions and 18 deletions
--- a/.gitignore
+++ b/.gitignore
@ -1,4 +1,3 @@

 node_modules/
-
-dist/
+dist/
--- a/gulpfile.js
+++ b/gulpfile.js
@ -116,7 +116,6 @@ var jsTasks = lazypipe()
 	.pipe(optimizejs)
 	//.pipe(rename, {suffix: '.min'})
 	.pipe(uglify)
-	.pipe(optimizejs)
 	.pipe(header, banner.main, {package: package})
 	.pipe(dest, paths.scripts.output);

@ -244,13 +243,19 @@ var updateAssetVersion = function (done) {
 		.pipe(dest(paths.output));
 };
 // updates version in SW
+var swTasks = lazypipe()
+	.pipe(optimizejs)
+	.pipe(uglify)
+	.pipe(header, banner.main, {package: package})
+	.pipe(dest, paths.output);
+
 var buildSW = function (done) {
 	return src('src/sw.js')
 		.pipe(hashsrc({build_dir:paths.output,src_path:"src",hash_len:"6",query_name:"v",exts:[".json",".webp",".jpg",".css",".png",".ico",".js"],
 			regex:/\s*(?:(")([^"]*)|(')([^']*))/ig,
 			analyze: function analyze(match){return {prefix: "'",link:match[4],suffix: ''};}
 		}))
-		.pipe(jsTasks())
+		.pipe(swTasks())
 		.pipe(dest(paths.output));
 };
 // Watch for changes to the src directory
@ -310,4 +315,4 @@ exports.watch = series(
 	exports.default,
 	//startServer,
 	watchSource
-);
+);
--- a/src/Kontakt.html
+++ b/src/Kontakt.html
@ -11,14 +11,13 @@
 <meta HTTP-EQUIV="CACHE-CONTROL" CONTENT="public">
 <link rel="canonical" href="https://meritkollen.se/Kontakt">

+<link rel='preload' async href='/img/background85.webp' as='image' type='image/webp'>
 <link rel='preconnect' href='https://cdnjs.cloudflare.com' crossorigin>
 <link rel='preconnect' href='https://pagead2.googlesyndication.com' crossorigin>
 <script async src="/js/modernizer-webp.js"></script>
 <link rel="stylesheet" async href="/css/main.css">
-<link rel='preload' async href='/img/background85.webp' as='image' type='image/webp'>
 <link disabled class="lateLoader" rel='stylesheet' defer href='https://fonts.googleapis.com/icon?family=Material+Icons'>
 <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>


 <!--[if lt IE 9]>
@ -45,6 +44,7 @@
 <meta name="theme-color" content="#27233a">


+<script data-ad-client="ca-pub-5143923140938916" defer src="https://pagead2.googlesyndication.com/pagead/js/adsbygoogle.js"></script>
 </head>

 <body>
--- a/src/img/christopher-burns-9bwXKkVC4UU-unsplash.jpg
+++ b/src/img/christopher-burns-9bwXKkVC4UU-unsplash.jpg
--- a/src/img/christopher-burns-9bwXKkVC4UU-unsplash
+++ b/src/img/christopher-burns-9bwXKkVC4UU-unsplash
--- a/src/img/loader.gif
+++ b/src/img/loader.gif
--- a/src/img/tips.jpg
+++ b/src/img/tips.jpg
--- a/src/img/tips.webp
+++ b/src/img/tips.webp
--- a/src/include/html_head.php
+++ b/src/include/html_head.php
@ -17,13 +17,12 @@ echo '
 <meta property="og:description" content="Beräkna ditt gymnasie meritvärde inför univeritet eller högskola">
 <meta name="title" content="Räkna ut ditt meritvärde">

+<link rel="preload" async href="/img/background85.webp" as="image" type="image/webp">
 <link rel="preconnect" href="https://cdnjs.cloudflare.com" crossorigin>
 <link rel="preconnect" href="https://pagead2.googlesyndication.com" crossorigin>
 <script async src="/js/modernizer-webp.js"></script>
-<link rel="preload" async href="/img/background85.webp" as="image" type="image/webp">
 <link disabled class="lateLoader" rel="stylesheet" defer href="https://fonts.googleapis.com/icon?family=Material+Icons">
 <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 rel="stylesheet" async href="/css/main.css">

 <!--[if lt IE 9]>
@ -50,4 +49,5 @@ echo '
 <meta name="theme-color" content="#27233a">


+<script data-ad-client="ca-pub-5143923140938916" defer src="https://pagead2.googlesyndication.com/pagead/js/adsbygoogle.js"></script>
 ';
--- a/src/index.html
+++ b/src/index.html
@ -19,13 +19,12 @@
 <meta property="og:description" content="Beräkna ditt gymnasie meritvärde inför univeritet eller högskola">
 <meta name="title" content="Räkna ut ditt meritvärde">

+<link rel="preload" async href="/img/background85.webp" as="image" type="image/webp">
 <link rel='preconnect' href='https://cdnjs.cloudflare.com' crossorigin>
 <link rel='preconnect' href='https://pagead2.googlesyndication.com' crossorigin>
 <script async src="/js/modernizer-webp.js"></script>
 <link rel="stylesheet" async href="/css/main.css">
-<link rel="preload" async href="/img/background85.webp" as="image" type="image/webp">
 <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>



@ -55,6 +54,7 @@



+<script data-ad-client="ca-pub-5143923140938916" defer src="https://pagead2.googlesyndication.com/pagead/js/adsbygoogle.js"></script>
 </head>
 <body id="bg">

--- a/src/js/cache-polyfill.js
+++ b/src/js/cache-polyfill.js
--- a/src/js/jquery.js
+++ b/src/js/jquery.js
@ -2827,7 +2827,7 @@ function nodeName( elem, name ) {

  return elem.nodeName && elem.nodeName.toLowerCase() === name.toLowerCase();

-};
+}
 var rsingleTag = ( /^<([a-z][^\/\0>:\x20\t\r\n\f]*)[\x20\t\r\n\f]*\/?>(?:<\/\1>|)$/i );


--- a/src/js/material.js
+++ b/src/js/material.js
@ -1,4 +1,4 @@
-;(function() {
+(function() {
 "use strict";

 /**
@ -2220,7 +2220,7 @@ MaterialSnackbar.prototype.cleanup_ = function () {
    setTimeout(function () {
        this.element_.setAttribute('aria-hidden', 'true');
        this.textElement_.textContent = '';
-        if (!Boolean(this.actionElement_.getAttribute('aria-hidden'))) {
+        if (!this.actionElement_.getAttribute('aria-hidden')) {
            this.setActionHidden_(true);
            this.actionElement_.textContent = '';
            this.actionElement_.removeEventListener('click', this.actionHandler_);
@ -2881,7 +2881,7 @@ MaterialTextfield.prototype['checkDisabled'] = MaterialTextfield.prototype.check
  * @public
  */
 MaterialTextfield.prototype.checkFocus = function () {
-    if (Boolean(this.element_.querySelector(':focus'))) {
+    if ((this.element_.querySelector(':focus'))) {
        this.element_.classList.add(this.CssClasses_.IS_FOCUSED);
    } else {
        this.element_.classList.remove(this.CssClasses_.IS_FOCUSED);
@ -3120,7 +3120,7 @@ MaterialTooltip.prototype.init = function () {
            this.forElement_.addEventListener('touchend', this.boundMouseEnterHandler, false);
            this.forElement_.addEventListener('mouseleave', this.boundMouseLeaveAndScrollHandler, false);
            window.addEventListener('scroll', this.boundMouseLeaveAndScrollHandler, true);
-            window.addEventListener('touchstart', this.boundMouseLeaveAndScrollHandler);
+            window.addEventListener('touchstart', this.boundMouseLeaveAndScrollHandler, {passive: true});
        }
    }
 };
@ -3905,7 +3905,7 @@ MaterialRipple.prototype.init = function () {
            this.ignoringMouseDown_ = false;
            this.boundDownHandler = this.downHandler_.bind(this);
            this.element_.addEventListener('mousedown', this.boundDownHandler);
-            this.element_.addEventListener('touchstart', this.boundDownHandler);
+            this.element_.addEventListener('touchstart', this.boundDownHandler, {passive: true});
            this.boundUpHandler = this.upHandler_.bind(this);
            this.element_.addEventListener('mouseup', this.boundUpHandler);
            this.element_.addEventListener('mouseleave', this.boundUpHandler);
--- a/src/sw.js
+++ b/src/sw.js
@ -1,7 +1,8 @@
-importScripts('/cache-polyfill.js');
+importScripts('/js/cache-polyfill.js');


 self.addEventListener('install', function(e) {
+ self.skipWaiting();
 e.waitUntil(
   caches.open('meritkollen').then(function(cache) {
     return cache.addAll([
Author	SHA1	Message	Date
Felix Schulze	21cecab368	Merge pull request #14 from thefeli73/develop release v1.0.0	2019-11-12 18:53:52 +01:00
Felix Schulze	336f7ab4f8	Merge branch 'master' into develop	2019-11-12 18:53:18 +01:00
Felix Schulze	c61dc82574	move polyfill so it gets compressed	2019-11-12 18:43:32 +01:00
Felix Schulze	539483ad42	remove old files	2019-11-12 18:37:22 +01:00
Felix Schulze	c67a812614	service worker fix	2019-11-12 18:31:19 +01:00
codefactor-io	5df6e992cb	[CodeFactor] Apply fixes to commit `2cf7294`	2019-11-12 17:03:11 +00:00
Felix Schulze	2cf7294ce0	passive eventlisteners	2019-11-12 18:02:52 +01:00
Felix Schulze	4fbc2a6c39	move ads to bottom of head	2019-11-12 17:40:53 +01:00
Felix Schulze	2123cb9f75	prioritize background load	2019-11-12 17:33:50 +01:00
codefactor-io	c7a42cdc88	[CodeFactor] Apply fixes to commit `533ec3a`	2019-11-12 16:26:43 +00:00
Felix Schulze	533ec3a867	Merge branch 'new-jquery' into develop	2019-11-12 17:26:20 +01:00
Felix Schulze	274f7014f7	make sw activate if updated	2019-11-12 16:35:23 +01:00
Felix Schulze	a1b2b894ed	ignore shit files	2019-11-08 01:17:26 +01:00