kotovalexarian-likes-gitlab/gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

Removes group_avatar & group_label_subscription from global namespace

Browse source
This commit is contained in:
Filipa Lacerda 2017-10-23 16:05:53 +03:00
parent 9931ef4a8a
commit c9045c00e6
No known key found for this signature in database
GPG key ID: 9CA3FDE4D1E2F1C8
4 changed files with 20 additions and 33 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
app/assets/javascripts/dispatcher.js
View file

@ -8,7 +8,8 @@
/* global NewBranchForm */ /* global NewBranchForm */
/* global NotificationsForm */ /* global NotificationsForm */
/* global NotificationsDropdown */ /* global NotificationsDropdown */
/* global GroupAvatar */ import groupAvatar from './group_avatar';
import GroupLabelSubscription from './group_label_subscription';
/* global LineHighlighter */ /* global LineHighlighter */
import BuildArtifacts from './build_artifacts'; import BuildArtifacts from './build_artifacts';
import CILintEditor from './ci_lint_editor'; import CILintEditor from './ci_lint_editor';
@ -423,11 +424,11 @@ import Diff from './diff';
case 'admin:groups:create': case 'admin:groups:create':
BindInOut.initAll(); BindInOut.initAll();
new Group(); new Group();
new GroupAvatar(); groupAvatar();
break; break;
case 'groups:edit': case 'groups:edit':
case 'admin:groups:edit': case 'admin:groups:edit':
new GroupAvatar(); groupAvatar();
break; break;
case 'projects:tree:show': case 'projects:tree:show':
shortcut_handler = new ShortcutsNavigation(); shortcut_handler = new ShortcutsNavigation();
@ -474,7 +475,7 @@ import Diff from './diff';
const $el = $(el); const $el = $(el);
if ($el.find('.dropdown-group-label').length) { if ($el.find('.dropdown-group-label').length) {
new gl.GroupLabelSubscription($el); new GroupLabelSubscription($el);
} else { } else {
new gl.ProjectLabelSubscription($el); new gl.ProjectLabelSubscription($el);
} }

31
app/assets/javascripts/group_avatar.js
View file

@ -1,19 +1,12 @@
/* eslint-disable func-names, space-before-function-paren, wrap-iife, quotes, no-var, one-var, one-var-declaration-per-line, no-useless-escape, max-len */ export default function groupAvatar() {
$('.js-choose-group-avatar-button').on('click', function onClickGroupAvatar() {
window.GroupAvatar = (function() { const form = $(this).closest('form');
function GroupAvatar() { return form.find('.js-group-avatar-input').click();
$('.js-choose-group-avatar-button').on("click", function() { });
var form; $('.js-group-avatar-input').on('change', function onChangeAvatarInput() {
form = $(this).closest("form"); const form = $(this).closest('form');
return form.find(".js-group-avatar-input").click(); // eslint-disable-next-line no-useless-escape
}); const filename = $(this).val().replace(/^.*[\\\/]/, '');
$('.js-group-avatar-input').on("change", function() { return form.find('.js-avatar-filename').text(filename);
var filename, form; });
form = $(this).closest("form"); }
filename = $(this).val().replace(/^.*[\\\/]/, '');
return form.find(".js-avatar-filename").text(filename);
});
}
return GroupAvatar;
})();

11
app/assets/javascripts/group_label_subscription.js
View file

@ -1,6 +1,4 @@
/* eslint-disable func-names, object-shorthand, comma-dangle, wrap-iife, space-before-function-paren, no-param-reassign, max-len */ export default class GroupLabelSubscription {
class GroupLabelSubscription {
constructor(container) { constructor(container) {
const $container = $(container); const $container = $(container);
this.$dropdown = $container.find('.dropdown'); this.$dropdown = $container.find('.dropdown');
@ -18,7 +16,7 @@ class GroupLabelSubscription {
$.ajax({ $.ajax({
type: 'POST', type: 'POST',
url: url url,
}).done(() => { }).done(() => {
this.toggleSubscriptionButtons(); this.toggleSubscriptionButtons();
this.$unsubscribeButtons.removeAttr('data-url'); this.$unsubscribeButtons.removeAttr('data-url');
@ -35,7 +33,7 @@ class GroupLabelSubscription {
$.ajax({ $.ajax({
type: 'POST', type: 'POST',
url: url url,
}).done(() => { }).done(() => {
this.toggleSubscriptionButtons(); this.toggleSubscriptionButtons();
}); });
@ -47,6 +45,3 @@ class GroupLabelSubscription {
this.$unsubscribeButtons.toggleClass('hidden'); this.$unsubscribeButtons.toggleClass('hidden');
} }
} }
window.gl = window.gl || {};
window.gl.GroupLabelSubscription = GroupLabelSubscription;

2
app/assets/javascripts/main.js
View file

@ -55,8 +55,6 @@ import './gl_dropdown';
import './gl_field_error'; import './gl_field_error';
import './gl_field_errors'; import './gl_field_errors';
import './gl_form'; import './gl_form';
import './group_avatar';
import './group_label_subscription';
import './groups_select'; import './groups_select';
import './header'; import './header';
import './importer_status'; import './importer_status';