Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Boxiang Sun
gitlab-ce
Commits
cb33856e
Commit
cb33856e
authored
Dec 02, 2016
by
Clement Ho
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Add dropdowns for assignee
parent
a1ca5c76
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
147 additions
and
60 deletions
+147
-60
app/assets/javascripts/filtered_search/dropdown_assignee.js.es6
...sets/javascripts/filtered_search/dropdown_assignee.js.es6
+21
-0
app/assets/javascripts/filtered_search/dropdown_hint.js.es6
app/assets/javascripts/filtered_search/dropdown_hint.js.es6
+10
-59
app/assets/javascripts/filtered_search/filtered_search_dropdown.js.es6
...vascripts/filtered_search/filtered_search_dropdown.js.es6
+78
-0
app/assets/javascripts/filtered_search/filtered_search_manager.js.es6
...avascripts/filtered_search/filtered_search_manager.js.es6
+21
-1
app/views/shared/issuable/_search_bar.html.haml
app/views/shared/issuable/_search_bar.html.haml
+17
-0
No files found.
app/assets/javascripts/filtered_search/dropdown_assignee.js.es6
0 → 100644
View file @
cb33856e
/* eslint-disable no-param-reassign */
/*= require filtered_search/filtered_search_dropdown */
((global) => {
class DropdownAssignee extends gl.FilteredSearchDropdown {
constructor(dropdown, input) {
super(dropdown, input);
this.listId = 'js-dropdown-assignee';
}
itemClicked(e) {
console.log('assignee clicked');
}
renderContent() {
droplab.addData(this.hookId, '/autocomplete/users.json?search=&per_page=20&active=true&project_id=2&group_id=&skip_ldap=&todo_filter=&todo_state_filter=¤t_user=true&push_code_to_protected_branches=&author_id=&skip_users=');
}
}
global.DropdownAssignee = DropdownAssignee;
})(window.gl || (window.gl = {}));
app/assets/javascripts/filtered_search/dropdown_hint.js.es6
View file @
cb33856e
/* eslint-disable no-param-reassign */
/* eslint-disable no-param-reassign */
/*= require filtered_search/filtered_search_dropdown */
((global) => {
((global) => {
const dropdownData = [{
const dropdownData = [{
icon: 'fa-search',
icon: 'fa-search',
...
@@ -22,34 +24,11 @@
...
@@ -22,34 +24,11 @@
tag: '<label>',
tag: '<label>',
}];
}];
class DropdownHint {
class DropdownHint extends gl.FilteredSearchDropdown {
constructor(dropdown, input) {
constructor(dropdown, input, filterKeyword) {
this.input = input;
super(dropdown, input);
this.dropdown = dropdown;
this.listId = 'js-dropdown-hint';
this.bindEvents();
this.filterKeyword = filterKeyword;
}
bindEvents() {
this.dropdown.addEventListener('click.dl', this.itemClicked.bind(this));
}
unbindEvents() {
this.dropdown.removeEventListener('click.dl', this.itemClicked.bind(this));
}
// cleanup() {
// this.unbindEvents();
// droplab.setConfig({'filtered-search': {}});
// droplab.setData('filtered-search', []);
// this.dropdown.style.display = 'hidden';
// }
getSelectedText(selectedToken) {
// TODO: Get last word from FilteredSearchTokenizer
const lastWord = this.input.value.split(' ').last();
const lastWordIndex = selectedToken.indexOf(lastWord);
return lastWordIndex === -1 ? selectedToken : selectedToken.slice(lastWord.length);
}
}
itemClicked(e) {
itemClicked(e) {
...
@@ -68,37 +47,9 @@
...
@@ -68,37 +47,9 @@
this.input.dispatchEvent(new Event('input'));
this.input.dispatchEvent(new Event('input'));
}
}
dismissDropdown() {
renderContent() {
this.input.removeAttribute('data-dropdown-trigger');
super.renderContent();
droplab.setConfig({'filtered-search': {}});
droplab.setData(this.hookId, dropdownData);
droplab.setData('filtered-search', []);
this.unbindEvents();
}
setAsDropdown() {
this.input.setAttribute('data-dropdown-trigger', '#js-dropdown-hint');
// const hookId = 'filtered-search';
// const listId = 'js-dropdown-hint';
// const hook = droplab.hooks.filter((h) => {
// return h.id === hookId;
// })[0];
// if (hook.list.list.id !== listId) {
// droplab.changeHookList(hookId, `#${listId}`);
// }
}
render() {
console.log('render dropdown hint');
this.setAsDropdown();
droplab.setConfig({
'filtered-search': {
text: 'hint'
}
});
droplab.setData('filtered-search', dropdownData);
}
}
}
}
...
...
app/assets/javascripts/filtered_search/filtered_search_dropdown.js.es6
0 → 100644
View file @
cb33856e
/* eslint-disable no-param-reassign */
((global) => {
const DATA_DROPDOWN_TRIGGER = 'data-dropdown-trigger';
class FilteredSearchDropdown {
constructor(dropdown, input) {
this.hookId = 'filtered-search';
this.input = input;
this.dropdown = dropdown;
this.bindEvents();
}
bindEvents() {
this.dropdown.addEventListener('click.dl', this.itemClicked.bind(this));
}
unbindEvents() {
this.dropdown.removeEventListener('click.dl', this.itemClicked.bind(this));
}
getSelectedText(selectedToken) {
// TODO: Get last word from FilteredSearchTokenizer
const lastWord = this.input.value.split(' ').last();
const lastWordIndex = selectedToken.indexOf(lastWord);
return lastWordIndex === -1 ? selectedToken : selectedToken.slice(lastWord.length);
}
itemClicked(e) {
// Overridden by dropdown sub class
}
getFilterConfig(filterKeyword) {
const config = {};
const filterConfig = {
text: filterKeyword,
};
config[this.hookId] = filterKeyword ? filterConfig : {};
return config;
}
dismissDropdown() {
this.input.removeAttribute(DATA_DROPDOWN_TRIGGER);
droplab.setConfig(this.getFilterConfig());
droplab.setData(this.hookId, []);
this.unbindEvents();
}
setAsDropdown() {
this.input.setAttribute(DATA_DROPDOWN_TRIGGER, `#${this.listId}`);
}
getCurrentHook() {
return droplab.hooks.filter(h => h.id === this.hookId)[0];
}
renderContent() {
droplab.setConfig(this.getFilterConfig(this.filterKeyword));
}
render() {
this.setAsDropdown();
const firstTimeInitialized = this.getCurrentHook() === undefined;
if (firstTimeInitialized) {
this.renderContent();
} else if(this.getCurrentHook().list.list.id !== this.listId) {
droplab.changeHookList(this.hookId, `#${this.listId}`);
this.renderContent();
}
}
}
global.FilteredSearchDropdown = FilteredSearchDropdown;
})(window.gl || (window.gl = {}));
app/assets/javascripts/filtered_search/filtered_search_manager.js.es6
View file @
cb33856e
...
@@ -78,6 +78,7 @@
...
@@ -78,6 +78,7 @@
}
}
let dropdownHint;
let dropdownHint;
let dropdownAssignee;
class FilteredSearchManager {
class FilteredSearchManager {
constructor() {
constructor() {
...
@@ -99,19 +100,38 @@
...
@@ -99,19 +100,38 @@
if (match && this.currentDropdown !== match.key) {
if (match && this.currentDropdown !== match.key) {
console.log(`🦄 load ${match.key} dropdown`);
console.log(`🦄 load ${match.key} dropdown`);
this.dismissCurrentDropdown();
this.currentDropdown = match.key;
this.currentDropdown = match.key;
if (match.key === 'assignee') {
if (!dropdownAssignee) {
// document.querySelector('.filtered-search').setAttribute('data-dropdown-trigger', '#js-dropdown-assignee');
dropdownAssignee = new gl.DropdownAssignee(document.querySelector('#js-dropdown-assignee'), document.querySelector('.filtered-search'));
}
dropdownAssignee.render();
}
} else if (!match && this.currentDropdown !== 'hint') {
} else if (!match && this.currentDropdown !== 'hint') {
console.log('🦄 load hint dropdown');
console.log('🦄 load hint dropdown');
this.dismissCurrentDropdown();
this.currentDropdown = 'hint';
this.currentDropdown = 'hint';
if (!dropdownHint) {
if (!dropdownHint) {
dropdownHint = new gl.DropdownHint(document.querySelector('#js-dropdown-hint'), document.querySelector('.filtered-search')
)
dropdownHint = new gl.DropdownHint(document.querySelector('#js-dropdown-hint'), document.querySelector('.filtered-search')
, 'hint');
}
}
dropdownHint.render();
dropdownHint.render();
}
}
}
}
dismissCurrentDropdown() {
if (this.currentDropdown === 'hint') {
dropdownHint.dismissDropdown();
}
}
setDropdown() {
setDropdown() {
const { lastToken } = this.tokenizer.processTokens(document.querySelector('.filtered-search').value);
const { lastToken } = this.tokenizer.processTokens(document.querySelector('.filtered-search').value);
...
...
app/views/shared/issuable/_search_bar.html.haml
View file @
cb33856e
...
@@ -16,6 +16,23 @@
...
@@ -16,6 +16,23 @@
=
icon
(
'filter'
)
=
icon
(
'filter'
)
%button
.clear-search.hidden
{
type:
'button'
}
%button
.clear-search.hidden
{
type:
'button'
}
=
icon
(
'times'
)
=
icon
(
'times'
)
%ul
#js-dropdown-hint
.dropdown-menu
{
'data-dynamic'
=>
true
}
%li
%button
.btn.btn-link
%i
.fa
{
'class'
:
'
{{
icon
}}
'
}
%span
.js-filter-hint
{{hint}}
%span
.js-filter-tag
{{tag}}
#js-dropdown-assignee
.dropdown-menu
{
'data-dropdown'
=>
true
}
%ul
{
'data-dynamic'
=>
true
}
%li
%button
.btn.btn-link
%img
.avatar.avatar-inline
{
'src'
:
'
{{
avatar_url
}}
', width: '
30
'
}
%strong
{{name}}
%span
{{username}}
.pull-right
.pull-right
-
if
boards_page
-
if
boards_page
#js-boards-seach
.issue-boards-search
#js-boards-seach
.issue-boards-search
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment