Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
李少辉-开发者
gitlab-foss
提交
c34268c8
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,发现更多精彩内容 >>
提交
c34268c8
编写于
4月 17, 2018
作者:
P
Paul
提交者:
Phil Hughes
4月 17, 2018
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Fix the input confirmation validation for the delete branches modal
上级
dd557c46
变更
3
显示空白变更内容
内联
并排
Showing
3 changed file
with
56 addition
and
0 deletion
+56
-0
app/assets/javascripts/branches/branches_delete_modal.js
app/assets/javascripts/branches/branches_delete_modal.js
+11
-0
changelogs/unreleased/44985-fix-protected-branch-delete-modal.yml
...gs/unreleased/44985-fix-protected-branch-delete-modal.yml
+5
-0
spec/javascripts/branches/branches_delete_modal_spec.js
spec/javascripts/branches/branches_delete_modal_spec.js
+40
-0
未找到文件。
app/assets/javascripts/branches/branches_delete_modal.js
浏览文件 @
c34268c8
...
...
@@ -16,6 +16,7 @@ class DeleteModal {
bindEvents
()
{
this
.
$toggleBtns
.
on
(
'
click
'
,
this
.
setModalData
.
bind
(
this
));
this
.
$confirmInput
.
on
(
'
input
'
,
this
.
setDeleteDisabled
.
bind
(
this
));
this
.
$deleteBtn
.
on
(
'
click
'
,
this
.
setDisableDeleteButton
.
bind
(
this
));
}
setModalData
(
e
)
{
...
...
@@ -30,6 +31,16 @@ class DeleteModal {
this
.
$deleteBtn
.
attr
(
'
disabled
'
,
e
.
currentTarget
.
value
!==
this
.
branchName
);
}
setDisableDeleteButton
(
e
)
{
if
(
this
.
$deleteBtn
.
is
(
'
[disabled]
'
))
{
e
.
preventDefault
();
e
.
stopPropagation
();
return
false
;
}
return
true
;
}
updateModal
()
{
this
.
$branchName
.
text
(
this
.
branchName
);
this
.
$confirmInput
.
val
(
''
);
...
...
changelogs/unreleased/44985-fix-protected-branch-delete-modal.yml
0 → 100644
浏览文件 @
c34268c8
---
title
:
Fix confirmation modal for deleting a protected branch
merge_request
:
18176
author
:
Paul Bonaud @PaulRbR
type
:
fixed
spec/javascripts/branches/branches_delete_modal_spec.js
0 → 100644
浏览文件 @
c34268c8
import
$
from
'
jquery
'
;
import
DeleteModal
from
'
~/branches/branches_delete_modal
'
;
describe
(
'
branches delete modal
'
,
()
=>
{
describe
(
'
setDisableDeleteButton
'
,
()
=>
{
let
submitSpy
;
let
$deleteButton
;
beforeEach
(()
=>
{
setFixtures
(
`
<div id="modal-delete-branch">
<form>
<button type="submit" class="js-delete-branch">Delete</button>
</form>
</div>
`
);
$deleteButton
=
$
(
'
.js-delete-branch
'
);
submitSpy
=
jasmine
.
createSpy
(
'
submit
'
).
and
.
callFake
(
event
=>
event
.
preventDefault
());
$
(
'
#modal-delete-branch form
'
).
on
(
'
submit
'
,
submitSpy
);
// eslint-disable-next-line no-new
new
DeleteModal
();
});
it
(
'
does not submit if button is disabled
'
,
()
=>
{
$deleteButton
.
attr
(
'
disabled
'
,
true
);
$deleteButton
.
click
();
expect
(
submitSpy
).
not
.
toHaveBeenCalled
();
});
it
(
'
submits if button is not disabled
'
,
()
=>
{
$deleteButton
.
attr
(
'
disabled
'
,
false
);
$deleteButton
.
click
();
expect
(
submitSpy
).
toHaveBeenCalled
();
});
});
});
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录