diff options
| author | Phil Hughes <me@iamphill.com> | 2016-04-15 16:06:21 +0100 |
|---|---|---|
| committer | Phil Hughes <me@iamphill.com> | 2016-04-26 09:03:04 +0100 |
| commit | aa316cbfff8a3a1c416a3de6054608c96106d39f (patch) | |
| tree | b670f88cb6c6caebd60401b29f70bf2467e5f200 | |
| parent | 1c8d01b05ac3e0c19d0ac21c06d6419ab884939b (diff) | |
| download | gitlab-ce-aa316cbfff8a3a1c416a3de6054608c96106d39f.tar.gz | |
Changes dropdown toggle on search dropdowns
| -rw-r--r-- | app/assets/javascripts/search.js.coffee | 10 | ||||
| -rw-r--r-- | app/views/search/_filter.html.haml | 26 |
2 files changed, 22 insertions, 14 deletions
diff --git a/app/assets/javascripts/search.js.coffee b/app/assets/javascripts/search.js.coffee index cf978390aed..f435e2a33a4 100644 --- a/app/assets/javascripts/search.js.coffee +++ b/app/assets/javascripts/search.js.coffee @@ -1,8 +1,10 @@ class @Search constructor: -> + $groupDropdown = $('.js-search-group-dropdown') + $projectDropdown = $('.js-search-project-dropdown') @eventListeners() - $('.js-search-group-dropdown').glDropdown( + $groupDropdown.glDropdown( selectable: true filterable: true fieldName: 'group_id' @@ -18,11 +20,13 @@ class @Search obj.id text: (obj) -> obj.name + toggleLabel: (obj) -> + "#{$groupDropdown.data('default-label')} #{obj.name}" clicked: => @submitSearch() ) - $('.js-search-project-dropdown').glDropdown( + $projectDropdown.glDropdown( selectable: true filterable: true fieldName: 'project_id' @@ -38,6 +42,8 @@ class @Search obj.id text: (obj) -> obj.name_with_namespace + toggleLabel: (obj) -> + "#{$projectDropdown.data('default-label')} #{obj.name_with_namespace}" clicked: => @submitSearch() ) diff --git a/app/views/search/_filter.html.haml b/app/views/search/_filter.html.haml index fd598767393..678d620d21b 100644 --- a/app/views/search/_filter.html.haml +++ b/app/views/search/_filter.html.haml @@ -3,12 +3,13 @@ - if params[:project_id].present? = hidden_field_tag :project_id, params[:project_id] .dropdown - %button.dropdown-menu-toggle.btn.js-search-group-dropdown{ type: "button", data: { toggle: "dropdown" } } - Group: - - if @group.present? - = @group.name - - else - Any + %button.dropdown-menu-toggle.btn.js-search-group-dropdown{ type: "button", data: { toggle: "dropdown", default_label: "Group:" } } + %span.dropdown-toggle-text + Group: + - if @group.present? + = @group.name + - else + Any = icon("chevron-down") .dropdown-menu.dropdown-select.dropdown-menu-selectable.dropdown-menu-align-right .dropdown-title @@ -20,12 +21,13 @@ = dropdown_loading .dropdown.project-filter - %button.dropdown-menu-toggle.btn.js-search-project-dropdown{ type: "button", data: { toggle: "dropdown" } } - Project: - - if @project.present? - = @project.name_with_namespace - - else - Any + %button.dropdown-menu-toggle.btn.js-search-project-dropdown{ type: "button", data: { toggle: "dropdown", default_label: "Project:" } } + %span.dropdown-toggle-text + Project: + - if @project.present? + = @project.name_with_namespace + - else + Any = icon("chevron-down") .dropdown-menu.dropdown-select.dropdown-menu-selectable.dropdown-menu-align-right .dropdown-title |