Merge branch 'master' into sidebar-fly-out-sub-nav

1 files changed, 7 insertions, 3 deletions

diff --git a/app/assets/javascripts/layout_nav.js b/app/assets/javascripts/layout_nav.js
index e0363e091a7..5c1ba416a03 100644
--- a/app/assets/javascripts/layout_nav.js
+++ b/app/assets/javascripts/layout_nav.js
@@ -1,6 +1,7 @@
 /* eslint-disable func-names, space-before-function-paren, no-var, prefer-arrow-callback, no-unused-vars, one-var, one-var-declaration-per-line, vars-on-top, max-len */
-import Cookies from 'js-cookie';
 import _ from 'underscore';
+import Cookies from 'js-cookie';
+import NewNavSidebar from './new_sidebar';
 import initFlyOutNav from './fly_out_nav';
 
 (function() {
@@ -55,10 +56,13 @@ import initFlyOutNav from './fly_out_nav';
   }
 
   $(() => {
-    $(window).on('scroll', _.throttle(applyScrollNavClass, 100));
-
     if (Cookies.get('new_nav') === 'true') {
+      const newNavSidebar = new NewNavSidebar();
+      newNavSidebar.bindEvents();
+
       initFlyOutNav();
     }
+
+    $(window).on('scroll', _.throttle(applyScrollNavClass, 100));
   });
 }).call(window);