summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorConstance Okoghenun <cokoghenun@gitlab.com>2018-01-15 10:44:09 +0100
committerConstance Okoghenun <cokoghenun@gitlab.com>2018-01-15 10:44:09 +0100
commitae04c858b9b221eef13da131f90c3d388cf428c6 (patch)
tree12a9c380295eaf90ebb57e9f288f9a2f4987b3bb
parent24fa3461e1acbd3f0b1cd6cc11566a2571b16de0 (diff)
downloadgitlab-ce-projects-tree-tags-dispatcher-refactor.tar.gz
refactored use of for projects:tree:*projects-tree-tags-dispatcher-refactor
-rw-r--r--app/assets/javascripts/dispatcher.js5
-rw-r--r--app/assets/javascripts/pages/projects/tree/show/index.js3
2 files changed, 3 insertions, 5 deletions
diff --git a/app/assets/javascripts/dispatcher.js b/app/assets/javascripts/dispatcher.js
index 0c17e086e5c..05fb0e33ed3 100644
--- a/app/assets/javascripts/dispatcher.js
+++ b/app/assets/javascripts/dispatcher.js
@@ -411,10 +411,9 @@ import { fetchCommitMergeRequests } from './commit_merge_requests';
break;
case 'projects:tree:show':
import('./pages/projects/tree/show')
- .then((module) => {
- shortcut_handler = module.default();
- })
+ .then(callDefault)
.catch(fail);
+ shortcut_handler = true;
break;
case 'projects:find_file:show':
const findElement = document.querySelector('.js-file-finder');
diff --git a/app/assets/javascripts/pages/projects/tree/show/index.js b/app/assets/javascripts/pages/projects/tree/show/index.js
index c40866548bc..28a0160f47d 100644
--- a/app/assets/javascripts/pages/projects/tree/show/index.js
+++ b/app/assets/javascripts/pages/projects/tree/show/index.js
@@ -5,12 +5,11 @@ import NewCommitForm from '../../../../new_commit_form';
import { ajaxGet } from '../../../../lib/utils/common_utils';
export default () => {
+ new ShortcutsNavigation(); // eslint-disable-line no-new
new TreeView(); // eslint-disable-line no-new
new BlobViewer(); // eslint-disable-line no-new
new NewCommitForm($('.js-create-dir-form')); // eslint-disable-line no-new
$('#tree-slider').waitForImages(() =>
ajaxGet(document.querySelector('.js-tree-content').dataset.logsPath));
-
- return new ShortcutsNavigation(); // eslint-disable-line no-new
};