Merge branch 'feature/uglify-js' into develop

gulpfile.js

@@ -1,8 +1,10 @@
 'use strict';
 
 var gulp = require('gulp');
+var pump = require('pump');
 var sass = require('gulp-sass');
 var brotli = require('gulp-brotli');
+var uglify = require('gulp-uglify');
 var zopfli = require('gulp-zopfli');
 var sourcemaps = require('gulp-sourcemaps');
 var autoprefixer = require('gulp-autoprefixer');
@@ -17,8 +19,15 @@ gulp.task('sass', function () {
 });
 
 gulp.task('js-assets', function () {
-    return gulp.src(['resources/assets/js/**/*'])
-        .pipe(gulp.dest('./public/assets/js'));
+    //return gulp.src(['resources/assets/js/**/*'])
+    //    .pipe(gulp.dest('./public/assets/js'));
+    pump([
+        gulp.src(['resources/assets/js/**/*']),
+        sourcemaps.init(),
+        uglify(),
+        sourcemaps.write('./maps'),
+        gulp.dest('./public/assets/js')
+    ]);
 });
 
 gulp.task('bower', function () {

package.json

@@ -9,9 +9,11 @@
     "gulp-brotli": "^1.0.1",
     "gulp-sass": "^2.3.2",
     "gulp-sourcemaps": "^1.6.0",
+    "gulp-uglify": "^2.0.0",
     "gulp-zopfli": "^1.0.0",
     "lint-staged": "^1.0.1",
     "pre-commit": "^1.1.3",
+    "pump": "^1.0.1",
     "stylelint": "^6.6.0",
     "stylelint-config-standard": "^9.0.0"
   },

public/assets/js/form-save.js

@@ -1,69 +1,2 @@
-/* global alertify, store */
-var feature = {
-    addEventListener : !!window.addEventListener,
-    querySelectorAll : !!document.querySelectorAll
-};
-
-if (feature.addEventListener && feature.querySelectorAll) {
-    var keys = getKeys();
-    for (var i = 0; i < keys.length; i++) {
-        if (store.get(keys[i])) {
-            var formId = keys[i].split('~')[1];
-            document.getElementById(formId).value = store.get(keys[i]);
-        }
-    }
-}
-
-var timerId = window.setInterval(function() {
-    var saved = false;
-    var inputs = document.querySelectorAll('input[type=text], textarea');
-    for (var i = 0; i < inputs.length; i++) {
-        var key = getFormElement(inputs[i]).id + '~' + inputs[i].id;
-        if (store.get(key) !== inputs[i].value && inputs[i].value !== '') {
-            store.set(key, inputs[i].value);
-            saved = true;
-        }
-    }
-    if (saved === true) {
-        alertify.logPosition('top right');
-        alertify.success('Auto saved text');
-    }
-}, 5000);
-var forms = document.querySelectorAll('form');
-for (var f = 0; f < forms.length; f++) {
-    var form = forms[f];
-    form.addEventListener('submit', function() {
-        window.clearInterval(timerId);
-        var formId = form.id;
-        var storedKeys = store.keys();
-        for (var i = 0; i < storedKeys.length; i++) {
-            if (storedKeys[i].indexOf(formId) > -1) {
-                store.remove(storedKeys[i]);
-            }
-        }
-    });
-}
-function getKeys() {
-    var keys = [];
-    var formFields = document.querySelectorAll('input[type=text], textarea');
-    for (var f = 0; f < formFields.length; f++) {
-        var parent = getFormElement(formFields[f]);
-        if (parent !== false) {
-            var key = parent.id + '~' + formFields[f].id;
-            keys.push(key);
-        }
-    }
-    return keys;
-}
-function getFormElement(elem) {
-    if (elem.nodeName.toLowerCase() !== 'body') {
-        var parent = elem.parentNode;
-        if (parent.nodeName.toLowerCase() === 'form') {
-            return parent;
-        } else {
-            return getFormElement(parent);
-        }
-    } else {
-        return false;
-    }
-}
+function getKeys(){for(var e=[],t=document.querySelectorAll("input[type=text], textarea"),r=0;r<t.length;r++){var o=getFormElement(t[r]);if(o!==!1){var n=o.id+"~"+t[r].id;e.push(n)}}return e}function getFormElement(e){if("body"!==e.nodeName.toLowerCase()){var t=e.parentNode;return"form"===t.nodeName.toLowerCase()?t:getFormElement(t)}return!1}var feature={addEventListener:!!window.addEventListener,querySelectorAll:!!document.querySelectorAll};if(feature.addEventListener&&feature.querySelectorAll)for(var keys=getKeys(),i=0;i<keys.length;i++)if(store.get(keys[i])){var formId=keys[i].split("~")[1];document.getElementById(formId).value=store.get(keys[i])}for(var timerId=window.setInterval(function(){for(var e=!1,t=document.querySelectorAll("input[type=text], textarea"),r=0;r<t.length;r++){var o=getFormElement(t[r]).id+"~"+t[r].id;store.get(o)!==t[r].value&&""!==t[r].value&&(store.set(o,t[r].value),e=!0)}e===!0&&(alertify.logPosition("top right"),alertify.success("Auto saved text"))},5e3),forms=document.querySelectorAll("form"),f=0;f<forms.length;f++){var form=forms[f];form.addEventListener("submit",function(){window.clearInterval(timerId);for(var e=form.id,t=store.keys(),r=0;r<t.length;r++)t[r].indexOf(e)>-1&&store.remove(t[r])})}
+//# sourceMappingURL=maps/form-save.js.map

public/assets/js/links.js

@@ -1,26 +1,2 @@
-/* global Autolinker */
-//the autlinker object
-var autolinker = new Autolinker();
-
-//the youtube regex
-var ytidregex = /watch\?v=([A-Za-z0-9\-_]+)/;
-
-//grab the notes and loop through them
-var notes = document.querySelectorAll('.e-content');
-for (var i = 0; i < notes.length; i++) {
-    //get Youtube ID
-    var ytid = notes[i].textContent.match(ytidregex);
-    if (ytid !== null) {
-        var id = ytid[1];
-        var iframe = document.createElement('iframe');
-        iframe.classList.add('youtube');
-        iframe.setAttribute('src', '//www.youtube.com/embed/' + id);
-        iframe.setAttribute('frameborder', 0);
-        iframe.setAttribute('allowfullscreen', 'true');
-        notes[i].appendChild(iframe);
-    }
-    //now linkify everything
-    var orig = notes[i].innerHTML;
-    var linked = autolinker.link(orig);
-    notes[i].innerHTML = linked;
-}
+for(var autolinker=new Autolinker,ytidregex=/watch\?v=([A-Za-z0-9\-_]+)/,notes=document.querySelectorAll(".e-content"),i=0;i<notes.length;i++){var ytid=notes[i].textContent.match(ytidregex);if(null!==ytid){var id=ytid[1],iframe=document.createElement("iframe");iframe.classList.add("youtube"),iframe.setAttribute("src","//www.youtube.com/embed/"+id),iframe.setAttribute("frameborder",0),iframe.setAttribute("allowfullscreen","true"),notes[i].appendChild(iframe)}var orig=notes[i].innerHTML,linked=autolinker.link(orig);notes[i].innerHTML=linked}
+//# sourceMappingURL=maps/links.js.map

public/assets/js/maps.js

@@ -1,16 +1,2 @@
-/* global L */
-//This code runs on page load and looks for <div class="map">, then adds map
-var mapDivs = document.querySelectorAll('.map');
-for (var i = 0; i < mapDivs.length; i++) {
-    var mapDiv = mapDivs[i];
-    var latitude = mapDiv.dataset.latitude;
-    var longitude  = mapDiv.dataset.longitude;
-    L.mapbox.accessToken = 'pk.eyJ1Ijoiam9ubnliYXJuZXMiLCJhIjoiVlpndW1EYyJ9.aP9fxAqLKh7lj0LpFh5k1w';
-    var map = L.mapbox.map(mapDiv, 'jonnybarnes.gnoihnim')
-        .setView([latitude, longitude], 15)
-        .addLayer(L.mapbox.tileLayer('jonnybarnes.gnoihnim', {
-            detectRetina: true
-        }));
-    L.marker([latitude, longitude]).addTo(map);
-    map.scrollWheelZoom.disable();
-}
+for(var mapDivs=document.querySelectorAll(".map"),i=0;i<mapDivs.length;i++){var mapDiv=mapDivs[i],latitude=mapDiv.dataset.latitude,longitude=mapDiv.dataset.longitude;L.mapbox.accessToken="pk.eyJ1Ijoiam9ubnliYXJuZXMiLCJhIjoiVlpndW1EYyJ9.aP9fxAqLKh7lj0LpFh5k1w";var map=L.mapbox.map(mapDiv,"jonnybarnes.gnoihnim").setView([latitude,longitude],15).addLayer(L.mapbox.tileLayer("jonnybarnes.gnoihnim",{detectRetina:!0}));L.marker([latitude,longitude]).addTo(map),map.scrollWheelZoom.disable()}
+//# sourceMappingURL=maps/maps.js.map

public/assets/js/maps/form-save.js.map

@@ -0,0 +1 @@
+{"version":3,"sources":["form-save.js"],"names":["getKeys","keys","formFields","document","querySelectorAll","f","length","parent","getFormElement","key","id","push","elem","nodeName","toLowerCase","parentNode","feature","addEventListener","window","i","store","get","formId","split","getElementById","value","timerId","setInterval","saved","inputs","set","alertify","logPosition","success","forms","form","clearInterval","storedKeys","indexOf","remove"],"mappings":"AA6CA,QAASA,WAGL,IAAK,GAFDC,MACAC,EAAaC,SAASC,iBAAiB,8BAClCC,EAAI,EAAGA,EAAIH,EAAWI,OAAQD,IAAK,CACxC,GAAIE,GAASC,eAAeN,EAAWG,GACvC,IAAIE,KAAW,EAAO,CAClB,GAAIE,GAAMF,EAAOG,GAAK,IAAMR,EAAWG,GAAGK,EAC1CT,GAAKU,KAAKF,IAGlB,MAAOR,GAEX,QAASO,gBAAeI,GACpB,GAAoC,SAAhCA,EAAKC,SAASC,cAA0B,CACxC,GAAIP,GAASK,EAAKG,UAClB,OAAsC,SAAlCR,EAAOM,SAASC,cACTP,EAEAC,eAAeD,GAG1B,OAAO,EAjEf,GAAIS,UACAC,mBAAqBC,OAAOD,iBAC5Bb,mBAAqBD,SAASC,iBAGlC,IAAIY,QAAQC,kBAAoBD,QAAQZ,iBAEpC,IAAK,GADDH,MAAOD,UACFmB,EAAI,EAAGA,EAAIlB,KAAKK,OAAQa,IAC7B,GAAIC,MAAMC,IAAIpB,KAAKkB,IAAK,CACpB,GAAIG,QAASrB,KAAKkB,GAAGI,MAAM,KAAK,EAChCpB,UAASqB,eAAeF,QAAQG,MAAQL,MAAMC,IAAIpB,KAAKkB,IAqBnE,IAAK,GAhBDO,SAAUR,OAAOS,YAAY,WAG7B,IAAK,GAFDC,IAAQ,EACRC,EAAS1B,SAASC,iBAAiB,8BAC9Be,EAAI,EAAGA,EAAIU,EAAOvB,OAAQa,IAAK,CACpC,GAAIV,GAAMD,eAAeqB,EAAOV,IAAIT,GAAK,IAAMmB,EAAOV,GAAGT,EACrDU,OAAMC,IAAIZ,KAASoB,EAAOV,GAAGM,OAA6B,KAApBI,EAAOV,GAAGM,QAChDL,MAAMU,IAAIrB,EAAKoB,EAAOV,GAAGM,OACzBG,GAAQ,GAGZA,KAAU,IACVG,SAASC,YAAY,aACrBD,SAASE,QAAQ,qBAEtB,KACCC,MAAQ/B,SAASC,iBAAiB,QAC7BC,EAAI,EAAGA,EAAI6B,MAAM5B,OAAQD,IAAK,CACnC,GAAI8B,MAAOD,MAAM7B,EACjB8B,MAAKlB,iBAAiB,SAAU,WAC5BC,OAAOkB,cAAcV,QAGrB,KAAK,GAFDJ,GAASa,KAAKzB,GACd2B,EAAajB,MAAMnB,OACdkB,EAAI,EAAGA,EAAIkB,EAAW/B,OAAQa,IAC/BkB,EAAWlB,GAAGmB,QAAQhB,IAAU,GAChCF,MAAMmB,OAAOF,EAAWlB","file":"form-save.js","sourcesContent":["/* global alertify, store */\nvar feature = {\n    addEventListener : !!window.addEventListener,\n    querySelectorAll : !!document.querySelectorAll\n};\n\nif (feature.addEventListener && feature.querySelectorAll) {\n    var keys = getKeys();\n    for (var i = 0; i < keys.length; i++) {\n        if (store.get(keys[i])) {\n            var formId = keys[i].split('~')[1];\n            document.getElementById(formId).value = store.get(keys[i]);\n        }\n    }\n}\n\nvar timerId = window.setInterval(function() {\n    var saved = false;\n    var inputs = document.querySelectorAll('input[type=text], textarea');\n    for (var i = 0; i < inputs.length; i++) {\n        var key = getFormElement(inputs[i]).id + '~' + inputs[i].id;\n        if (store.get(key) !== inputs[i].value && inputs[i].value !== '') {\n            store.set(key, inputs[i].value);\n            saved = true;\n        }\n    }\n    if (saved === true) {\n        alertify.logPosition('top right');\n        alertify.success('Auto saved text');\n    }\n}, 5000);\nvar forms = document.querySelectorAll('form');\nfor (var f = 0; f < forms.length; f++) {\n    var form = forms[f];\n    form.addEventListener('submit', function() {\n        window.clearInterval(timerId);\n        var formId = form.id;\n        var storedKeys = store.keys();\n        for (var i = 0; i < storedKeys.length; i++) {\n            if (storedKeys[i].indexOf(formId) > -1) {\n                store.remove(storedKeys[i]);\n            }\n        }\n    });\n}\nfunction getKeys() {\n    var keys = [];\n    var formFields = document.querySelectorAll('input[type=text], textarea');\n    for (var f = 0; f < formFields.length; f++) {\n        var parent = getFormElement(formFields[f]);\n        if (parent !== false) {\n            var key = parent.id + '~' + formFields[f].id;\n            keys.push(key);\n        }\n    }\n    return keys;\n}\nfunction getFormElement(elem) {\n    if (elem.nodeName.toLowerCase() !== 'body') {\n        var parent = elem.parentNode;\n        if (parent.nodeName.toLowerCase() === 'form') {\n            return parent;\n        } else {\n            return getFormElement(parent);\n        }\n    } else {\n        return false;\n    }\n}\n"],"sourceRoot":"/source/"}