summaryrefslogtreecommitdiff
path: root/app/assets/javascripts/labels_select.js
diff options
context:
space:
mode:
authorDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2017-10-30 19:53:14 +0000
committerDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2017-10-30 19:53:14 +0000
commitc7f0d2b2af38e1e357f0cebd3a82d562894afe9c (patch)
tree9388686154e6b04fcdeee6d8fd96d1a2a37c39ef /app/assets/javascripts/labels_select.js
parentbba020a56cbedd6403b637ec7f9eaee258eb7c67 (diff)
downloadgitlab-ce-c7f0d2b2af38e1e357f0cebd3a82d562894afe9c.tar.gz
Revert "Merge branch '2518-saved-configuration-for-issue-board' into 'master'"revert-2573818f
This reverts merge request !15009
Diffstat (limited to 'app/assets/javascripts/labels_select.js')
-rw-r--r--app/assets/javascripts/labels_select.js13
1 files changed, 4 insertions, 9 deletions
diff --git a/app/assets/javascripts/labels_select.js b/app/assets/javascripts/labels_select.js
index 1e52963b1dd..84602cf9207 100644
--- a/app/assets/javascripts/labels_select.js
+++ b/app/assets/javascripts/labels_select.js
@@ -8,7 +8,7 @@ import CreateLabelDropdown from './create_label';
(function() {
this.LabelsSelect = (function() {
- function LabelsSelect(els, options = {}) {
+ function LabelsSelect(els) {
var _this, $els;
_this = this;
@@ -58,7 +58,6 @@ import CreateLabelDropdown from './create_label';
labelHTMLTemplate = _.template('<% _.each(labels, function(label){ %> <a href="<%- ["",issueURLSplit[1], issueURLSplit[2],""].join("/") %>issues?label_name[]=<%- encodeURIComponent(label.title) %>"> <span class="label has-tooltip color-label" title="<%- label.description %>" style="background-color: <%- label.color %>; color: <%- label.text_color %>;"> <%- label.title %> </span> </a> <% }); %>');
labelNoneHTMLTemplate = '<span class="no-value">None</span>';
}
- const handleClick = options.handleClick;
$sidebarLabelTooltip.tooltip();
@@ -317,9 +316,9 @@ import CreateLabelDropdown from './create_label';
},
multiSelect: $dropdown.hasClass('js-multiselect'),
vue: $dropdown.hasClass('js-issue-board-sidebar'),
- clicked: function(clickEvent) {
- const { $el, e, isMarking } = clickEvent;
- const label = clickEvent.selectedObj;
+ clicked: function(options) {
+ const { $el, e, isMarking } = options;
+ const label = options.selectedObj;
var isIssueIndex, isMRIndex, page, boardsModel;
var fadeOutLoader = () => {
@@ -392,10 +391,6 @@ import CreateLabelDropdown from './create_label';
.then(fadeOutLoader)
.catch(fadeOutLoader);
}
- else if (handleClick) {
- e.preventDefault();
- handleClick(label);
- }
else {
if ($dropdown.hasClass('js-multiselect')) {