Merge branch '34168-cannot-edit-prioritized-labels-issues-with-firefox' into 'master'
Action Buttons on Prio Labels working again by setting pointer events to none on… Closes #34168 See merge request !12473
This commit is contained in:
commit
89f7f98eae
|
@ -21,6 +21,7 @@
|
||||||
}
|
}
|
||||||
|
|
||||||
bindEvents() {
|
bindEvents() {
|
||||||
|
this.prioritizedLabels.find('.btn-action').on('mousedown', this, this.onButtonActionClick);
|
||||||
return this.togglePriorityButton.on('click', this, this.onTogglePriorityClick);
|
return this.togglePriorityButton.on('click', this, this.onTogglePriorityClick);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -36,6 +37,11 @@
|
||||||
_this.toggleEmptyState($label, $btn, action);
|
_this.toggleEmptyState($label, $btn, action);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
onButtonActionClick(e) {
|
||||||
|
e.stopPropagation();
|
||||||
|
$(e.currentTarget).tooltip('hide');
|
||||||
|
}
|
||||||
|
|
||||||
toggleEmptyState($label, $btn, action) {
|
toggleEmptyState($label, $btn, action) {
|
||||||
this.emptyState.classList.toggle('hidden', !!this.prioritizedLabels[0].querySelector(':scope > li'));
|
this.emptyState.classList.toggle('hidden', !!this.prioritizedLabels[0].querySelector(':scope > li'));
|
||||||
}
|
}
|
||||||
|
|
|
@ -138,6 +138,7 @@
|
||||||
.fa {
|
.fa {
|
||||||
font-size: 18px;
|
font-size: 18px;
|
||||||
vertical-align: middle;
|
vertical-align: middle;
|
||||||
|
pointer-events: none;
|
||||||
}
|
}
|
||||||
|
|
||||||
&:hover {
|
&:hover {
|
||||||
|
|
|
@ -7,7 +7,7 @@
|
||||||
= render "shared/label_row", label: label
|
= render "shared/label_row", label: label
|
||||||
|
|
||||||
.visible-xs.visible-sm-inline-block.visible-md-inline-block.dropdown
|
.visible-xs.visible-sm-inline-block.visible-md-inline-block.dropdown
|
||||||
%button.btn.btn-default.label-options-toggle{ data: { toggle: "dropdown" } }
|
%button.btn.btn-default.label-options-toggle{ type: 'button', data: { toggle: "dropdown" } }
|
||||||
Options
|
Options
|
||||||
= icon('caret-down')
|
= icon('caret-down')
|
||||||
.dropdown-menu.dropdown-menu-align-right
|
.dropdown-menu.dropdown-menu-align-right
|
||||||
|
|
|
@ -4,9 +4,9 @@
|
||||||
= icon('bars')
|
= icon('bars')
|
||||||
.js-toggle-priority.toggle-priority{ data: { url: remove_priority_namespace_project_label_path(@project.namespace, @project, label),
|
.js-toggle-priority.toggle-priority{ data: { url: remove_priority_namespace_project_label_path(@project.namespace, @project, label),
|
||||||
dom_id: dom_id(label), type: label.type } }
|
dom_id: dom_id(label), type: label.type } }
|
||||||
%button.add-priority.btn.has-tooltip{ title: 'Prioritize', :'data-placement' => 'top' }
|
%button.add-priority.btn.has-tooltip{ title: 'Prioritize', type: 'button', :'data-placement' => 'top' }
|
||||||
= icon('star-o')
|
= icon('star-o')
|
||||||
%button.remove-priority.btn.has-tooltip{ title: 'Remove priority', :'data-placement' => 'top' }
|
%button.remove-priority.btn.has-tooltip{ title: 'Remove priority', type: 'button', :'data-placement' => 'top' }
|
||||||
= icon('star')
|
= icon('star')
|
||||||
%span.label-name
|
%span.label-name
|
||||||
= link_to_label(label, subject: @project, tooltip: false)
|
= link_to_label(label, subject: @project, tooltip: false)
|
||||||
|
|
Loading…
Reference in New Issue