diff options
| author | Fatih Acet <acetfatih@gmail.com> | 2018-01-11 20:50:29 +0000 |
|---|---|---|
| committer | Fatih Acet <acetfatih@gmail.com> | 2018-01-11 20:50:29 +0000 |
| commit | 31b3ccb5d2f74a20f2bd05f9bde554864a3bdd6c (patch) | |
| tree | 1990accc8e82d699b9e2f8e15b35e236aab3aa73 | |
| parent | ee5468449b1cef2288074c03eab33b35cbdff950 (diff) | |
| parent | 93f0e62ea1afa98229986f33ac9a368f83eec93c (diff) | |
| download | gitlab-ce-31b3ccb5d2f74a20f2bd05f9bde554864a3bdd6c.tar.gz | |
Merge branch 'dispatcher-boards' into 'master'
Refactor dispatcher project boards path
See merge request gitlab-org/gitlab-ce!16374
| -rw-r--r-- | app/assets/javascripts/dispatcher.js | 6 | ||||
| -rw-r--r-- | app/assets/javascripts/pages/projects/boards/index.js | 7 |
2 files changed, 11 insertions, 2 deletions
diff --git a/app/assets/javascripts/dispatcher.js b/app/assets/javascripts/dispatcher.js index 72a6426e901..b87cd036a82 100644 --- a/app/assets/javascripts/dispatcher.js +++ b/app/assets/javascripts/dispatcher.js @@ -148,8 +148,10 @@ import Activities from './activities'; break; case 'projects:boards:show': case 'projects:boards:index': - shortcut_handler = new ShortcutsNavigation(); - new UsersSelect(); + import('./pages/projects/boards/index') + .then(callDefault) + .catch(fail); + shortcut_handler = true; break; case 'projects:merge_requests:index': case 'projects:issues:index': diff --git a/app/assets/javascripts/pages/projects/boards/index.js b/app/assets/javascripts/pages/projects/boards/index.js new file mode 100644 index 00000000000..42c9bb5ec99 --- /dev/null +++ b/app/assets/javascripts/pages/projects/boards/index.js @@ -0,0 +1,7 @@ +import UsersSelect from '~/users_select'; +import ShortcutsNavigation from '~/shortcuts_navigation'; + +export default () => { + new UsersSelect(); // eslint-disable-line no-new + new ShortcutsNavigation(); // eslint-disable-line no-new +}; |