Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
李少辉-开发者
gitlab-foss
提交
4b720875
G
gitlab-foss
项目概览
李少辉-开发者
/
gitlab-foss
通知
15
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
G
gitlab-foss
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
4b720875
编写于
8月 25, 2016
作者:
A
Alfredo Sumaran
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Tidy up the code a bit
上级
bf5a853e
变更
2
显示空白变更内容
内联
并排
Showing
2 changed file
with
20 addition
and
22 deletion
+20
-22
app/assets/javascripts/search_autocomplete.js
app/assets/javascripts/search_autocomplete.js
+17
-18
app/views/layouts/_search.html.haml
app/views/layouts/_search.html.haml
+3
-4
未找到文件。
app/assets/javascripts/search_autocomplete.js
浏览文件 @
4b720875
...
...
@@ -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
'
)
};
}
});
...
...
app/views/layouts/_search.html.haml
浏览文件 @
4b720875
...
...
@@ -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
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录