Commit 83965105 authored by Clement Ho's avatar Clement Ho

[skip ci] refactor clicked parameters into options

parent 0d3ecf58
...@@ -351,7 +351,7 @@ GitLabDropdown = (function() { ...@@ -351,7 +351,7 @@ GitLabDropdown = (function() {
isMarking = selected ? selected[1] : null; isMarking = selected ? selected[1] : null;
if (this.options.clicked) { if (this.options.clicked) {
this.options.clicked.call(this, { this.options.clicked.call(this, {
user: selectedObj, selectedObj,
$el, $el,
e, e,
isMarking, isMarking,
......
...@@ -19,8 +19,8 @@ ...@@ -19,8 +19,8 @@
return label; return label;
}; };
})(this), })(this),
clicked: function(item, $el, e) { clicked: function(options) {
return e.preventDefault(); return options.e.preventDefault();
}, },
id: function(obj, el) { id: function(obj, el) {
return $(el).data("id"); return $(el).data("id");
......
...@@ -330,7 +330,10 @@ ...@@ -330,7 +330,10 @@
}, },
multiSelect: $dropdown.hasClass('js-multiselect'), multiSelect: $dropdown.hasClass('js-multiselect'),
vue: $dropdown.hasClass('js-issue-board-sidebar'), vue: $dropdown.hasClass('js-issue-board-sidebar'),
clicked: function(label, $el, e, isMarking) { clicked: function(options) {
const { $el, e, isMarking } = options;
const label = options.selectedObj;
var isIssueIndex, isMRIndex, page, boardsModel; var isIssueIndex, isMRIndex, page, boardsModel;
page = $('body').data('page'); page = $('body').data('page');
......
...@@ -144,7 +144,10 @@ import Vue from 'vue'; ...@@ -144,7 +144,10 @@ import Vue from 'vue';
return true; return true;
}, },
clicked: function(selected, $el, e) { clicked: function(options) {
const { $el, e } = options;
let selected = options.selectedObj;
var data, isIssueIndex, isMRIndex, page, boardsStore; var data, isIssueIndex, isMRIndex, page, boardsStore;
if (!selected) return; if (!selected) return;
page = $('body').data('page'); page = $('body').data('page');
......
...@@ -19,8 +19,8 @@ ...@@ -19,8 +19,8 @@
return label; return label;
}; };
})(this), })(this),
clicked: function(item, $el, e) { clicked: function(options) {
return e.preventDefault(); return options.e.preventDefault();
}, },
id: function(obj, el) { id: function(obj, el) {
return $(el).data("id"); return $(el).data("id");
......
...@@ -291,7 +291,8 @@ import eventHub from './sidebar/event_hub'; ...@@ -291,7 +291,8 @@ import eventHub from './sidebar/event_hub';
multiSelect: $dropdown.hasClass('js-multiselect'), multiSelect: $dropdown.hasClass('js-multiselect'),
vue: $dropdown.hasClass('js-issue-board-sidebar'), vue: $dropdown.hasClass('js-issue-board-sidebar'),
clicked: function(options) { clicked: function(options) {
const { user, $el, e, isMarking } = options; const { $el, e, isMarking } = options;
const user = options.selectedObj;
if ($dropdown.hasClass('js-multiselect')) { if ($dropdown.hasClass('js-multiselect')) {
const isActive = $el.hasClass('is-active'); const isActive = $el.hasClass('is-active');
......
...@@ -54,7 +54,10 @@ ...@@ -54,7 +54,10 @@
return ''; return '';
} }
}, },
clicked: function(selected, $el, e) { clicked: function(options) {
const e = options.e;
let selected = options.selectedObj;
if ($(dropdown).is(".js-filter-submit")) { if ($(dropdown).is(".js-filter-submit")) {
return $(dropdown).parents('form').submit(); return $(dropdown).parents('form').submit();
} else if ($dropdown.is('.js-issuable-form-weight')) { } else if ($dropdown.is('.js-issuable-form-weight')) {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment