Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
李少辉-开发者
gitlab-foss
提交
d668294f
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,体验更适合开发者的 AI 搜索 >>
未验证
提交
d668294f
编写于
10月 03, 2017
作者:
P
Phil Hughes
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
spec fixes
上级
fa2af5e0
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
13 addition
and
8 deletion
+13
-8
app/assets/javascripts/flash.js
app/assets/javascripts/flash.js
+10
-5
app/assets/javascripts/notes.js
app/assets/javascripts/notes.js
+2
-2
spec/javascripts/integrations/integration_settings_form_spec.js
...avascripts/integrations/integration_settings_form_spec.js
+1
-1
未找到文件。
app/assets/javascripts/flash.js
浏览文件 @
d668294f
import
_
from
'
underscore
'
;
const
hideFlash
=
(
flashEl
)
=>
{
flashEl
.
style
.
transition
=
'
opacity .3s
'
;
// eslint-disable-line no-param-reassign
flashEl
.
style
.
opacity
=
'
0
'
;
// eslint-disable-line no-param-reassign
Object
.
assign
(
flashEl
.
style
,
{
transition
:
'
opacity .3s
'
,
opacity
:
'
0
'
,
});
flashEl
.
addEventListener
(
'
transitionend
'
,
()
=>
{
flashEl
.
remove
();
...
...
@@ -33,8 +35,11 @@ const createFlashEl = (message, type) => `
</div>
`
;
const
Flash
=
function
Flash
(
message
,
type
=
'
alert
'
,
parent
=
document
,
actionConfig
=
null
)
{
const
createFlash
=
function
create
Flash
(
message
,
type
=
'
alert
'
,
parent
=
document
,
actionConfig
=
null
)
{
const
flashContainer
=
parent
.
querySelector
(
'
.flash-container
'
);
if
(
!
flashContainer
)
return
null
;
flashContainer
.
innerHTML
=
createFlashEl
(
message
,
type
);
const
flashEl
=
flashContainer
.
querySelector
(
`.flash-
${
type
}
`
);
...
...
@@ -61,8 +66,8 @@ const Flash = function Flash(message, type = 'alert', parent = document, actionC
};
export
{
Flash
as
default
,
create
Flash
as
default
,
createFlashEl
,
hideFlash
,
};
window
.
Flash
=
Flash
;
window
.
Flash
=
create
Flash
;
app/assets/javascripts/notes.js
浏览文件 @
d668294f
...
...
@@ -354,7 +354,7 @@ export default class Notes {
Object
.
keys
(
noteEntity
.
commands_changes
).
length
>
0
)
{
$notesList
.
find
(
'
.system-note.being-posted
'
).
remove
();
}
this
.
addFlash
(
noteEntity
.
errors
.
commands_only
,
'
notice
'
,
this
.
parentTimeline
);
// TODO: CHECK THIS!
this
.
addFlash
(
noteEntity
.
errors
.
commands_only
,
'
notice
'
,
this
.
parentTimeline
.
get
(
0
));
this
.
refresh
();
}
return
;
...
...
@@ -593,7 +593,7 @@ export default class Notes {
}
else
if
(
$form
.
hasClass
(
'
js-discussion-note-form
'
))
{
formParentTimeline
=
$form
.
closest
(
'
.discussion-notes
'
).
find
(
'
.notes
'
);
}
return
this
.
addFlash
(
'
Your comment could not be submitted! Please check your network connection and try again.
'
,
'
alert
'
,
formParentTimeline
);
return
this
.
addFlash
(
'
Your comment could not be submitted! Please check your network connection and try again.
'
,
'
alert
'
,
formParentTimeline
.
get
(
0
)
);
}
updateNoteError
(
$parentTimeline
)
{
...
...
spec/javascripts/integrations/integration_settings_form_spec.js
浏览文件 @
d668294f
...
...
@@ -181,7 +181,7 @@ describe('IntegrationSettingsForm', () => {
deferred
.
reject
();
expect
(
$
(
'
.flash-container .flash-text
'
).
text
()).
toEqual
(
errorMessage
);
expect
(
$
(
'
.flash-container .flash-text
'
).
text
()
.
trim
()
).
toEqual
(
errorMessage
);
});
it
(
'
should always call `toggleSubmitBtnState` with `false` once request is completed
'
,
()
=>
{
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录