diff options
author | Alfredo Sumaran <alfredo@gitlab.com> | 2016-03-08 02:56:43 -0500 |
---|---|---|
committer | Alfredo Sumaran <alfredo@gitlab.com> | 2016-03-15 13:34:31 -0500 |
commit | 4b3d344688954e9c515b9bb8f26239a781fcabfb (patch) | |
tree | ce387641c50f200e13da0ba8367ffbb19609bf0a /app/views/layouts/_search.html.haml | |
parent | bc590ce63bd2f1af5545b648e6d028a557e7c792 (diff) | |
download | gitlab-ce-4b3d344688954e9c515b9bb8f26239a781fcabfb.tar.gz |
Working version of autocomplete with categorized results
Diffstat (limited to 'app/views/layouts/_search.html.haml')
-rw-r--r-- | app/views/layouts/_search.html.haml | 13 |
1 files changed, 4 insertions, 9 deletions
diff --git a/app/views/layouts/_search.html.haml b/app/views/layouts/_search.html.haml index 54af2c3063c..c5002893831 100644 --- a/app/views/layouts/_search.html.haml +++ b/app/views/layouts/_search.html.haml @@ -1,10 +1,12 @@ .search = form_tag search_path, method: :get, class: 'navbar-form pull-left' do |f| + = render 'shared/location_badge' = search_field_tag "search", nil, placeholder: 'Search', class: "search-input form-control", spellcheck: false, tabindex: "1" = hidden_field_tag :group_id, @group.try(:id) - - if @project && @project.persisted? - = hidden_field_tag :project_id, @project.id + = hidden_field_tag :project_id, @project && @project.persisted? ? @project.id : '' + + - if @project && @project.persisted? - if current_controller?(:issues) = hidden_field_tag :scope, 'issues' - elsif current_controller?(:merge_requests) @@ -21,10 +23,3 @@ = hidden_field_tag :repository_ref, @ref = button_tag 'Go' if ENV['RAILS_ENV'] == 'test' .search-autocomplete-opts.hide{:'data-autocomplete-path' => search_autocomplete_path, :'data-autocomplete-project-id' => @project.try(:id), :'data-autocomplete-project-ref' => @ref } - -:javascript - $('.search-input').on('keyup', function(e) { - if (e.keyCode == 27) { - $('.search-input').blur(); - } - }); |