Commit 1b5f1795 authored by Filipa Lacerda's avatar Filipa Lacerda

Merge branch 'projects-l' into 'master'

Refactor projects:l*

See merge request gitlab-org/gitlab-ce!16393
parents e4aa2bd3 d85f72b1
...@@ -442,12 +442,24 @@ import Activities from './activities'; ...@@ -442,12 +442,24 @@ import Activities from './activities';
break; break;
case 'groups:labels:new': case 'groups:labels:new':
case 'groups:labels:edit': case 'groups:labels:edit':
new Labels();
break;
case 'projects:labels:new': case 'projects:labels:new':
import('./pages/projects/labels/new')
.then(callDefault)
.catch(fail);
break;
case 'projects:labels:edit': case 'projects:labels:edit':
new Labels(); import('./pages/projects/labels/edit')
.then(callDefault)
.catch(fail);
break; break;
case 'groups:labels:index':
case 'projects:labels:index': case 'projects:labels:index':
import('./pages/projects/labels/index')
.then(callDefault)
.catch(fail);
break;
case 'groups:labels:index':
if ($('.prioritized-labels').length) { if ($('.prioritized-labels').length) {
new LabelManager(); new LabelManager();
} }
......
import LabelManager from './label_manager';
import GroupLabelSubscription from './group_label_subscription';
import ProjectLabelSubscription from './project_label_subscription';
export default () => {
if ($('.prioritized-labels').length) {
new LabelManager(); // eslint-disable-line no-new
}
$('.label-subscription').each((i, el) => {
const $el = $(el);
if ($el.find('.dropdown-group-label').length) {
new GroupLabelSubscription($el); // eslint-disable-line no-new
} else {
new ProjectLabelSubscription($el); // eslint-disable-line no-new
}
});
};
import Labels from '~/labels';
export default () => new Labels();
import initLabels from '~/init_labels';
export default initLabels;
import Labels from '~/labels';
export default () => new Labels();
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment