diff options
author | Phil Hughes <me@iamphill.com> | 2017-06-27 10:46:04 +0000 |
---|---|---|
committer | Phil Hughes <me@iamphill.com> | 2017-06-27 10:46:04 +0000 |
commit | 89f7f98eae43fcf750d479e804e42dab6e969562 (patch) | |
tree | fa95174c50f1cdd88b88f7abe5f556d61a7e003f | |
parent | f4eef75d699e2a4a04c7af368c7be8c665e5c7f9 (diff) | |
parent | 3f167e4894c111360c6d54ac7716d2bf059cb508 (diff) | |
download | gitlab-ce-89f7f98eae43fcf750d479e804e42dab6e969562.tar.gz |
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
-rw-r--r-- | app/assets/javascripts/label_manager.js | 6 | ||||
-rw-r--r-- | app/assets/stylesheets/pages/labels.scss | 1 | ||||
-rw-r--r-- | app/views/shared/_label.html.haml | 2 | ||||
-rw-r--r-- | app/views/shared/_label_row.html.haml | 4 |
4 files changed, 10 insertions, 3 deletions
diff --git a/app/assets/javascripts/label_manager.js b/app/assets/javascripts/label_manager.js index 38b2eb9ff14..d8814802d9e 100644 --- a/app/assets/javascripts/label_manager.js +++ b/app/assets/javascripts/label_manager.js @@ -21,6 +21,7 @@ } bindEvents() { + this.prioritizedLabels.find('.btn-action').on('mousedown', this, this.onButtonActionClick); return this.togglePriorityButton.on('click', this, this.onTogglePriorityClick); } @@ -36,6 +37,11 @@ _this.toggleEmptyState($label, $btn, action); } + onButtonActionClick(e) { + e.stopPropagation(); + $(e.currentTarget).tooltip('hide'); + } + toggleEmptyState($label, $btn, action) { this.emptyState.classList.toggle('hidden', !!this.prioritizedLabels[0].querySelector(':scope > li')); } diff --git a/app/assets/stylesheets/pages/labels.scss b/app/assets/stylesheets/pages/labels.scss index c10588ac58e..b158416b940 100644 --- a/app/assets/stylesheets/pages/labels.scss +++ b/app/assets/stylesheets/pages/labels.scss @@ -138,6 +138,7 @@ .fa { font-size: 18px; vertical-align: middle; + pointer-events: none; } &:hover { diff --git a/app/views/shared/_label.html.haml b/app/views/shared/_label.html.haml index b8a2c5cb87d..de0281e97c6 100644 --- a/app/views/shared/_label.html.haml +++ b/app/views/shared/_label.html.haml @@ -7,7 +7,7 @@ = render "shared/label_row", label: label .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 = icon('caret-down') .dropdown-menu.dropdown-menu-align-right diff --git a/app/views/shared/_label_row.html.haml b/app/views/shared/_label_row.html.haml index d28f9421ecf..7b599dff0e3 100644 --- a/app/views/shared/_label_row.html.haml +++ b/app/views/shared/_label_row.html.haml @@ -4,9 +4,9 @@ = icon('bars') .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 } } - %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') - %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') %span.label-name = link_to_label(label, subject: @project, tooltip: false) |