diff options
| author | Phil Hughes <me@iamphill.com> | 2016-10-06 17:30:34 +0300 |
|---|---|---|
| committer | Phil Hughes <me@iamphill.com> | 2016-10-06 17:30:34 +0300 |
| commit | 996e802415aa1edadb96b1f7efa924581fb047ed (patch) | |
| tree | 316dd7319d2cc723b5c311f099065e9b4fdb11d6 /app/assets/javascripts/dispatcher.js | |
| parent | a0eaff14124b829ccc02df951bd7cb7d3abb7708 (diff) | |
| parent | dcfda304aa8c06f427cb5672ceb4e070047436be (diff) | |
Merge branch 'master' into members-ui
Diffstat (limited to 'app/assets/javascripts/dispatcher.js')
| -rw-r--r-- | app/assets/javascripts/dispatcher.js | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/app/assets/javascripts/dispatcher.js b/app/assets/javascripts/dispatcher.js index 0fddb67f97c..1eee2c65400 100644 --- a/app/assets/javascripts/dispatcher.js +++ b/app/assets/javascripts/dispatcher.js @@ -26,7 +26,7 @@ case 'projects:merge_requests:index': case 'projects:issues:index': Issuable.init(); - new IssuableBulkActions(); + new gl.IssuableBulkActions(); shortcut_handler = new ShortcutsNavigation(); break; case 'projects:issues:show': @@ -40,7 +40,7 @@ new Milestone(); break; case 'dashboard:todos:index': - new Todos(); + new gl.Todos(); break; case 'projects:milestones:new': case 'projects:milestones:edit': @@ -59,7 +59,9 @@ shortcut_handler = new ShortcutsNavigation(); new GLForm($('.issue-form')); new IssuableForm($('.issue-form')); - new IssuableTemplateSelectors(); + new LabelsSelect(); + new MilestoneSelect(); + new gl.IssuableTemplateSelectors(); break; case 'projects:merge_requests:new': case 'projects:merge_requests:edit': @@ -67,7 +69,9 @@ shortcut_handler = new ShortcutsNavigation(); new GLForm($('.merge-request-form')); new IssuableForm($('.merge-request-form')); - new IssuableTemplateSelectors(); + new LabelsSelect(); + new MilestoneSelect(); + new gl.IssuableTemplateSelectors(); break; case 'projects:tags:new': new ZenMode(); @@ -165,7 +169,7 @@ break; case 'projects:labels:index': if ($('.prioritized-labels').length) { - new LabelManager(); + new gl.LabelManager(); } break; case 'projects:network:show': @@ -279,7 +283,7 @@ Dispatcher.prototype.initSearch = function() { // Only when search form is present if ($('.search').length) { - return new SearchAutocomplete(); + return new gl.SearchAutocomplete(); } }; |