diff --git a/app/assets/javascripts/protected_tags/index.js b/app/assets/javascripts/protected_tags/index.js
index da036f5437e3f9efbfec4f4d757762a79e9341d5..61e7ba53862ac0aaf96eb9f4b24e884ef3adf328 100644
--- a/app/assets/javascripts/protected_tags/index.js
+++ b/app/assets/javascripts/protected_tags/index.js
@@ -1,5 +1,2 @@
-export { default as ProtectedTagAccessDropdown } from './protected_tag_access_dropdown';
export { default as ProtectedTagCreate } from './protected_tag_create';
-export { default as ProtectedTagDropdown } from './protected_tag_dropdown';
-export { default as ProtectedTagEdit } from './protected_tag_edit';
export { default as ProtectedTagEditList } from './protected_tag_edit_list';
diff --git a/app/assets/javascripts/protected_tags/protected_tag_access_dropdown.js b/app/assets/javascripts/protected_tags/protected_tag_access_dropdown.js
index 681b060f85940879c17d8797be2884fbde47bdba..fff83f3af3bb3c034d12328645e12b8cc3e83e7f 100644
--- a/app/assets/javascripts/protected_tags/protected_tag_access_dropdown.js
+++ b/app/assets/javascripts/protected_tags/protected_tag_access_dropdown.js
@@ -11,8 +11,8 @@ export default class ProtectedTagAccessDropdown {
selectable: true,
inputId: this.options.$dropdown.data('input-id'),
fieldName: this.options.$dropdown.data('field-name'),
- toggleLabel(item, el) {
- if (el.is('.is-active')) {
+ toggleLabel(item, $el) {
+ if ($el.is('.is-active')) {
return item.text;
}
return 'Select';
diff --git a/app/assets/javascripts/protected_tags/protected_tag_create.js b/app/assets/javascripts/protected_tags/protected_tag_create.js
index 964e67c9de03a4909465d766cc6803176727992b..91bd140bd12665a0af8e5a57aa559ed1a5fb9a25 100644
--- a/app/assets/javascripts/protected_tags/protected_tag_create.js
+++ b/app/assets/javascripts/protected_tags/protected_tag_create.js
@@ -3,7 +3,7 @@ import ProtectedTagDropdown from './protected_tag_dropdown';
export default class ProtectedTagCreate {
constructor() {
- this.$form = $('.new_protected_tag');
+ this.$form = $('.js-new-protected-tag');
this.buildDropdowns();
}
@@ -34,7 +34,7 @@ export default class ProtectedTagCreate {
onSelect() {
// Enable submit button
const $tagInput = this.$form.find('input[name="protected_tag[name]"]');
- const $allowedToCreateInput = this.$form.find('input[name="protected_tag[create_access_levels_attributes][0][access_level]"]');
+ const $allowedToCreateInput = this.$form.find('#create_access_levels_attributes');
this.$form.find('input[type="submit"]').attr('disabled', !($tagInput.val() && $allowedToCreateInput.length));
}
diff --git a/app/assets/javascripts/protected_tags/protected_tag_dropdown.js b/app/assets/javascripts/protected_tags/protected_tag_dropdown.js
index 9c78f2816a4aa598380d7accd4a9ad9677fb5f83..5ff4e4432622b0b4e38af1d5497177748f1df9d6 100644
--- a/app/assets/javascripts/protected_tags/protected_tag_dropdown.js
+++ b/app/assets/javascripts/protected_tags/protected_tag_dropdown.js
@@ -50,9 +50,10 @@ export default class ProtectedTagDropdown {
this.$protectedTag.on('click', this.onClickCreateWildcard.bind(this));
}
- onClickCreateWildcard() {
+ onClickCreateWildcard(e) {
this.$dropdown.data('glDropdown').remote.execute();
this.$dropdown.data('glDropdown').selectRowAtIndex();
+ e.preventDefault();
}
getProtectedTags(term, callback) {
diff --git a/app/assets/javascripts/protected_tags/protected_tag_edit.js b/app/assets/javascripts/protected_tags/protected_tag_edit.js
index b509287713833bcd944f8c4e96fdf3ddb4bc87cf..624067a5a094d58f354a9c9889524505eeefa425 100644
--- a/app/assets/javascripts/protected_tags/protected_tag_edit.js
+++ b/app/assets/javascripts/protected_tags/protected_tag_edit.js
@@ -6,7 +6,8 @@ import ProtectedTagAccessDropdown from './protected_tag_access_dropdown';
export default class ProtectedTagEdit {
constructor(options) {
this.$wrap = options.$wrap;
- this.$allowedToCreateDropdown = this.$wrap.find('.js-allowed-to-create');
+ this.$allowedToCreateDropdownButton = this.$wrap.find('.js-allowed-to-create');
+ this.onSelectCallback = this.onSelect.bind(this);
this.buildDropdowns();
}
@@ -14,19 +15,19 @@ export default class ProtectedTagEdit {
buildDropdowns() {
// Allowed to create dropdown
this.protectedTagAccessDropdown = new ProtectedTagAccessDropdown({
- $dropdown: this.$allowedToCreateDropdown,
+ $dropdown: this.$allowedToCreateDropdownButton,
data: gon.create_access_levels,
- onSelect: this.onSelect.bind(this),
+ onSelect: this.onSelectCallback,
});
}
onSelect() {
- const $allowedToCreateInput = this.$wrap.find(`input[name="${this.$allowedToCreateDropdown.data('fieldName')}"]`);
+ const $allowedToCreateInput = this.$wrap.find(`input[name="${this.$allowedToCreateDropdownButton.data('fieldName')}"]`);
// Do not update if one dropdown has not selected any option
if (!$allowedToCreateInput.length) return;
- this.$allowedToCreateDropdown.disable();
+ this.$allowedToCreateDropdownButton.disable();
$.ajax({
type: 'POST',
@@ -36,17 +37,16 @@ export default class ProtectedTagEdit {
_method: 'PATCH',
protected_tag: {
create_access_levels_attributes: [{
- id: this.$allowedToCreateDropdown.data('access-level-id'),
+ id: this.$allowedToCreateDropdownButton.data('access-level-id'),
access_level: $allowedToCreateInput.val(),
}],
},
},
error() {
- $.scrollTo(0);
new Flash('Failed to update tag!');
},
}).always(() => {
- this.$allowedToCreateDropdown.enable();
+ this.$allowedToCreateDropdownButton.enable();
});
}
}
diff --git a/app/assets/javascripts/protected_tags/protected_tag_edit_list.js b/app/assets/javascripts/protected_tags/protected_tag_edit_list.js
index 88c7accdec6913e74e6b90e17530f879ad469eac..bd9fc8722664781c17c93fe7349c8e4f8c768fa9 100644
--- a/app/assets/javascripts/protected_tags/protected_tag_edit_list.js
+++ b/app/assets/javascripts/protected_tags/protected_tag_edit_list.js
@@ -1,15 +1,16 @@
+/* eslint-disable no-new */
+
import ProtectedTagEdit from './protected_tag_edit';
export default class ProtectedTagEditList {
constructor() {
this.$wrap = $('.protected-tags-list');
- this.protectedTagList = [];
this.initEditForm();
}
initEditForm() {
this.$wrap.find('.js-protected-tag-edit-form').each((i, el) => {
- this.protectedTagList[i] = new ProtectedTagEdit({
+ new ProtectedTagEdit({
$wrap: $(el),
});
});
diff --git a/app/assets/stylesheets/pages/projects.scss b/app/assets/stylesheets/pages/projects.scss
index 960875674cc8d37a8e0ee4504e03171c193d7da2..61b973e0aa9e735a717885ce31d142db90ed3266 100644
--- a/app/assets/stylesheets/pages/projects.scss
+++ b/app/assets/stylesheets/pages/projects.scss
@@ -779,7 +779,8 @@ pre.light-well {
.protected-tags-list {
.dropdown-menu-toggle {
- width: 300px;
+ width: 100%;
+ max-width: 300px;
}
}
diff --git a/app/views/projects/protected_tags/_create_protected_tag.html.haml b/app/views/projects/protected_tags/_create_protected_tag.html.haml
index af332f942d656dbdb070d20e943e0dc6f0fe41f0..148efc16e64396b5d11c083b1374732922cf08ee 100644
--- a/app/views/projects/protected_tags/_create_protected_tag.html.haml
+++ b/app/views/projects/protected_tags/_create_protected_tag.html.haml
@@ -1,4 +1,4 @@
-= form_for [@project.namespace.becomes(Namespace), @project, @protected_tag], html: { class: 'new_protected_tag' } do |f|
+= form_for [@project.namespace.becomes(Namespace), @project, @protected_tag], html: { class: 'js-new-protected-tag' } do |f|
.panel.panel-default
.panel-heading
%h3.panel-title