From 5ddd6c986a0da4c7d386c9b95593df14509d69ad Mon Sep 17 00:00:00 2001
From: thednp <thednp@users.noreply.github.com>
Date: Thu, 18 Jun 2020 17:20:22 +0000
Subject: [PATCH] Changes: * removed some dependency on `shorter-js` for events
 and class manipulation * code updates

---
 demo/assets/css/style.css |  5 ++
 demo/src/js/navbar.min.js |  4 +-
 dist/js/navbar.esm.js     | 98 +++++++++++++--------------------------
 dist/js/navbar.esm.min.js |  4 +-
 dist/js/navbar.js         | 98 +++++++++++++--------------------------
 dist/js/navbar.min.js     |  4 +-
 package.json              | 10 ++--
 src/js/init.js            | 17 +++----
 src/js/navbar.js          | 49 +++++++++-----------
 9 files changed, 109 insertions(+), 180 deletions(-)

diff --git a/demo/assets/css/style.css b/demo/assets/css/style.css
index 64d4b32..d4a5967 100644
--- a/demo/assets/css/style.css
+++ b/demo/assets/css/style.css
@@ -203,6 +203,11 @@ ul { list-style: inherit; list-style-position: inside; }
 	.hidden-xs {display: none;}
 }
 
+/* smooth scroll */
+html {
+	scroll-behavior: smooth;
+}
+
 /* HERO */
 .hero {
 	padding: 2rem 3rem;
diff --git a/demo/src/js/navbar.min.js b/demo/src/js/navbar.min.js
index a588ccf..70b944d 100644
--- a/demo/src/js/navbar.min.js
+++ b/demo/src/js/navbar.min.js
@@ -1,2 +1,2 @@
-// Navbar.js v2.0.5 | thednp © 2020 | MIT-License
-!function(e,t){"object"==typeof exports&&"undefined"!=typeof module?module.exports=t():"function"==typeof define&&define.amd?define(t):(e=e||self).Navbar=t()}(this,(function(){"use strict";function e(e,t,n,o){o=o||!1,e.addEventListener(t,n,o)}function t(e,t,n,o){o=o||!1,e.removeEventListener(t,n,o)}function n(e,t){e.classList.add(t)}function o(e,t){e.classList.remove(t)}function i(e,t){return e.classList.contains(t)}var a,r,s,u,m="onmouseleave"in document?["mouseenter","mouseleave"]:["mouseover","mouseout"],l="webkitTransition"in document.body.style||"transition"in document.body.style,c="webkitTransition"in document.body.style?"webkitTransitionDuration":"transitionDuration";function f(e){var t=l?window.getComputedStyle(e)[c]:0;return t="number"!=typeof(t=parseFloat(t))||isNaN(t)?0:1e3*t}function d(a,r){r=r||{};var s,u,l,c,d,p,b,g,y,v,N,E,h,T,L,w,A,B,C=function(e,t){i(e,"open")&&(o(e,"open"),t?setTimeout((function(){o(e,"open-position"),e.isOpen=0}),p):(o(e,"open-position"),e.isOpen=0)),i(e,"open-mobile")&&o(e,"open-mobile")},k=function(){return c&&"none"!==getComputedStyle(c).display||window.innerWidth<h},I=function(e){Array.from(u).map((function(t){i(t.lastElementChild,"subnav")&&(e(t,m[0],S),e(t,m[1],D));var n=t.getElementsByClassName("parent-toggle")[0];n&&e(n,"click",O)})),l&&e(l,"click",O)},O=function(e){e.preventDefault();var t,a;(e.target===this||this.contains(e.target))&&(i(a=this.closest("li")||this.closest(".navbar"),"open-mobile")?o(a,"open-mobile"):(n(a,"open-mobile"),t=T?a.parentNode.getElementsByTagName("LI"):a.getElementsByTagName("LI"),Array.from(t).map((function(e){return e!==a&&C(e)}))))},S=function(){var e=this;clearTimeout(e.timer),e.isOpen||k()||(e.timer=setTimeout((function(){n(e,"open-position"),n(e,"open"),e.isOpen=1,Array.from(e.parentNode.getElementsByTagName("LI")).map((function(t){return t!==e&&C(t)}))}),17))},D=function(){var e=this;e.isOpen&&!k()&&(clearTimeout(e.timer),e.timer=setTimeout((function(){return C(e,1)}),L))};this.dispose=function(){I(t),delete s.Navbar},w=a,B=A&&A instanceof Element?A:document,(s=w instanceof Element?w:B.querySelector(w)).Navbar&&s.Navbar.dispose(),u=s.getElementsByTagName("LI"),l=s.getElementsByClassName("navbar-toggle")[0],c=s.getElementsByClassName("parent-toggle")[0],d=s.getElementsByClassName("subnav")[0],p=d?f(d):0,b=r.breakpoint,g=r.toggleSiblings,y=r.delay,v=s.getAttribute("data-breakpoint"),N=s.getAttribute("data-toggle-siblings"),E=s.getAttribute("data-delay"),h=isNaN(b)?v&&!isNaN(v)?parseInt(v):768:b,T=g||(N&&"true"===N?1:0),L=isNaN(y)?E&&!isNaN(E)?parseInt(E):500:y,I(e),s.Navbar=this}function p(){!function(e,t){try{e()}catch(e){console.error(t+": "+e)}}((function(){Array.from(document.querySelectorAll('[data-function="navbar"]')).map((function(e){return new d(e)}))}),"Navbar")}return document.body?p():(a=document,s=p,e(a,r="DOMContentLoaded",(function e(n){n.target===a&&(s(n),t(a,r,e,u))}),u)),d}));
+// Navbar.js v2.0.6 | thednp © 2020 | MIT-License
+!function(e,t){"object"==typeof exports&&"undefined"!=typeof module?module.exports=t():"function"==typeof define&&define.amd?define(t):(e=e||self).Navbar=t()}(this,(function(){"use strict";var e="onmouseleave"in document?["mouseenter","mouseleave"]:["mouseover","mouseout"],t="webkitTransition"in document.body.style||"transition"in document.body.style,n="webkitTransition"in document.body.style?"webkitTransitionDuration":"transitionDuration";function o(e){var o=t?parseFloat(getComputedStyle(e)[n]):0;return o="number"!=typeof o||isNaN(o)?0:1e3*o}function i(t,n){n=n||{};var i,s,a,r,l,m,u,c,d,p,f,v,b,g,y,N,L,E,T=function(e,t){e.classList.contains("open")&&(e.classList.remove("open"),t?setTimeout((function(){e.classList.remove("open-position"),e.isOpen=0}),m):(e.classList.remove("open-position"),e.isOpen=0)),e.classList.contains("open-mobile")&&e.classList.remove("open-mobile")},h=function(){return r&&"none"!==getComputedStyle(r).display||window.innerWidth<b},C=function(t){t=t?"addEventListener":"removeEventListener",Array.from(s).map((function(n){n.lastElementChild.classList.contains("subnav")&&(n[t](e[0],B),n[t](e[1],k));var o=n.getElementsByClassName("parent-toggle")[0];o&&o[t]("click",A)})),a&&a[t]("click",A)},A=function(e){e.preventDefault();var t,n;(e.target===this||this.contains(e.target))&&((n=this.closest("li")||this.closest(".navbar")).classList.contains("open-mobile")?n.classList.remove("open-mobile"):(n.classList.add("open-mobile"),t=g?n.parentNode.getElementsByTagName("LI"):n.getElementsByTagName("LI"),Array.from(t).map((function(e){return e!==n&&T(e)}))))},B=function(){var e=this;clearTimeout(e.timer),e.isOpen||h()||(e.timer=setTimeout((function(){e.classList.add("open-position"),e.classList.add("open"),e.isOpen=1,Array.from(e.parentNode.getElementsByTagName("LI")).map((function(t){return t!==e&&T(t)}))}),17))},k=function(){var e=this;e.isOpen&&!h()&&(clearTimeout(e.timer),e.timer=setTimeout((function(){return T(e,1)}),y))};this.dispose=function(){C(),delete i.Navbar},N=t,E=L&&L instanceof Element?L:document,(i=N instanceof Element?N:E.querySelector(N)).Navbar&&i.Navbar.dispose(),s=i.getElementsByTagName("LI"),a=i.getElementsByClassName("navbar-toggle")[0],r=i.getElementsByClassName("parent-toggle")[0],l=i.getElementsByClassName("subnav")[0],m=l?o(l):0,u=n.breakpoint,c=n.toggleSiblings,d=n.delay,p=i.getAttribute("data-breakpoint"),f=i.getAttribute("data-toggle-siblings"),v=i.getAttribute("data-delay"),b=isNaN(u)?p&&!isNaN(p)?parseInt(p):768:u,g=c||(f&&"true"===f?1:0),y=isNaN(d)?v&&!isNaN(v)?parseInt(v):500:d,C(1),i.Navbar=this}function s(e){e=e||document,Array.from(e.querySelectorAll('[data-function="navbar"]')).map((function(e){return new i(e)}))}return document.body?s():document.addEventListener("DOMContentLoaded",(function e(){s(),document.removeEventListener("DOMContentLoaded",e)})),i}));
diff --git a/dist/js/navbar.esm.js b/dist/js/navbar.esm.js
index 3cf7691..24bb716 100644
--- a/dist/js/navbar.esm.js
+++ b/dist/js/navbar.esm.js
@@ -1,55 +1,25 @@
 /*!
-* Navbar.js v2.0.5 (http://thednp.github.io/navbar.js)
+* Navbar.js v2.0.6 (http://thednp.github.io/navbar.js)
 * Copyright 2016-2020 © thednp
 * Licensed under MIT (https://github.com/thednp/navbar.js/blob/master/LICENSE)
 */
-function on (element, event, handler, options) {
-  options = options || false;
-  element.addEventListener(event, handler, options);
-}
-
-function off (element, event, handler, options) {
-  options = options || false;
-  element.removeEventListener(event, handler, options);
-}
-
-function addClass(element,classNAME) {
-  element.classList.add(classNAME);
-}
-
-function removeClass(element,classNAME) {
-  element.classList.remove(classNAME);
-}
-
-function hasClass(element,classNAME) {
-  return element.classList.contains(classNAME)
-}
-
 var mouseHoverEvents = ('onmouseleave' in document) ? [ 'mouseenter', 'mouseleave'] : [ 'mouseover', 'mouseout' ];
 
 var supportTransition = 'webkitTransition' in document.body.style || 'transition' in document.body.style;
 
 var transitionDuration = 'webkitTransition' in document.body.style ? 'webkitTransitionDuration' : 'transitionDuration';
 
-function getElementTransitionDuration (element) {
-  var duration = supportTransition ? window.getComputedStyle(element)[transitionDuration] : 0;
-  duration = parseFloat(duration);
+function getElementTransitionDuration(element) {
+  var duration = supportTransition ? parseFloat(getComputedStyle(element)[transitionDuration]) : 0;
   duration = typeof duration === 'number' && !isNaN(duration) ? duration * 1000 : 0;
   return duration;
 }
 
-function queryElement (selector, parent) {
+function queryElement(selector, parent) {
   var lookUp = parent && parent instanceof Element ? parent : document;
   return selector instanceof Element ? selector : lookUp.querySelector(selector);
 }
 
-function tryWrapper (fn,origin){
-  try{ fn(); }
-  catch(e){
-    console.error((origin + ": " + e));
-  }
-}
-
 function Navbar(target, options) {
   options = options || {};
   var self = this,
@@ -73,47 +43,48 @@ function Navbar(target, options) {
     toggleSiblings,
     delayDuration,
     close = function (element, leave) {
-      if (hasClass(element,openClass)) {
-        removeClass(element, openClass);
+      if (element.classList.contains(openClass)) {
+        element.classList.remove(openClass);
         if (leave) {
           setTimeout(function () {
-            removeClass(element, openPosition);
+            element.classList.remove(openPosition);
             element.isOpen = 0;
           }, transitionDuration);
         } else {
-          removeClass(element, openPosition);
+          element.classList.remove(openPosition);
           element.isOpen = 0;
         }
       }
-      if (hasClass(element,openMobile)) {
-        removeClass(element,openMobile);
+      if (element.classList.contains(openMobile)) {
+        element.classList.remove(openMobile);
       }
     },
     checkView = function() {
       return firstToggle && getComputedStyle(firstToggle).display !== 'none' || window.innerWidth < breakpoint;
     },
     toggleEvents = function(action) {
+      action = action ? 'addEventListener' : 'removeEventListener';
       Array.from(items).map(function (listItem) {
-        if (hasClass(listItem.lastElementChild,'subnav') ) {
-          action(listItem, mouseHoverEvents[0], enterHandler);
-          action(listItem, mouseHoverEvents[1], leaveHandler);
+        if (listItem.lastElementChild.classList.contains('subnav') ) {
+          listItem[action](mouseHoverEvents[0], enterHandler);
+          listItem[action](mouseHoverEvents[1], leaveHandler);
         }
         var toggleElement = listItem.getElementsByClassName(parentToggle)[0];
-        toggleElement && action(toggleElement, 'click', clickHandler);
+        toggleElement && toggleElement[action]( 'click', clickHandler);
       });
-      navbarToggle && action(navbarToggle, 'click', clickHandler);
+      navbarToggle && navbarToggle[action]('click', clickHandler);
     },
     clickHandler = function(e) {
       e.preventDefault();
       var that = this, lookup, element;
       if ( (e.target === that || that.contains(e.target)) ) {
         element = that.closest('li') || that.closest('.navbar');
-        if ( !hasClass(element,openMobile) ) {
-          addClass(element,openMobile);
+        if ( !element.classList.contains(openMobile) ) {
+          element.classList.add(openMobile);
           lookup = toggleSiblings ? element.parentNode.getElementsByTagName('LI') : element.getElementsByTagName('LI');
           Array.from(lookup).map(function (x){ return x!==element && close(x); });
         } else {
-          removeClass(element,openMobile);
+          element.classList.remove(openMobile);
         }
       }
     },
@@ -122,8 +93,8 @@ function Navbar(target, options) {
       clearTimeout(that.timer);
       if (!that.isOpen && !checkView() ) {
         that.timer = setTimeout(function(){
-          addClass(that,openPosition);
-          addClass(that,openClass);
+          that.classList.add(openPosition);
+          that.classList.add(openClass);
           that.isOpen = 1;
           Array.from(that.parentNode.getElementsByTagName('LI'))
                 .map(function (x) { return x !== that && close(x); });
@@ -138,7 +109,7 @@ function Navbar(target, options) {
       }
     };
   this.dispose = function() {
-    toggleEvents(off);
+    toggleEvents();
     delete menu.Navbar;
   };
   menu = queryElement(target);
@@ -157,25 +128,18 @@ function Navbar(target, options) {
   breakpoint = !isNaN(breakpointOption) ? breakpointOption : dataBreakpoint && !isNaN(dataBreakpoint) ? parseInt(dataBreakpoint) : 768;
   toggleSiblings = !!toggleSiblingsOption ? toggleSiblingsOption : dataToggleSiblings && dataToggleSiblings === 'true' ? 1 : 0;
   delayDuration = !isNaN(delayOption) ? delayOption : dataDelay && !isNaN(dataDelay) ? parseInt(dataDelay) : 500;
-  toggleEvents(on);
+  toggleEvents(1);
   menu.Navbar = self;
 }
 
-function one (element, event, handler, options) {
-  on(element, event, function handlerWrapper(e){
-    if (e.target === element) {
-      handler(e);
-      off(element, event, handlerWrapper, options);
-    }
-  }, options);
-}
-
-function initComponent() {
-  tryWrapper(function (){
-    var Navbars = Array.from(document.querySelectorAll('[data-function="navbar"]'));
-    Navbars.map(function (x){ return new Navbar(x); });
-  },'Navbar');
+function initComponent(lookup) {
+  lookup = lookup ? lookup : document;
+  var Navbars = Array.from(lookup.querySelectorAll('[data-function="navbar"]'));
+  Navbars.map(function (x){ return new Navbar(x); });
 }
-document.body ? initComponent() : one(document, 'DOMContentLoaded', initComponent);
+document.body ? initComponent() : document.addEventListener( 'DOMContentLoaded', function iniWrapper(){
+  initComponent();
+  document.removeEventListener( 'DOMContentLoaded', iniWrapper );
+});
 
 export default Navbar;
diff --git a/dist/js/navbar.esm.min.js b/dist/js/navbar.esm.min.js
index 08d96f4..968f62a 100644
--- a/dist/js/navbar.esm.min.js
+++ b/dist/js/navbar.esm.min.js
@@ -1,2 +1,2 @@
-// Navbar.js v2.0.5 | thednp © 2020 | MIT-License
-function e(e,t,n,o){o=o||!1,e.addEventListener(t,n,o)}function t(e,t,n,o){o=o||!1,e.removeEventListener(t,n,o)}function n(e,t){e.classList.add(t)}function o(e,t){e.classList.remove(t)}function i(e,t){return e.classList.contains(t)}var a,r,s,u,m="onmouseleave"in document?["mouseenter","mouseleave"]:["mouseover","mouseout"],l="webkitTransition"in document.body.style||"transition"in document.body.style,c="webkitTransition"in document.body.style?"webkitTransitionDuration":"transitionDuration";function p(e){var t=l?window.getComputedStyle(e)[c]:0;return t="number"!=typeof(t=parseFloat(t))||isNaN(t)?0:1e3*t}function d(a,r){r=r||{};var s,u,l,c,d,f,g,b,y,v,N,E,T,h,L,w,A,B,C=function(e,t){i(e,"open")&&(o(e,"open"),t?setTimeout((function(){o(e,"open-position"),e.isOpen=0}),f):(o(e,"open-position"),e.isOpen=0)),i(e,"open-mobile")&&o(e,"open-mobile")},k=function(){return c&&"none"!==getComputedStyle(c).display||window.innerWidth<T},I=function(e){Array.from(u).map((function(t){i(t.lastElementChild,"subnav")&&(e(t,m[0],S),e(t,m[1],D));var n=t.getElementsByClassName("parent-toggle")[0];n&&e(n,"click",O)})),l&&e(l,"click",O)},O=function(e){e.preventDefault();var t,a;(e.target===this||this.contains(e.target))&&(i(a=this.closest("li")||this.closest(".navbar"),"open-mobile")?o(a,"open-mobile"):(n(a,"open-mobile"),t=h?a.parentNode.getElementsByTagName("LI"):a.getElementsByTagName("LI"),Array.from(t).map((function(e){return e!==a&&C(e)}))))},S=function(){var e=this;clearTimeout(e.timer),e.isOpen||k()||(e.timer=setTimeout((function(){n(e,"open-position"),n(e,"open"),e.isOpen=1,Array.from(e.parentNode.getElementsByTagName("LI")).map((function(t){return t!==e&&C(t)}))}),17))},D=function(){var e=this;e.isOpen&&!k()&&(clearTimeout(e.timer),e.timer=setTimeout((function(){return C(e,1)}),L))};this.dispose=function(){I(t),delete s.Navbar},w=a,B=A&&A instanceof Element?A:document,(s=w instanceof Element?w:B.querySelector(w)).Navbar&&s.Navbar.dispose(),u=s.getElementsByTagName("LI"),l=s.getElementsByClassName("navbar-toggle")[0],c=s.getElementsByClassName("parent-toggle")[0],d=s.getElementsByClassName("subnav")[0],f=d?p(d):0,g=r.breakpoint,b=r.toggleSiblings,y=r.delay,v=s.getAttribute("data-breakpoint"),N=s.getAttribute("data-toggle-siblings"),E=s.getAttribute("data-delay"),T=isNaN(g)?v&&!isNaN(v)?parseInt(v):768:g,h=b||(N&&"true"===N?1:0),L=isNaN(y)?E&&!isNaN(E)?parseInt(E):500:y,I(e),s.Navbar=this}function f(){!function(e,t){try{e()}catch(e){console.error(t+": "+e)}}((function(){Array.from(document.querySelectorAll('[data-function="navbar"]')).map((function(e){return new d(e)}))}),"Navbar")}document.body?f():(a=document,s=f,e(a,r="DOMContentLoaded",(function e(n){n.target===a&&(s(n),t(a,r,e,u))}),u));export default d;
+// Navbar.js v2.0.6 | thednp © 2020 | MIT-License
+var e="onmouseleave"in document?["mouseenter","mouseleave"]:["mouseover","mouseout"],t="webkitTransition"in document.body.style||"transition"in document.body.style,n="webkitTransition"in document.body.style?"webkitTransitionDuration":"transitionDuration";function i(e){var i=t?parseFloat(getComputedStyle(e)[n]):0;return i="number"!=typeof i||isNaN(i)?0:1e3*i}function o(t,n){n=n||{};var o,s,a,r,l,m,u,c,d,p,g,v,b,f,y,N,L,E,T=function(e,t){e.classList.contains("open")&&(e.classList.remove("open"),t?setTimeout((function(){e.classList.remove("open-position"),e.isOpen=0}),m):(e.classList.remove("open-position"),e.isOpen=0)),e.classList.contains("open-mobile")&&e.classList.remove("open-mobile")},h=function(){return r&&"none"!==getComputedStyle(r).display||window.innerWidth<b},C=function(t){t=t?"addEventListener":"removeEventListener",Array.from(s).map((function(n){n.lastElementChild.classList.contains("subnav")&&(n[t](e[0],B),n[t](e[1],k));var i=n.getElementsByClassName("parent-toggle")[0];i&&i[t]("click",A)})),a&&a[t]("click",A)},A=function(e){e.preventDefault();var t,n;(e.target===this||this.contains(e.target))&&((n=this.closest("li")||this.closest(".navbar")).classList.contains("open-mobile")?n.classList.remove("open-mobile"):(n.classList.add("open-mobile"),t=f?n.parentNode.getElementsByTagName("LI"):n.getElementsByTagName("LI"),Array.from(t).map((function(e){return e!==n&&T(e)}))))},B=function(){var e=this;clearTimeout(e.timer),e.isOpen||h()||(e.timer=setTimeout((function(){e.classList.add("open-position"),e.classList.add("open"),e.isOpen=1,Array.from(e.parentNode.getElementsByTagName("LI")).map((function(t){return t!==e&&T(t)}))}),17))},k=function(){var e=this;e.isOpen&&!h()&&(clearTimeout(e.timer),e.timer=setTimeout((function(){return T(e,1)}),y))};this.dispose=function(){C(),delete o.Navbar},N=t,E=L&&L instanceof Element?L:document,(o=N instanceof Element?N:E.querySelector(N)).Navbar&&o.Navbar.dispose(),s=o.getElementsByTagName("LI"),a=o.getElementsByClassName("navbar-toggle")[0],r=o.getElementsByClassName("parent-toggle")[0],l=o.getElementsByClassName("subnav")[0],m=l?i(l):0,u=n.breakpoint,c=n.toggleSiblings,d=n.delay,p=o.getAttribute("data-breakpoint"),g=o.getAttribute("data-toggle-siblings"),v=o.getAttribute("data-delay"),b=isNaN(u)?p&&!isNaN(p)?parseInt(p):768:u,f=c||(g&&"true"===g?1:0),y=isNaN(d)?v&&!isNaN(v)?parseInt(v):500:d,C(1),o.Navbar=this}function s(e){e=e||document,Array.from(e.querySelectorAll('[data-function="navbar"]')).map((function(e){return new o(e)}))}document.body?s():document.addEventListener("DOMContentLoaded",(function e(){s(),document.removeEventListener("DOMContentLoaded",e)}));export default o;
diff --git a/dist/js/navbar.js b/dist/js/navbar.js
index 0c82b14..78c37a1 100644
--- a/dist/js/navbar.js
+++ b/dist/js/navbar.js
@@ -1,5 +1,5 @@
 /*!
-* Navbar.js v2.0.5 (http://thednp.github.io/navbar.js)
+* Navbar.js v2.0.6 (http://thednp.github.io/navbar.js)
 * Copyright 2016-2020 © thednp
 * Licensed under MIT (https://github.com/thednp/navbar.js/blob/master/LICENSE)
 */
@@ -9,53 +9,23 @@
   (global = global || self, global.Navbar = factory());
 }(this, (function () { 'use strict';
 
-  function on (element, event, handler, options) {
-    options = options || false;
-    element.addEventListener(event, handler, options);
-  }
-
-  function off (element, event, handler, options) {
-    options = options || false;
-    element.removeEventListener(event, handler, options);
-  }
-
-  function addClass(element,classNAME) {
-    element.classList.add(classNAME);
-  }
-
-  function removeClass(element,classNAME) {
-    element.classList.remove(classNAME);
-  }
-
-  function hasClass(element,classNAME) {
-    return element.classList.contains(classNAME)
-  }
-
   var mouseHoverEvents = ('onmouseleave' in document) ? [ 'mouseenter', 'mouseleave'] : [ 'mouseover', 'mouseout' ];
 
   var supportTransition = 'webkitTransition' in document.body.style || 'transition' in document.body.style;
 
   var transitionDuration = 'webkitTransition' in document.body.style ? 'webkitTransitionDuration' : 'transitionDuration';
 
-  function getElementTransitionDuration (element) {
-    var duration = supportTransition ? window.getComputedStyle(element)[transitionDuration] : 0;
-    duration = parseFloat(duration);
+  function getElementTransitionDuration(element) {
+    var duration = supportTransition ? parseFloat(getComputedStyle(element)[transitionDuration]) : 0;
     duration = typeof duration === 'number' && !isNaN(duration) ? duration * 1000 : 0;
     return duration;
   }
 
-  function queryElement (selector, parent) {
+  function queryElement(selector, parent) {
     var lookUp = parent && parent instanceof Element ? parent : document;
     return selector instanceof Element ? selector : lookUp.querySelector(selector);
   }
 
-  function tryWrapper (fn,origin){
-    try{ fn(); }
-    catch(e){
-      console.error((origin + ": " + e));
-    }
-  }
-
   function Navbar(target, options) {
     options = options || {};
     var self = this,
@@ -79,47 +49,48 @@
       toggleSiblings,
       delayDuration,
       close = function (element, leave) {
-        if (hasClass(element,openClass)) {
-          removeClass(element, openClass);
+        if (element.classList.contains(openClass)) {
+          element.classList.remove(openClass);
           if (leave) {
             setTimeout(function () {
-              removeClass(element, openPosition);
+              element.classList.remove(openPosition);
               element.isOpen = 0;
             }, transitionDuration);
           } else {
-            removeClass(element, openPosition);
+            element.classList.remove(openPosition);
             element.isOpen = 0;
           }
         }
-        if (hasClass(element,openMobile)) {
-          removeClass(element,openMobile);
+        if (element.classList.contains(openMobile)) {
+          element.classList.remove(openMobile);
         }
       },
       checkView = function() {
         return firstToggle && getComputedStyle(firstToggle).display !== 'none' || window.innerWidth < breakpoint;
       },
       toggleEvents = function(action) {
+        action = action ? 'addEventListener' : 'removeEventListener';
         Array.from(items).map(function (listItem) {
-          if (hasClass(listItem.lastElementChild,'subnav') ) {
-            action(listItem, mouseHoverEvents[0], enterHandler);
-            action(listItem, mouseHoverEvents[1], leaveHandler);
+          if (listItem.lastElementChild.classList.contains('subnav') ) {
+            listItem[action](mouseHoverEvents[0], enterHandler);
+            listItem[action](mouseHoverEvents[1], leaveHandler);
           }
           var toggleElement = listItem.getElementsByClassName(parentToggle)[0];
-          toggleElement && action(toggleElement, 'click', clickHandler);
+          toggleElement && toggleElement[action]( 'click', clickHandler);
         });
-        navbarToggle && action(navbarToggle, 'click', clickHandler);
+        navbarToggle && navbarToggle[action]('click', clickHandler);
       },
       clickHandler = function(e) {
         e.preventDefault();
         var that = this, lookup, element;
         if ( (e.target === that || that.contains(e.target)) ) {
           element = that.closest('li') || that.closest('.navbar');
-          if ( !hasClass(element,openMobile) ) {
-            addClass(element,openMobile);
+          if ( !element.classList.contains(openMobile) ) {
+            element.classList.add(openMobile);
             lookup = toggleSiblings ? element.parentNode.getElementsByTagName('LI') : element.getElementsByTagName('LI');
             Array.from(lookup).map(function (x){ return x!==element && close(x); });
           } else {
-            removeClass(element,openMobile);
+            element.classList.remove(openMobile);
           }
         }
       },
@@ -128,8 +99,8 @@
         clearTimeout(that.timer);
         if (!that.isOpen && !checkView() ) {
           that.timer = setTimeout(function(){
-            addClass(that,openPosition);
-            addClass(that,openClass);
+            that.classList.add(openPosition);
+            that.classList.add(openClass);
             that.isOpen = 1;
             Array.from(that.parentNode.getElementsByTagName('LI'))
                   .map(function (x) { return x !== that && close(x); });
@@ -144,7 +115,7 @@
         }
       };
     this.dispose = function() {
-      toggleEvents(off);
+      toggleEvents();
       delete menu.Navbar;
     };
     menu = queryElement(target);
@@ -163,26 +134,19 @@
     breakpoint = !isNaN(breakpointOption) ? breakpointOption : dataBreakpoint && !isNaN(dataBreakpoint) ? parseInt(dataBreakpoint) : 768;
     toggleSiblings = !!toggleSiblingsOption ? toggleSiblingsOption : dataToggleSiblings && dataToggleSiblings === 'true' ? 1 : 0;
     delayDuration = !isNaN(delayOption) ? delayOption : dataDelay && !isNaN(dataDelay) ? parseInt(dataDelay) : 500;
-    toggleEvents(on);
+    toggleEvents(1);
     menu.Navbar = self;
   }
 
-  function one (element, event, handler, options) {
-    on(element, event, function handlerWrapper(e){
-      if (e.target === element) {
-        handler(e);
-        off(element, event, handlerWrapper, options);
-      }
-    }, options);
-  }
-
-  function initComponent() {
-    tryWrapper(function (){
-      var Navbars = Array.from(document.querySelectorAll('[data-function="navbar"]'));
-      Navbars.map(function (x){ return new Navbar(x); });
-    },'Navbar');
+  function initComponent(lookup) {
+    lookup = lookup ? lookup : document;
+    var Navbars = Array.from(lookup.querySelectorAll('[data-function="navbar"]'));
+    Navbars.map(function (x){ return new Navbar(x); });
   }
-  document.body ? initComponent() : one(document, 'DOMContentLoaded', initComponent);
+  document.body ? initComponent() : document.addEventListener( 'DOMContentLoaded', function iniWrapper(){
+    initComponent();
+    document.removeEventListener( 'DOMContentLoaded', iniWrapper );
+  });
 
   return Navbar;
 
diff --git a/dist/js/navbar.min.js b/dist/js/navbar.min.js
index a588ccf..70b944d 100644
--- a/dist/js/navbar.min.js
+++ b/dist/js/navbar.min.js
@@ -1,2 +1,2 @@
-// Navbar.js v2.0.5 | thednp © 2020 | MIT-License
-!function(e,t){"object"==typeof exports&&"undefined"!=typeof module?module.exports=t():"function"==typeof define&&define.amd?define(t):(e=e||self).Navbar=t()}(this,(function(){"use strict";function e(e,t,n,o){o=o||!1,e.addEventListener(t,n,o)}function t(e,t,n,o){o=o||!1,e.removeEventListener(t,n,o)}function n(e,t){e.classList.add(t)}function o(e,t){e.classList.remove(t)}function i(e,t){return e.classList.contains(t)}var a,r,s,u,m="onmouseleave"in document?["mouseenter","mouseleave"]:["mouseover","mouseout"],l="webkitTransition"in document.body.style||"transition"in document.body.style,c="webkitTransition"in document.body.style?"webkitTransitionDuration":"transitionDuration";function f(e){var t=l?window.getComputedStyle(e)[c]:0;return t="number"!=typeof(t=parseFloat(t))||isNaN(t)?0:1e3*t}function d(a,r){r=r||{};var s,u,l,c,d,p,b,g,y,v,N,E,h,T,L,w,A,B,C=function(e,t){i(e,"open")&&(o(e,"open"),t?setTimeout((function(){o(e,"open-position"),e.isOpen=0}),p):(o(e,"open-position"),e.isOpen=0)),i(e,"open-mobile")&&o(e,"open-mobile")},k=function(){return c&&"none"!==getComputedStyle(c).display||window.innerWidth<h},I=function(e){Array.from(u).map((function(t){i(t.lastElementChild,"subnav")&&(e(t,m[0],S),e(t,m[1],D));var n=t.getElementsByClassName("parent-toggle")[0];n&&e(n,"click",O)})),l&&e(l,"click",O)},O=function(e){e.preventDefault();var t,a;(e.target===this||this.contains(e.target))&&(i(a=this.closest("li")||this.closest(".navbar"),"open-mobile")?o(a,"open-mobile"):(n(a,"open-mobile"),t=T?a.parentNode.getElementsByTagName("LI"):a.getElementsByTagName("LI"),Array.from(t).map((function(e){return e!==a&&C(e)}))))},S=function(){var e=this;clearTimeout(e.timer),e.isOpen||k()||(e.timer=setTimeout((function(){n(e,"open-position"),n(e,"open"),e.isOpen=1,Array.from(e.parentNode.getElementsByTagName("LI")).map((function(t){return t!==e&&C(t)}))}),17))},D=function(){var e=this;e.isOpen&&!k()&&(clearTimeout(e.timer),e.timer=setTimeout((function(){return C(e,1)}),L))};this.dispose=function(){I(t),delete s.Navbar},w=a,B=A&&A instanceof Element?A:document,(s=w instanceof Element?w:B.querySelector(w)).Navbar&&s.Navbar.dispose(),u=s.getElementsByTagName("LI"),l=s.getElementsByClassName("navbar-toggle")[0],c=s.getElementsByClassName("parent-toggle")[0],d=s.getElementsByClassName("subnav")[0],p=d?f(d):0,b=r.breakpoint,g=r.toggleSiblings,y=r.delay,v=s.getAttribute("data-breakpoint"),N=s.getAttribute("data-toggle-siblings"),E=s.getAttribute("data-delay"),h=isNaN(b)?v&&!isNaN(v)?parseInt(v):768:b,T=g||(N&&"true"===N?1:0),L=isNaN(y)?E&&!isNaN(E)?parseInt(E):500:y,I(e),s.Navbar=this}function p(){!function(e,t){try{e()}catch(e){console.error(t+": "+e)}}((function(){Array.from(document.querySelectorAll('[data-function="navbar"]')).map((function(e){return new d(e)}))}),"Navbar")}return document.body?p():(a=document,s=p,e(a,r="DOMContentLoaded",(function e(n){n.target===a&&(s(n),t(a,r,e,u))}),u)),d}));
+// Navbar.js v2.0.6 | thednp © 2020 | MIT-License
+!function(e,t){"object"==typeof exports&&"undefined"!=typeof module?module.exports=t():"function"==typeof define&&define.amd?define(t):(e=e||self).Navbar=t()}(this,(function(){"use strict";var e="onmouseleave"in document?["mouseenter","mouseleave"]:["mouseover","mouseout"],t="webkitTransition"in document.body.style||"transition"in document.body.style,n="webkitTransition"in document.body.style?"webkitTransitionDuration":"transitionDuration";function o(e){var o=t?parseFloat(getComputedStyle(e)[n]):0;return o="number"!=typeof o||isNaN(o)?0:1e3*o}function i(t,n){n=n||{};var i,s,a,r,l,m,u,c,d,p,f,v,b,g,y,N,L,E,T=function(e,t){e.classList.contains("open")&&(e.classList.remove("open"),t?setTimeout((function(){e.classList.remove("open-position"),e.isOpen=0}),m):(e.classList.remove("open-position"),e.isOpen=0)),e.classList.contains("open-mobile")&&e.classList.remove("open-mobile")},h=function(){return r&&"none"!==getComputedStyle(r).display||window.innerWidth<b},C=function(t){t=t?"addEventListener":"removeEventListener",Array.from(s).map((function(n){n.lastElementChild.classList.contains("subnav")&&(n[t](e[0],B),n[t](e[1],k));var o=n.getElementsByClassName("parent-toggle")[0];o&&o[t]("click",A)})),a&&a[t]("click",A)},A=function(e){e.preventDefault();var t,n;(e.target===this||this.contains(e.target))&&((n=this.closest("li")||this.closest(".navbar")).classList.contains("open-mobile")?n.classList.remove("open-mobile"):(n.classList.add("open-mobile"),t=g?n.parentNode.getElementsByTagName("LI"):n.getElementsByTagName("LI"),Array.from(t).map((function(e){return e!==n&&T(e)}))))},B=function(){var e=this;clearTimeout(e.timer),e.isOpen||h()||(e.timer=setTimeout((function(){e.classList.add("open-position"),e.classList.add("open"),e.isOpen=1,Array.from(e.parentNode.getElementsByTagName("LI")).map((function(t){return t!==e&&T(t)}))}),17))},k=function(){var e=this;e.isOpen&&!h()&&(clearTimeout(e.timer),e.timer=setTimeout((function(){return T(e,1)}),y))};this.dispose=function(){C(),delete i.Navbar},N=t,E=L&&L instanceof Element?L:document,(i=N instanceof Element?N:E.querySelector(N)).Navbar&&i.Navbar.dispose(),s=i.getElementsByTagName("LI"),a=i.getElementsByClassName("navbar-toggle")[0],r=i.getElementsByClassName("parent-toggle")[0],l=i.getElementsByClassName("subnav")[0],m=l?o(l):0,u=n.breakpoint,c=n.toggleSiblings,d=n.delay,p=i.getAttribute("data-breakpoint"),f=i.getAttribute("data-toggle-siblings"),v=i.getAttribute("data-delay"),b=isNaN(u)?p&&!isNaN(p)?parseInt(p):768:u,g=c||(f&&"true"===f?1:0),y=isNaN(d)?v&&!isNaN(v)?parseInt(v):500:d,C(1),i.Navbar=this}function s(e){e=e||document,Array.from(e.querySelectorAll('[data-function="navbar"]')).map((function(e){return new i(e)}))}return document.body?s():document.addEventListener("DOMContentLoaded",(function e(){s(),document.removeEventListener("DOMContentLoaded",e)})),i}));
diff --git a/package.json b/package.json
index 0bd1a75..9e5cdaf 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "navbar.js",
-  "version": "2.0.5",
+  "version": "2.0.6",
   "description": "Navbar.js Modern Navigation Component",
   "main": "dist/js/navbar.min.js",
   "module": "dist/js/navbar.esm.js",
@@ -55,12 +55,12 @@
   },
   "homepage": "http://thednp.github.io/navbar.js",
   "dependencies": {
-    "shorter-js": "^0.0.5",
-    "minifill": "^0.0.7"
+    "shorter-js": "^0.1.0",
+    "minifill": "^0.0.8"
   },
   "devDependencies": {
     "@rollup/plugin-buble": "^0.21.3",
-    "@rollup/plugin-json": "^4.0.3",
+    "@rollup/plugin-json": "^4.1.0",
     "@rollup/plugin-node-resolve": "^7.1.3",
     "node-sass": "^4.14.1",
     "npm-run-all": "^4.1.5",
@@ -69,6 +69,6 @@
     "rollup-plugin-sass": "^1.2.2",
     "rollup-plugin-scss": "^2.5.0",
     "rollup-plugin-terser": "^5.3.0",
-    "sass": "^1.26.7"
+    "sass": "^1.26.8"
   }
 }
diff --git a/src/js/init.js b/src/js/init.js
index 7f8f48f..cca051c 100644
--- a/src/js/init.js
+++ b/src/js/init.js
@@ -1,13 +1,14 @@
 import Navbar from './navbar.js'
-import {one} from 'shorter-js/src/event/one.js'
-import {tryWrapper} from 'shorter-js/src/misc/tryWrapper.js'
 
 // DATA API
-function initComponent() {
-  tryWrapper(()=>{
-    let Navbars = Array.from(document.querySelectorAll('[data-function="navbar"]'));
-    Navbars.map(x=>new Navbar(x))
-  },'Navbar')
+function initComponent(lookup) {
+  lookup = lookup ? lookup : document;
+  let Navbars = Array.from(lookup.querySelectorAll('[data-function="navbar"]'));
+  Navbars.map(x=>new Navbar(x))
 }
 // initialize when loaded
-document.body ? initComponent() : one(document, 'DOMContentLoaded', initComponent);
+document.body ? initComponent() : document.addEventListener( 'DOMContentLoaded', function iniWrapper(){
+  initComponent();
+  document.removeEventListener( 'DOMContentLoaded', iniWrapper )
+});
+
diff --git a/src/js/navbar.js b/src/js/navbar.js
index fef5c53..e97df23 100644
--- a/src/js/navbar.js
+++ b/src/js/navbar.js
@@ -1,12 +1,6 @@
-import {on} from 'shorter-js/src/event/on.js'
-import {off} from 'shorter-js/src/event/off.js'
-import {addClass} from 'shorter-js/src/class/addClass.js'
-import {removeClass} from 'shorter-js/src/class/removeClass.js'
-import {hasClass} from 'shorter-js/src/class/hasClass.js'
-import {mouseHoverEvents} from 'shorter-js/src/strings/mouseHoverEvents.js'
-import {getElementTransitionDuration} from 'shorter-js/src/misc/getElementTransitionDuration.js'
-import {queryElement} from 'shorter-js/src/misc/queryElement.js'
-import {tryWrapper} from 'shorter-js/src/misc/tryWrapper.js'
+import mouseHoverEvents from 'shorter-js/src/strings/mouseHoverEvents.js'
+import getElementTransitionDuration from 'shorter-js/src/misc/getElementTransitionDuration.js'
+import queryElement from 'shorter-js/src/misc/queryElement.js'
 
 // Navbar
 export default function Navbar(target, options) {
@@ -44,20 +38,20 @@ export default function Navbar(target, options) {
     
     // private methods
     close = function (element, leave) {
-      if (hasClass(element,openClass)) {
-        removeClass(element, openClass)
+      if (element.classList.contains(openClass)) {
+        element.classList.remove(openClass)
         if (leave) {
           setTimeout(function () {
-            removeClass(element, openPosition)
+            element.classList.remove(openPosition)
             element.isOpen = 0
           }, transitionDuration)
         } else {
-          removeClass(element, openPosition)
+          element.classList.remove(openPosition)
           element.isOpen = 0
         }
       } 
-      if (hasClass(element,openMobile)) {
-        removeClass(element,openMobile)
+      if (element.classList.contains(openMobile)) {
+        element.classList.remove(openMobile)
       }
     },
 
@@ -66,15 +60,16 @@ export default function Navbar(target, options) {
       return firstToggle && getComputedStyle(firstToggle).display !== 'none' || window.innerWidth < breakpoint; 
     },
     toggleEvents = function(action) {
+      action = action ? 'addEventListener' : 'removeEventListener';
       Array.from(items).map(listItem => {
-        if (hasClass(listItem.lastElementChild,'subnav') ) {
-          action(listItem, mouseHoverEvents[0], enterHandler);
-          action(listItem, mouseHoverEvents[1], leaveHandler);
+        if (listItem.lastElementChild.classList.contains('subnav') ) {
+          listItem[action](mouseHoverEvents[0], enterHandler);
+          listItem[action](mouseHoverEvents[1], leaveHandler);
         }
         let toggleElement = listItem.getElementsByClassName(parentToggle)[0]
-        toggleElement && action(toggleElement, 'click', clickHandler); 
+        toggleElement && toggleElement[action]( 'click', clickHandler); 
       })
-      navbarToggle && action(navbarToggle, 'click', clickHandler);
+      navbarToggle && navbarToggle[action]('click', clickHandler);
     },
 
     // handlers
@@ -83,12 +78,12 @@ export default function Navbar(target, options) {
       let that = this, lookup, element;
       if ( (e.target === that || that.contains(e.target)) ) {
         element = that.closest('li') || that.closest('.navbar');
-        if ( !hasClass(element,openMobile) ) {
-          addClass(element,openMobile);                        
+        if ( !element.classList.contains(openMobile) ) {
+          element.classList.add(openMobile);                        
           lookup = toggleSiblings ? element.parentNode.getElementsByTagName('LI') : element.getElementsByTagName('LI');
           Array.from(lookup).map(x=>x!==element && close(x));
         } else {
-          removeClass(element,openMobile);
+          element.classList.remove(openMobile);
         }
       }
     },
@@ -97,8 +92,8 @@ export default function Navbar(target, options) {
       clearTimeout(that.timer)
       if (!that.isOpen && !checkView() ) {
         that.timer = setTimeout(function(){
-          addClass(that,openPosition)
-          addClass(that,openClass)
+          that.classList.add(openPosition)
+          that.classList.add(openClass)
           that.isOpen = 1
           Array.from(that.parentNode.getElementsByTagName('LI'))
                 .map(x => x !== that && close(x))
@@ -115,7 +110,7 @@ export default function Navbar(target, options) {
 
   // public method
   this.dispose = function() {
-    toggleEvents(off)
+    toggleEvents()
     delete menu.Navbar
   }
 
@@ -148,7 +143,7 @@ export default function Navbar(target, options) {
   delayDuration = !isNaN(delayOption) ? delayOption : dataDelay && !isNaN(dataDelay) ? parseInt(dataDelay) : 500;
   
   // attach events
-  toggleEvents(on)
+  toggleEvents(1)
   menu.Navbar = self
 
 }
\ No newline at end of file