summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlfredo Sumaran <alfredo@gitlab.com>2016-08-25 19:17:17 -0500
committerAlfredo Sumaran <alfredo@gitlab.com>2016-08-26 14:50:52 -0500
commit4b720875a1a9a3a925398fdc669e42ed8ec8e62c (patch)
tree6db4d334839df0623e6feb62898578f9df5de947
parentbf5a853e51a48a3113ccbba7cc8e62ca7999396f (diff)
downloadgitlab-ce-4b720875a1a9a3a925398fdc669e42ed8ec8e62c.tar.gz
Tidy up the code a bitcs-inline-js-search
-rw-r--r--app/assets/javascripts/search_autocomplete.js35
-rw-r--r--app/views/layouts/_search.html.haml7
2 files changed, 20 insertions, 22 deletions
diff --git a/app/assets/javascripts/search_autocomplete.js b/app/assets/javascripts/search_autocomplete.js
index 6445a8018c2..9c59108f2ab 100644
--- a/app/assets/javascripts/search_autocomplete.js
+++ b/app/assets/javascripts/search_autocomplete.js
@@ -368,39 +368,38 @@
})();
$(function() {
- if ($('.js-search-project-options').length) {
- var projectOptionsDataEl = $('.js-search-project-options');
+ 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');
+ var projectPath = $projectOptionsDataEl.data('project-path');
gl.projectOptions[projectPath] = {
- name: projectOptionsDataEl.data('name'),
- issuesPath: projectOptionsDataEl.data('issues-path'),
- mrPath: projectOptionsDataEl.data('mr-path')
+ name: $projectOptionsDataEl.data('name'),
+ issuesPath: $projectOptionsDataEl.data('issues-path'),
+ mrPath: $projectOptionsDataEl.data('mr-path')
};
}
-
- if ($('.js-search-group-options').length) {
- var groupOptionsDataEl = $('.js-search-group-options');
-
+
+ if ($groupOptionsDataEl.length) {
gl.groupOptions = gl.groupOptions || {};
- var groupPath = groupOptionsDataEl.data('group-path');
+ var groupPath = $groupOptionsDataEl.data('group-path');
gl.groupOptions[groupPath] = {
- name: groupOptionsDataEl.data('name'),
- issuesPath: groupOptionsDataEl.data('issues-path'),
- mrPath: groupOptionsDataEl.data('mr-path')
+ name: $groupOptionsDataEl.data('name'),
+ issuesPath: $groupOptionsDataEl.data('issues-path'),
+ mrPath: $groupOptionsDataEl.data('mr-path')
};
}
- if ($('.js-search-dashboard-options').length) {
- var dashboardOptionsDataEl = $('.js-search-dashboard-options');
+ if ($dashboardOptionsDataEl.length) {
gl.dashboardOptions = {
- issuesPath: dashboardOptionsDataEl.data('issues-path'),
- mrPath: dashboardOptionsDataEl.data('mr-path')
+ issuesPath: $dashboardOptionsDataEl.data('issues-path'),
+ mrPath: $dashboardOptionsDataEl.data('mr-path')
};
}
});
diff --git a/app/views/layouts/_search.html.haml b/app/views/layouts/_search.html.haml
index ff4aac0092d..d7386105b7d 100644
--- a/app/views/layouts/_search.html.haml
+++ b/app/views/layouts/_search.html.haml
@@ -3,10 +3,9 @@
- if controller.controller_path =~ /^projects/ && @project.persisted?
- label = 'This project'
- if @group && @group.persisted? && @group.path
- - group_data_attrs = { group_path: "#{j(@group.path)}", name: "#{j(@group.name)}", issues_path: "#{issues_group_path(j(@group.path))}", mr_path: "#{merge_requests_group_path(j(@group.path))}" }
+ - group_data_attrs = { group_path: j(@group.path), name: @group.name, issues_path: issues_group_path(j(@group.path)), mr_path: merge_requests_group_path(j(@group.path)) }
- if @project && @project.persisted?
- - project_data_attrs = { project_path: "#{j(@project.path)}", name: "#{j(@project.name)}", issues_path: "#{namespace_project_issues_path(@project.namespace, @project)}", mr_path: "#{namespace_project_merge_requests_path(@project.namespace, @project)}" }
-
+ - project_data_attrs = { project_path: j(@project.path), name: j(@project.name), issues_path: namespace_project_issues_path(@project.namespace, @project), mr_path: namespace_project_merge_requests_path(@project.namespace, @project) }
.search.search-form{class: "#{'has-location-badge' if label.present?}"}
= form_tag search_path, method: :get, class: 'navbar-form' do |f|
.search-input-container
@@ -14,7 +13,7 @@
.location-badge= label
.search-input-wrap
.dropdown{ data: { url: search_autocomplete_path } }
- = search_field_tag "search", nil, placeholder: 'Search', class: "search-input dropdown-menu-toggle js-search-dashboard-options", spellcheck: false, tabindex: "1", autocomplete: 'off', data: { toggle: 'dropdown', issues_path: "#{issues_dashboard_url}", mr_path: "#{merge_requests_dashboard_url}" }
+ = search_field_tag 'search', nil, placeholder: 'Search', class: 'search-input dropdown-menu-toggle js-search-dashboard-options', spellcheck: false, tabindex: '1', autocomplete: 'off', data: { toggle: 'dropdown', issues_path: issues_dashboard_url, mr_path: merge_requests_dashboard_url }
.dropdown-menu.dropdown-select
= dropdown_content do
%ul