Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
李少辉-开发者
gitlab-foss
提交
5c7fd643
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,发现更多精彩内容 >>
提交
5c7fd643
编写于
8月 15, 2016
作者:
P
Phil Hughes
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Fixed blank state nevermind button
上级
a996eecc
变更
5
显示空白变更内容
内联
并排
Showing
5 changed file
with
6 addition
and
7 deletion
+6
-7
app/assets/javascripts/boards/components/board_blank_state.js.es6
...ts/javascripts/boards/components/board_blank_state.js.es6
+1
-2
app/assets/javascripts/boards/stores/boards_store.js.es6
app/assets/javascripts/boards/stores/boards_store.js.es6
+1
-1
app/views/projects/boards/components/_blank_state.html.haml
app/views/projects/boards/components/_blank_state.html.haml
+2
-2
app/views/projects/boards/components/_board.html.haml
app/views/projects/boards/components/_board.html.haml
+1
-1
spec/features/boards/boards_spec.rb
spec/features/boards/boards_spec.rb
+1
-1
未找到文件。
app/assets/javascripts/boards/components/board_blank_state.js.es6
浏览文件 @
5c7fd643
...
@@ -11,8 +11,7 @@
...
@@ -11,8 +11,7 @@
}
}
},
},
methods: {
methods: {
addDefaultLists (e) {
addDefaultLists () {
e.stopImmediatePropagation();
BoardsStore.removeBlankState();
BoardsStore.removeBlankState();
for (let i = 0, labelsLength = this.predefinedLabels.length; i < labelsLength; i++) {
for (let i = 0, labelsLength = this.predefinedLabels.length; i < labelsLength; i++) {
...
...
app/assets/javascripts/boards/stores/boards_store.js.es6
浏览文件 @
5c7fd643
...
@@ -65,7 +65,7 @@
...
@@ -65,7 +65,7 @@
return $.cookie('issue_board_welcome_hidden') === 'true';
return $.cookie('issue_board_welcome_hidden') === 'true';
},
},
removeList (id) {
removeList (id) {
const list = this.findList('id', id);
const list = this.findList('id', id
, 'blank'
);
if (!list) return;
if (!list) return;
...
...
app/views/projects/boards/components/_blank_state.html.haml
浏览文件 @
5c7fd643
...
@@ -9,7 +9,7 @@
...
@@ -9,7 +9,7 @@
{{ label.title }}
{{ label.title }}
%p
%p
Starting out with the default set of lists will get you right on the way to making the most of your board.
Starting out with the default set of lists will get you right on the way to making the most of your board.
%button
.btn.btn-create.btn-inverted.btn-block
{
type:
"button"
,
"@click"
=>
"addDefaultLists"
}
%button
.btn.btn-create.btn-inverted.btn-block
{
type:
"button"
,
"@click
.stop
"
=>
"addDefaultLists"
}
Add default lists
Add default lists
%button
.btn.btn-default.btn-block
{
type:
"button"
,
"@click"
=>
"clearBlankState"
}
%button
.btn.btn-default.btn-block
{
type:
"button"
,
"@click
.stop
"
=>
"clearBlankState"
}
Nevermind, I'll use my own
Nevermind, I'll use my own
app/views/projects/boards/components/_board.html.haml
浏览文件 @
5c7fd643
...
@@ -16,7 +16,7 @@
...
@@ -16,7 +16,7 @@
%board-delete
{
"inline-template"
=>
true
,
%board-delete
{
"inline-template"
=>
true
,
"v-if"
=>
"!isPreset"
,
"v-if"
=>
"!isPreset"
,
":list"
=>
"list"
}
":list"
=>
"list"
}
%button
.board-delete.has-tooltip.pull-right
{
type:
"button"
,
title:
"Delete list"
,
"aria-label"
=>
"Delete list"
,
data:
{
placement:
"bottom"
},
"@click"
=>
"deleteBoard"
}
%button
.board-delete.has-tooltip.pull-right
{
type:
"button"
,
title:
"Delete list"
,
"aria-label"
=>
"Delete list"
,
data:
{
placement:
"bottom"
},
"@click
.stop
"
=>
"deleteBoard"
}
=
icon
(
"trash"
)
=
icon
(
"trash"
)
=
icon
(
"spinner spin"
,
class:
"board-header-loading-spinner pull-right"
,
"v-show"
=>
"list.loadingMore"
)
=
icon
(
"spinner spin"
,
class:
"board-header-loading-spinner pull-right"
,
"v-show"
=>
"list.loadingMore"
)
.board-inner-container.board-search-container
{
"v-if"
=>
"list.canSearch()"
}
.board-inner-container.board-search-container
{
"v-if"
=>
"list.canSearch()"
}
...
...
spec/features/boards/boards_spec.rb
浏览文件 @
5c7fd643
...
@@ -26,7 +26,7 @@ describe 'Issue Boards', feature: true, js: true do
...
@@ -26,7 +26,7 @@ describe 'Issue Boards', feature: true, js: true do
it
'hides the blank state when clicking nevermind button'
do
it
'hides the blank state when clicking nevermind button'
do
page
.
within
(
'.board-blank-state'
)
do
page
.
within
(
'.board-blank-state'
)
do
click_button
(
'Nevermind, I\'ll use my own'
)
click_button
(
"Nevermind, I'll use my own"
)
end
end
expect
(
page
).
to
have_selector
(
'.board'
,
count:
2
)
expect
(
page
).
to
have_selector
(
'.board'
,
count:
2
)
end
end
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录