Remove duplicated code
This commit is contained in:
parent
a3eabcc20c
commit
f1f3b31141
3 changed files with 15 additions and 18 deletions
|
@ -53,20 +53,13 @@ class DropdownHint extends gl.FilteredSearchDropdown {
|
||||||
}
|
}
|
||||||
|
|
||||||
renderContent() {
|
renderContent() {
|
||||||
const dropdownData = [];
|
const dropdownData = gl.FilteredSearchTokenKeys.get()
|
||||||
|
.map(tokenKey => ({
|
||||||
[].forEach.call(this.input.closest('.filtered-search-box-input-container').querySelectorAll('.dropdown-menu'), (dropdownMenu) => {
|
icon: `fa-${tokenKey.icon}`,
|
||||||
const { icon, hint, tag, type } = dropdownMenu.dataset;
|
hint: tokenKey.key,
|
||||||
if (icon && hint && tag) {
|
tag: `<${tokenKey.symbol}${tokenKey.key}>`,
|
||||||
dropdownData.push(
|
type: tokenKey.type,
|
||||||
Object.assign({
|
}));
|
||||||
icon: `fa-${icon}`,
|
|
||||||
hint,
|
|
||||||
tag: `<${tag}>`,
|
|
||||||
}, type && { type }),
|
|
||||||
);
|
|
||||||
}
|
|
||||||
});
|
|
||||||
|
|
||||||
this.droplab.changeHookList(this.hookId, this.dropdown, [Filter], this.config);
|
this.droplab.changeHookList(this.hookId, this.dropdown, [Filter], this.config);
|
||||||
this.droplab.setData(this.hookId, dropdownData);
|
this.droplab.setData(this.hookId, dropdownData);
|
||||||
|
|
|
@ -3,21 +3,25 @@ const tokenKeys = [{
|
||||||
type: 'string',
|
type: 'string',
|
||||||
param: 'username',
|
param: 'username',
|
||||||
symbol: '@',
|
symbol: '@',
|
||||||
|
icon: 'pencil',
|
||||||
}, {
|
}, {
|
||||||
key: 'assignee',
|
key: 'assignee',
|
||||||
type: 'string',
|
type: 'string',
|
||||||
param: 'username',
|
param: 'username',
|
||||||
symbol: '@',
|
symbol: '@',
|
||||||
|
icon: 'user',
|
||||||
}, {
|
}, {
|
||||||
key: 'milestone',
|
key: 'milestone',
|
||||||
type: 'string',
|
type: 'string',
|
||||||
param: 'title',
|
param: 'title',
|
||||||
symbol: '%',
|
symbol: '%',
|
||||||
|
icon: 'clock-o',
|
||||||
}, {
|
}, {
|
||||||
key: 'label',
|
key: 'label',
|
||||||
type: 'array',
|
type: 'array',
|
||||||
param: 'name[]',
|
param: 'name[]',
|
||||||
symbol: '~',
|
symbol: '~',
|
||||||
|
icon: 'tag',
|
||||||
}];
|
}];
|
||||||
|
|
||||||
const alternativeTokenKeys = [{
|
const alternativeTokenKeys = [{
|
||||||
|
|
|
@ -45,7 +45,7 @@
|
||||||
{{hint}}
|
{{hint}}
|
||||||
%span.js-filter-tag.dropdown-light-content
|
%span.js-filter-tag.dropdown-light-content
|
||||||
{{tag}}
|
{{tag}}
|
||||||
#js-dropdown-author.filtered-search-input-dropdown-menu.dropdown-menu{ data: { icon: 'pencil', hint: 'author', tag: '@author' } }
|
#js-dropdown-author.filtered-search-input-dropdown-menu.dropdown-menu
|
||||||
%ul.filter-dropdown{ data: { dynamic: true, dropdown: true } }
|
%ul.filter-dropdown{ data: { dynamic: true, dropdown: true } }
|
||||||
%li.filter-dropdown-item
|
%li.filter-dropdown-item
|
||||||
%button.btn.btn-link.dropdown-user
|
%button.btn.btn-link.dropdown-user
|
||||||
|
@ -55,7 +55,7 @@
|
||||||
{{name}}
|
{{name}}
|
||||||
%span.dropdown-light-content
|
%span.dropdown-light-content
|
||||||
@{{username}}
|
@{{username}}
|
||||||
#js-dropdown-assignee.filtered-search-input-dropdown-menu.dropdown-menu{ data: { icon: 'user', hint: 'assignee', tag: '@assignee' } }
|
#js-dropdown-assignee.filtered-search-input-dropdown-menu.dropdown-menu
|
||||||
%ul{ data: { dropdown: true } }
|
%ul{ data: { dropdown: true } }
|
||||||
%li.filter-dropdown-item{ data: { value: 'none' } }
|
%li.filter-dropdown-item{ data: { value: 'none' } }
|
||||||
%button.btn.btn-link
|
%button.btn.btn-link
|
||||||
|
@ -70,7 +70,7 @@
|
||||||
{{name}}
|
{{name}}
|
||||||
%span.dropdown-light-content
|
%span.dropdown-light-content
|
||||||
@{{username}}
|
@{{username}}
|
||||||
#js-dropdown-milestone.filtered-search-input-dropdown-menu.dropdown-menu{ data: { icon: 'clock-o', hint: 'milestone', tag: '%milestone' } }
|
#js-dropdown-milestone.filtered-search-input-dropdown-menu.dropdown-menu
|
||||||
%ul{ data: { dropdown: true } }
|
%ul{ data: { dropdown: true } }
|
||||||
%li.filter-dropdown-item{ data: { value: 'none' } }
|
%li.filter-dropdown-item{ data: { value: 'none' } }
|
||||||
%button.btn.btn-link
|
%button.btn.btn-link
|
||||||
|
@ -86,7 +86,7 @@
|
||||||
%li.filter-dropdown-item
|
%li.filter-dropdown-item
|
||||||
%button.btn.btn-link.js-data-value
|
%button.btn.btn-link.js-data-value
|
||||||
{{title}}
|
{{title}}
|
||||||
#js-dropdown-label.filtered-search-input-dropdown-menu.dropdown-menu{ data: { icon: 'tag', hint: 'label', tag: '~label', type: 'array' } }
|
#js-dropdown-label.filtered-search-input-dropdown-menu.dropdown-menu
|
||||||
%ul{ data: { dropdown: true } }
|
%ul{ data: { dropdown: true } }
|
||||||
%li.filter-dropdown-item{ data: { value: 'none' } }
|
%li.filter-dropdown-item{ data: { value: 'none' } }
|
||||||
%button.btn.btn-link
|
%button.btn.btn-link
|
||||||
|
|
Loading…
Reference in a new issue