diff options
| author | Clement Ho <ClemMakesApps@gmail.com> | 2016-11-04 12:07:41 -0500 |
|---|---|---|
| committer | Clement Ho <ClemMakesApps@gmail.com> | 2016-11-04 12:07:41 -0500 |
| commit | 54fd054b6596e31160cb63121d2af6a9206aadd5 (patch) | |
| tree | 4b5cf2a22ed97b3c1e8b1471db0567a50278bd93 | |
| parent | a1f25fd00d124dd376591140116b78811248d272 (diff) | |
| download | gitlab-ce-search-filters-redesign.tar.gz | |
Load author dropdown using ajaxsearch-filters-redesign
| -rw-r--r-- | app/assets/javascripts/filtered_search/tokenizer.js.es6 | 15 | ||||
| -rw-r--r-- | app/views/shared/issuable/_search_bar.html.haml | 2 |
2 files changed, 15 insertions, 2 deletions
diff --git a/app/assets/javascripts/filtered_search/tokenizer.js.es6 b/app/assets/javascripts/filtered_search/tokenizer.js.es6 index 0e4f4d5e80a..e60358ffca9 100644 --- a/app/assets/javascripts/filtered_search/tokenizer.js.es6 +++ b/app/assets/javascripts/filtered_search/tokenizer.js.es6 @@ -21,7 +21,20 @@ event.target.value = ''; event.target.placeholder = ''; - event.target.nextElementSibling.innerHTML += `<li><span>test</span></li>`; + if (token === 'author') { + + let ul = event.target.nextElementSibling; + ul.setAttribute('data-dynamic', true); + + ul.innerHTML = `<li> + <img src="{{avatar_url}}" class="avatar" width="30"> + <strong class="dropdown-menu-user-full-name"> {{name}} </strong> + <span class="dropdown-menu-user-username"> @{{username}} </span> + </li>`; + droplab.addData('filterDropdownInput', '/autocomplete/users.json?search=&per_page=20&active=true&project_id=2&group_id=&skip_ldap=¤t_user=true&push_code_to_protected_branches=&author_id=&skip_users='); + } + + // event.target.nextElementSibling.innerHTML += `<li><span>test</span></li>`; droplab.addHook(event.target); } } diff --git a/app/views/shared/issuable/_search_bar.html.haml b/app/views/shared/issuable/_search_bar.html.haml index 640cf141252..0d0a77bdbd9 100644 --- a/app/views/shared/issuable/_search_bar.html.haml +++ b/app/views/shared/issuable/_search_bar.html.haml @@ -15,7 +15,7 @@ = icon('filter') %ul.fragment-list %li.fragment-search - %input.filtered-search.transparent{ placeholder: 'Search or filter results...', 'data-dropdown-trigger' => '#filter-dropdown' } + %input.filtered-search.transparent{ placeholder: 'Search or filter results...', 'data-dropdown-trigger' => '#filter-dropdown', 'data-id' => 'filterDropdownInput' } %ul.dropdown-menu.droplab-menu#filter-dropdown{ 'data-dropdown' => true } .pull-right - if boards_page |