diff options
author | Phil Hughes <me@iamphill.com> | 2018-01-15 08:58:23 +0000 |
---|---|---|
committer | Phil Hughes <me@iamphill.com> | 2018-01-15 08:58:23 +0000 |
commit | b3d85110d207a8a95650edf37b97eb32f539d962 (patch) | |
tree | 3243f5d8440d06df3a13e84d90c9a1c1dcb3b265 | |
parent | 55e2bafc9ccbaa1be5d5e39a0fed3d4adda58223 (diff) | |
parent | 11e059d757ac37aa9f1488344253a1df4177d962 (diff) | |
download | gitlab-ce-b3d85110d207a8a95650edf37b97eb32f539d962.tar.gz |
Merge branch 'snippets-dispatcher-refactor' into 'master'
Refactor dispatcher for snippets:*
See merge request gitlab-org/gitlab-ce!16390
-rw-r--r-- | app/assets/javascripts/dispatcher.js | 21 | ||||
-rw-r--r-- | app/assets/javascripts/pages/snippets/edit/index.js | 3 | ||||
-rw-r--r-- | app/assets/javascripts/pages/snippets/form.js | 7 | ||||
-rw-r--r-- | app/assets/javascripts/pages/snippets/new/index.js | 3 |
4 files changed, 31 insertions, 3 deletions
diff --git a/app/assets/javascripts/dispatcher.js b/app/assets/javascripts/dispatcher.js index 0aebab36ac5..28014946a39 100644 --- a/app/assets/javascripts/dispatcher.js +++ b/app/assets/javascripts/dispatcher.js @@ -282,11 +282,24 @@ import { fetchCommitMergeRequests } from './commit_merge_requests'; new ZenMode(); break; case 'snippets:new': + import('./pages/snippets/new') + .then(callDefault) + .catch(fail); + break; case 'snippets:edit': + import('./pages/snippets/edit') + .then(callDefault) + .catch(fail); + break; case 'snippets:create': + import('./pages/snippets/new') + .then(callDefault) + .catch(fail); + break; case 'snippets:update': - new GLForm($('.snippet-form'), false); - new ZenMode(); + import('./pages/snippets/edit') + .then(callDefault) + .catch(fail); break; case 'projects:releases:edit': new ZenMode(); @@ -548,7 +561,9 @@ import { fetchCommitMergeRequests } from './commit_merge_requests'; import('./pages/admin/conversational_development_index/show').then(m => m.default()).catch(fail); break; case 'snippets:show': - import('./pages/snippets/show').then(m => m.default()).catch(fail); + import('./pages/snippets/show') + .then(callDefault) + .catch(fail); break; case 'import:fogbugz:new_user_map': import('./pages/import/fogbugz/new_user_map').then(m => m.default()).catch(fail); diff --git a/app/assets/javascripts/pages/snippets/edit/index.js b/app/assets/javascripts/pages/snippets/edit/index.js new file mode 100644 index 00000000000..9c664b5f1ff --- /dev/null +++ b/app/assets/javascripts/pages/snippets/edit/index.js @@ -0,0 +1,3 @@ +import form from '../form'; + +export default form; diff --git a/app/assets/javascripts/pages/snippets/form.js b/app/assets/javascripts/pages/snippets/form.js new file mode 100644 index 00000000000..f996d3cd74e --- /dev/null +++ b/app/assets/javascripts/pages/snippets/form.js @@ -0,0 +1,7 @@ +import GLForm from '~/gl_form'; +import ZenMode from '~/zen_mode'; + +export default () => { + new GLForm($('.snippet-form'), false); // eslint-disable-line no-new + new ZenMode(); // eslint-disable-line no-new +}; diff --git a/app/assets/javascripts/pages/snippets/new/index.js b/app/assets/javascripts/pages/snippets/new/index.js new file mode 100644 index 00000000000..9c664b5f1ff --- /dev/null +++ b/app/assets/javascripts/pages/snippets/new/index.js @@ -0,0 +1,3 @@ +import form from '../form'; + +export default form; |