diff options
author | Fatih Acet <acetfatih@gmail.com> | 2016-09-27 09:47:34 +0000 |
---|---|---|
committer | Fatih Acet <acetfatih@gmail.com> | 2016-09-27 09:47:34 +0000 |
commit | a584662ce825ab8b21772ae6d3086745f0d7e7ef (patch) | |
tree | 01fcb597d694782047c14fa68eada57675059d08 /app/assets/javascripts/search_autocomplete.js | |
parent | 2bfa13f606ac15e7ee7e292239bd5c074ffec0f6 (diff) | |
parent | 4b720875a1a9a3a925398fdc669e42ed8ec8e62c (diff) | |
download | gitlab-ce-a584662ce825ab8b21772ae6d3086745f0d7e7ef.tar.gz |
Merge branch 'cs-inline-js-search' into 'master'
Remove inline JavaScript for Search autocomplete
## What does this MR do?
Remove inline JavaScript from the search partial for Search autocomplete.
## Are there points in the code the reviewer needs to double check?
That this doesn't break anything (it didn't when I tested it!)
## Why was this MR needed?
Inline scripts are bad, this removes a few of them.
## What are the relevant issue numbers?
#18231 and #19866
## Does this MR meet the acceptance criteria?
- Tests
- [ ] All builds are passing
- [x] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides)
- [x] Branch has no merge conflicts with `master` (if you do - rebase it please)
- [x] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits)
See merge request !5284
Diffstat (limited to 'app/assets/javascripts/search_autocomplete.js')
-rw-r--r-- | app/assets/javascripts/search_autocomplete.js | 37 |
1 files changed, 37 insertions, 0 deletions
diff --git a/app/assets/javascripts/search_autocomplete.js b/app/assets/javascripts/search_autocomplete.js index 8abb09c626f..678d836f56f 100644 --- a/app/assets/javascripts/search_autocomplete.js +++ b/app/assets/javascripts/search_autocomplete.js @@ -389,4 +389,41 @@ })(); + $(function() { + var $projectOptionsDataEl = $('.js-search-project-options'); + var $groupOptionsDataEl = $('.js-search-group-options'); + var $dashboardOptionsDataEl = $('.js-search-dashboard-options'); + + if ($projectOptionsDataEl.length) { + gl.projectOptions = gl.projectOptions || {}; + + var projectPath = $projectOptionsDataEl.data('project-path'); + + gl.projectOptions[projectPath] = { + name: $projectOptionsDataEl.data('name'), + issuesPath: $projectOptionsDataEl.data('issues-path'), + mrPath: $projectOptionsDataEl.data('mr-path') + }; + } + + if ($groupOptionsDataEl.length) { + gl.groupOptions = gl.groupOptions || {}; + + var groupPath = $groupOptionsDataEl.data('group-path'); + + gl.groupOptions[groupPath] = { + name: $groupOptionsDataEl.data('name'), + issuesPath: $groupOptionsDataEl.data('issues-path'), + mrPath: $groupOptionsDataEl.data('mr-path') + }; + } + + if ($dashboardOptionsDataEl.length) { + gl.dashboardOptions = { + issuesPath: $dashboardOptionsDataEl.data('issues-path'), + mrPath: $dashboardOptionsDataEl.data('mr-path') + }; + } + }); + }).call(this); |