Skip to content

Commit d2f313d

Browse files
author
Filipa Lacerda
committed
Merge branch 'ph-more-es-modules' into 'master'
Export JS classes as modules See merge request gitlab-org/gitlab-ce!15952
2 parents dc17e7d + 29e1a63 commit d2f313d

13 files changed

+466
-503
lines changed

app/assets/javascripts/activities.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/* eslint-disable no-param-reassign, class-methods-use-this */
2-
/* global Pager */
32

43
import Cookies from 'js-cookie';
4+
import Pager from './pager';
55
import { localTimeAgo } from './lib/utils/datetime_utility';
66

77
export default class Activities {

app/assets/javascripts/commits.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
/* eslint-disable func-names, wrap-iife, consistent-return,
22
no-return-assign, no-param-reassign, one-var-declaration-per-line, no-unused-vars,
33
prefer-template, object-shorthand, prefer-arrow-callback */
4-
/* global Pager */
54

65
import { pluralize } from './lib/utils/text_utility';
76
import { localTimeAgo } from './lib/utils/datetime_utility';
7+
import Pager from './pager';
88

99
export default (function () {
1010
const CommitsList = {};

app/assets/javascripts/dispatcher.js

+5-5
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@ import IssuableForm from './issuable_form';
77
import LabelsSelect from './labels_select';
88
/* global MilestoneSelect */
99
import NewBranchForm from './new_branch_form';
10-
/* global NotificationsForm */
11-
/* global NotificationsDropdown */
10+
import NotificationsForm from './notifications_form';
11+
import notificationsDropdown from './notifications_dropdown';
1212
import groupAvatar from './group_avatar';
1313
import GroupLabelSubscription from './group_label_subscription';
1414
/* global LineHighlighter */
@@ -414,7 +414,7 @@ import Activities from './activities';
414414
const newGroupChildWrapper = document.querySelector('.js-new-project-subgroup');
415415
shortcut_handler = new ShortcutsNavigation();
416416
new NotificationsForm();
417-
new NotificationsDropdown();
417+
notificationsDropdown();
418418
new ProjectsList();
419419

420420
if (newGroupChildWrapper) {
@@ -617,7 +617,7 @@ import Activities from './activities';
617617
break;
618618
case 'profiles':
619619
new NotificationsForm();
620-
new NotificationsDropdown();
620+
notificationsDropdown();
621621
break;
622622
case 'projects':
623623
new Project();
@@ -640,7 +640,7 @@ import Activities from './activities';
640640
case 'show':
641641
new Star();
642642
new ProjectNew();
643-
new NotificationsDropdown();
643+
notificationsDropdown();
644644
break;
645645
case 'wikis':
646646
new Wikis();

app/assets/javascripts/main.js

-9
Original file line numberDiff line numberDiff line change
@@ -34,16 +34,11 @@ import { getLocationHash, visitUrl } from './lib/utils/url_utility';
3434
import './behaviors/';
3535

3636
// everything else
37-
import './activities';
38-
import './admin';
3937
import loadAwardsHandler from './awards_handler';
4038
import bp from './breakpoints';
4139
import './confirm_danger_modal';
4240
import Flash, { removeFlashClickListener } from './flash';
4341
import './gl_dropdown';
44-
import './gl_field_error';
45-
import './gl_field_errors';
46-
import './gl_form';
4742
import initTodoToggle from './header';
4843
import initImporterStatus from './importer_status';
4944
import './layout_nav';
@@ -54,11 +49,7 @@ import './merge_request';
5449
import './merge_request_tabs';
5550
import './milestone_select';
5651
import './notes';
57-
import './notifications_dropdown';
58-
import './notifications_form';
59-
import './pager';
6052
import './preview_markdown';
61-
import './project_import';
6253
import './projects_dropdown';
6354
import './render_gfm';
6455
import './right_sidebar';

app/assets/javascripts/merge_request.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33

44
import 'vendor/jquery.waitforimages';
55
import TaskList from './task_list';
6-
import './merge_request_tabs';
6+
import MergeRequestTabs from './merge_request_tabs';
77
import IssuablesHelper from './helpers/issuables_helper';
88
import { addDelimiter } from './lib/utils/text_utility';
99

@@ -51,7 +51,7 @@ import { addDelimiter } from './lib/utils/text_utility';
5151
if (window.mrTabs) {
5252
window.mrTabs.unbindEvents();
5353
}
54-
window.mrTabs = new gl.MergeRequestTabs(this.opts);
54+
window.mrTabs = new MergeRequestTabs(this.opts);
5555
};
5656

5757
MergeRequest.prototype.showAllCommits = function() {

0 commit comments

Comments
 (0)