diff options
author | Phil Hughes <me@iamphill.com> | 2017-12-19 08:32:51 +0000 |
---|---|---|
committer | Phil Hughes <me@iamphill.com> | 2017-12-19 10:47:41 +0000 |
commit | 30ea58dabb8ea468c355b3456cf4fc14576a6e07 (patch) | |
tree | 602cd33a34e411d167430a360dc05ecad8c2e793 /app/assets/javascripts/main.js | |
parent | 888ed3096946f3b7b93d621285ae4c2c6aeef9d0 (diff) | |
download | gitlab-ce-30ea58dabb8ea468c355b3456cf4fc14576a6e07.tar.gz |
Changed layout_nav to ES module
Diffstat (limited to 'app/assets/javascripts/main.js')
-rw-r--r-- | app/assets/javascripts/main.js | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/app/assets/javascripts/main.js b/app/assets/javascripts/main.js index 15a3a91c5f5..59bfa482bb0 100644 --- a/app/assets/javascripts/main.js +++ b/app/assets/javascripts/main.js @@ -41,7 +41,7 @@ import Flash, { removeFlashClickListener } from './flash'; import './gl_dropdown'; import initTodoToggle from './header'; import initImporterStatus from './importer_status'; -import './layout_nav'; +import initLayoutNav from './layout_nav'; import LazyLoader from './lazy_loader'; import './line_highlighter'; import initLogoAnimation from './logo'; @@ -89,6 +89,7 @@ $(function () { var fitSidebarForSize; initBreadcrumbs(); + initLayoutNav(); initImporterStatus(); initTodoToggle(); initLogoAnimation(); @@ -261,8 +262,6 @@ $(function () { renderTimeago(); - $(document).trigger('init.scrolling-tabs'); - $('form.filter-form').on('submit', function (event) { const link = document.createElement('a'); link.href = this.action; |