simplify & lint all js

_src/_assets/js/_analytics.js

@@ -1,87 +1,78 @@
+/* global ga */
 
-var GoogleAnalytics = (function(w, d, dnt) {
+//
+// Track Responsive Breakpoints
+//
+// stolen & adapted from
+// http://philipwalton.com/articles/measuring-your-sites-responsive-breakpoint-usage/
+//
+const gaBreakpoints = () => {
+    // Do nothing in browsers that don't support `window.matchMedia`.
+    if (!window.matchMedia) {
+        return
+    }
 
-    var app, _private;
+    // Prevent rapid breakpoint changes for all firing at once.
+    let timeout
 
-    _private = {
+    const breakpoints = {
-        //
+        xxs: '(max-width: 479px)',
-        // Track Responsive Breakpoints
+        xs: '(min-width: 480px) and (max-width: 767px)',
-        //
+        sm: '(min-width: 768px) and (max-width: 991px)',
-        // stolen & adapted from
+        md: '(min-width: 992px) and (max-width: 1199px)',
-        // http://philipwalton.com/articles/measuring-your-sites-responsive-breakpoint-usage/
+        lg: '(min-width: 1200px) and (max-width: 1599px)',
-        //
+        hg: '(min-width: 1600px)'
-        gaBreakpoints: function() {
+    }
-            // Do nothing in browsers that don't support `window.matchMedia`.
-            if (!window.matchMedia) return;
 
-            // Prevent rapid breakpoint changes for all firing at once.
+    Object.keys(breakpoints).forEach(breakpoint => {
-            var timeout;
+        const mql = window.matchMedia(breakpoints[breakpoint])
 
-            var breakpoints = {
+        // Set the initial breakpoint on page load.
-                xxs: '(max-width: 479px)',
+        if (mql.matches) {
-                xs:  '(min-width: 480px) and (max-width: 767px)',
+            ga('set', 'dimension1', breakpoint)
-                sm:  '(min-width: 768px) and (max-width: 991px)',
-                md:  '(min-width: 992px) and (max-width: 1199px)',
-                lg:  '(min-width: 1200px) and (max-width: 1599px)',
-                hg:  '(min-width: 1600px)'
-            };
-
-            Object.keys(breakpoints).forEach(function(breakpoint) {
-                var mql = window.matchMedia(breakpoints[breakpoint]);
-
-                // Set the initial breakpoint on page load.
-                if (mql.matches) {
-                    ga('set', 'dimension1', breakpoint);
-                }
-
-                // Update the breakpoint as the matched media changes
-                mql.addListener(function() {
-                    if (mql.matches) {
-                        clearTimeout(timeout);
-                        timeout = setTimeout(function() {
-                            ga('set', 'dimension1', breakpoint);
-                        }, 1000);
-                    }
-                });
-            });
-        },
-
-
-        //
-        // Track Viewport
-        //
-        gaViewport: function() {
-            var width = Math.max(document.documentElement.clientWidth, window.innerWidth || 0);
-            var height = Math.max(document.documentElement.clientHeight, window.innerHeight || 0);
-            var dimensions = width + 'x' + height;
-
-            ga('set', 'dimension2', dimensions);
-        },
-
-
-        //
-        // Track Pixel Density
-        //
-        gaPixelDensity: function() {
-            // Heads up!
-            // window.devicePixelRatio doesn't work correctly in IE but whatever
-            var pixeldensity = window.devicePixelRatio;
-
-            ga('set', 'dimension3', pixeldensity);
         }
 
-    };
+        // Update the breakpoint as the matched media changes
-
+        mql.addListener(() => {
-    app = {
+            if (mql.matches) {
-        init: function() {
+                clearTimeout(timeout)
-            if (dnt !== "yes" && dnt !== "1") {
+                timeout = setTimeout(() => {
-                _private.gaBreakpoints();
+                    ga('set', 'dimension1', breakpoint)
-                _private.gaViewport();
+                }, 1000)
-                _private.gaPixelDensity();
             }
-        }
+        })
-    };
+    })
+}
 
-    return app;
 
-})(window, document, navigator.doNotTrack || navigator.msDoNotTrack || null);
+//
+// Track Viewport
+//
+const gaViewport = () => {
+    const width = Math.max(document.documentElement.clientWidth, window.innerWidth || 0)
+    const height = Math.max(document.documentElement.clientHeight, window.innerHeight || 0)
+    const dimensions = width + 'x' + height
+
+    ga('set', 'dimension2', dimensions)
+}
+
+
+//
+// Track Pixel Density
+//
+const gaPixelDensity = () => {
+    // Heads up!
+    // window.devicePixelRatio doesn't work correctly in IE but whatever
+    const pixeldensity = window.devicePixelRatio
+
+    ga('set', 'dimension3', pixeldensity)
+}
+
+
+const dnt = navigator.doNotTrack || window.doNotTrack || navigator.msDoNotTrack
+
+if (dnt !== 'yes' && dnt !== '1') {
+    gaBreakpoints()
+    gaViewport()
+    gaPixelDensity()
+}

_src/_assets/js/_menu.js

@@ -1,47 +1,27 @@
-var Menu = (function(w, d) {
+$(document).ready(() => {
+    const thesite = $('.site')
+    const thelink = $('.menu-btn')
+    const thepop = $('.nav-popover')
 
-    var app, _private, _config;
+    thelink.on('click', e => {
+        e.preventDefault()
 
-    _config = {
+        // Toggle menu
-        thesite : $('.site'),
+        thesite.toggleClass('has-menu-open')
-        thelink : $('.menu-btn'),
-        thepop  : $('.nav-popover')
-    };
 
-    _private = {
+        // Bind the hide controls
-        menuShow: function() {
+        $(document).bind('click.hidethepop', () => {
-            _config.thelink.on('click', function(e) {
+            thesite.removeClass('has-menu-open')
-                e.preventDefault();
+            // Unbind the hide controls
+            $(document).unbind('click.hidethepop')
+        })
 
-                $('[data-toggle="tooltip"]').tooltip('hide');
+        // Dont close thepop when you click on thepop
+        thepop.on('click', e => {
+            e.stopPropagation()
+        })
 
-                // toggle menu
+        // And dont close thepop now
-                _config.thesite.toggleClass('has-menu-open');
+        e.stopPropagation()
-
+    })
-                // bind the hide controls
+})
-                $(document).bind('click.hidethepop', function() {
-                    _config.thesite.removeClass('has-menu-open');
-                    // unbind the hide controls
-                    $(document).unbind('click.hidethepop');
-                });
-
-                // dont close thepop when you click on thepop
-                _config.thepop.on('click', function(e) {
-                    e.stopPropagation();
-                });
-
-                // and dont close thepop now
-                e.stopPropagation();
-            });
-        }
-    };
-
-    app = {
-        init: function() {
-            _private.menuShow();
-        }
-    };
-
-    return app;
-
-})(window, document);

_src/_assets/js/_search.js

@@ -1,115 +1,84 @@
+/* global SimpleJekyllSearch */
 
+/* eslint-disable spaced-comment */
 //=require simple-jekyll-search/dest/simple-jekyll-search.js
+/* eslint-enable spaced-comment */
 
-var Search = (function(w, d) {
+$(document).ready(() => {
+    const searchlink = $('.search-btn, .js-search-init')
+    const searcharea = $('.search-area')
+    const searchfield = $('#search-input')
+    const searchpop = $('#search-popover')
 
-    var app, _private, _config;
+    const searchReset = () => {
+        // Revert all search elements
+        searcharea
+            .removeClass('animation-slidedown')
+            .addClass('animation-bounceOutUp')
+            .on('animationend webkitAnimationEnd oAnimationEnd', () => {
+                $('body').removeClass('has-search-open')
+            })
+        searchpop.addClass('hide')
+    }
 
-    _config = {
+    searchlink.on('click', e => {
-        content       : $('.site__content'),
+        e.preventDefault()
-        searchlink    : $('.search-btn, .js-search-init'),
-        searcharea    : $('.search-area'),
-        searchfield   : $('#search-input'),
-        searchresults : $('#search-results'),
-        searchpop     : $('#search-popover'),
-        body          : $('body')
-    };
 
-    _private = {
+        // Show search field
-        searchShow: function() {
+        searcharea
+            .removeClass('is-ready animation-bounceOutUp')
+            .addClass('is-ready animation-slidedown')
+            .on('animationend webkitAnimationEnd oAnimationEnd', () => {
+                $('body').addClass('has-search-open')
+            })
 
-            _config.searchlink.on('click', function(e) {
+        searchfield.focus()
-                e.preventDefault();
 
-                $('[data-toggle="tooltip"]').tooltip('hide');
+        SimpleJekyllSearch({ // eslint-disable-line new-cap
+            searchInput: document.getElementById('search-input'),
+            resultsContainer: document.getElementById('search-results'),
+            json: '/api/search.json',
+            searchResultTemplate: '<a class="search-link" href="{url}">{title}</a>',
+            fuzzy: false
+        })
 
-                // show search field
+        // Hide menu too just in case
-                _config.searcharea
+        if ($('body').hasClass('has-menu-open')) {
-                    .removeClass('is-ready animation-bounceOutUp')
+            $('body').removeClass('has-menu-open')
-                    .addClass('is-ready animation-slidedown')
-                    .on('animationend webkitAnimationEnd oAnimationEnd', function(){
-                        _config.body.addClass('has-search-open');
-                    });
-
-                _config.searchfield.focus();
-
-                _private.searchSimpleJekyllSearch();
-
-                // hide menu too just in case
-                if (_config.body.hasClass('has-menu-open')) {
-                    _config.body.removeClass('has-menu-open');
-                }
-
-                // bind the hide controls
-                $(document).bind('click.hidethepop', function() {
-                    _private.searchReset();
-
-                    // unbind the hide controls
-                    $(document).unbind('click.hidethepop');
-                });
-
-                // dont close thepop when click on thepop
-                _config.searchpop.on('click', function(e) {
-                    e.stopPropagation();
-                });
-                // dont close thepop when click on search field
-                _config.searchfield.on('click', function(e) {
-                    e.stopPropagation();
-                });
-
-                // and dont close thepop now
-                e.stopPropagation();
-            });
-        },
-
-        searchResultsShow: function() {
-            // show popup upon first keypress
-            _config.searchfield.on('keyup', function() {
-                _config.searchpop.removeClass('hide');
-            });
-        },
-
-        searchSimpleJekyllSearch: function() {
-            SimpleJekyllSearch({
-                searchInput: document.getElementById('search-input'),
-                resultsContainer: document.getElementById('search-results'),
-                json: '/api/search.json',
-                searchResultTemplate: '<a class="search-link" href="{url}">{title}</a>',
-                fuzzy: false
-            });
-        },
-
-        searchHide: function() {
-            $('.search-close').on('click', function(e) {
-                e.preventDefault();
-
-                _private.searchReset();
-
-                // empty search field
-                _config.searchfield.val('').blur();
-            });
-        },
-
-        searchReset: function() {
-            // revert all search elements
-            _config.searcharea
-                .removeClass('animation-slidedown')
-                .addClass('animation-bounceOutUp')
-                .on('animationend webkitAnimationEnd oAnimationEnd', function(){
-                    _config.body.removeClass('has-search-open');
-                });
-            _config.searchpop.addClass('hide');
         }
-    };
 
-    app = {
+        // Bind the hide controls
-        init: function() {
+        $(document).bind('click.hidethepop', () => {
-            _private.searchShow();
+            searchReset()
-            _private.searchResultsShow();
-            _private.searchHide();
-        }
-    };
 
-    return app;
+            // Unbind the hide controls
+            $(document).unbind('click.hidethepop')
+        })
 
-})(document, window);
+        // Dont close thepop when click on thepop
+        searchpop.on('click', e => {
+            e.stopPropagation()
+        })
+        // Dont close thepop when click on search field
+        searchfield.on('click', e => {
+            e.stopPropagation()
+        })
+
+        // And dont close thepop now
+        e.stopPropagation()
+    })
+
+    // Show popup upon first keypress
+    searchfield.on('keyup', () => {
+        searchpop.removeClass('hide')
+    })
+
+    $('.search-close').on('click', e => {
+        e.preventDefault()
+
+        searchReset()
+
+        // Empty search field
+        searchfield.val('').blur()
+    })
+})

_src/_assets/js/_tooltips.js

@@ -1,26 +0,0 @@
-
-//=require bootstrap/js/tooltip.js
-
-var Tooltips = (function(w, d) {
-
-    var app, _private;
-
-    _private = {
-        tooltipsShow: function() {
-            $('[data-toggle="tooltip"]').tooltip({
-                placement: 'bottom',
-                template: '<div class="tooltip" role="tooltip"><div class="tooltip-inner"></div></div>',
-                container: 'body'
-            })
-        }
-    };
-
-    app = {
-        init: function() {
-            _private.tooltipsShow();
-        }
-    };
-
-    return app;
-
-})(window, document);

_src/_assets/js/kremalicious3.js

@@ -1,4 +1,4 @@
-/* global Menu, Search, GoogleAnalytics, svg4everybody, vex */
+/* global svg4everybody, vex */
 
 /* eslint-disable spaced-comment */
 //=require webcomponents.js/CustomElements.js
@@ -7,42 +7,34 @@
 //=require time-elements/time-elements.js
 //=require vex-js/dist/js/vex.combined.js
 
-//=include _menu.js
+/* eslint-disable spaced-comment */
-//=include _search.js
-//=include _tooltips.js
 //=include _analytics.js
+//=include _search.js
+//=include _menu.js
 /* eslint-enable spaced-comment */
 
 
-$(document).ready(() => {
-    //
-    // init modules
-    //
-    Menu.init()
-    Search.init()
-    GoogleAnalytics.init()
-})
-
-
 //
 // Vex modals
 //
-const vexTriggers = document.querySelectorAll('.js-vex-btc')
+const vexInit = () => {
+    const vexTriggers = document.querySelectorAll('.js-vex-btc')
 
-vexTriggers.forEach(el => {
+    vexTriggers.forEach(el => {
-    el.addEventListener('click', e => {
+        el.addEventListener('click', e => {
-        e.preventDefault()
+            e.preventDefault()
 
-        vex.defaultOptions.className = 'vex-theme-kremalicious vex-bitcoin'
+            vex.defaultOptions.className = 'vex-theme-kremalicious vex-bitcoin'
-        vex.dialog.buttons.YES.text = 'Close'
+            vex.dialog.buttons.YES.text = 'Close'
-        vex.open({
+            vex.open({
-            unsafeContent: '<h3 class="vex__title">My Bitcoin Address</h3>\n <img src="/assets/img/btc-qr.png" />\n <pre class="highlight"><code class="nt">171qDmKEXm9YBgBLXyGjjPvopP5o9htQ1V</code></pre>'
+                unsafeContent: '<h3 class="vex__title">My Bitcoin Address</h3>\n <img src="/assets/img/btc-qr.png" />\n <pre class="highlight"><code class="nt">171qDmKEXm9YBgBLXyGjjPvopP5o9htQ1V</code></pre>'
-        })
+            })
-    }, false)
+        }, false)
-})
-
-document.addEventListener('DOMContentLoaded', () => {
-    svg4everybody({
-        nosvg: false
     })
+}
+
+vexInit()
+
+svg4everybody({
+    nosvg: false
 })

_src/_includes/scripts.html

@@ -4,6 +4,7 @@
     <script src="/assets/js/{{ page.js }}"></script>
 {% endif %}
 
+
 {% if jekyll.environment == "production" %}
     <script>
         var _paq = _paq || [];
@@ -17,7 +18,7 @@
                 var d=document, g=d.createElement('script'), s=d.getElementsByTagName('script')[0];
                 g.type='text/javascript'; g.async=true; g.defer=true; g.src=u+'piwik.js'; s.parentNode.insertBefore(g,s);
             }
-        }(navigator.doNotTrack || navigator.msDoNotTrack || null));
+        }(navigator.doNotTrack || window.doNotTrack || navigator.msDoNotTrack || null));
     </script>
     <noscript><p><img src="//analytics.kremalicious.com/piwik.php?idsite=1" style="border:0;" alt="" /></p></noscript>
 {% endif %}
@@ -60,7 +61,7 @@
             };
         }
 
-    }(window, navigator.doNotTrack || navigator.msDoNotTrack || null));
+    }(window, navigator.doNotTrack || window.doNotTrack || navigator.msDoNotTrack || null));
 </script>
 
 {% if jekyll.environment == "production" %}

package.json

@@ -32,11 +32,9 @@
     "globals": [
       "window",
       "document",
+      "navigator",
       "jQuery",
       "$"
-    ],
-    "ignores": [
-      "_src/_assets/js/_*.js"
     ]
   },
   "dependencies": {