Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
李少辉-开发者
gitlab-foss
提交
f22f75b7
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 搜索 >>
提交
f22f75b7
编写于
9月 22, 2017
作者:
F
Fatih Acet
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Fix rendering double note issue.
上级
92173ac5
变更
5
隐藏空白更改
内联
并排
Showing
5 changed file
with
47 addition
and
19 deletion
+47
-19
app/assets/javascripts/notes/components/issue_comment_form.vue
...ssets/javascripts/notes/components/issue_comment_form.vue
+5
-0
app/assets/javascripts/notes/stores/actions.js
app/assets/javascripts/notes/stores/actions.js
+8
-0
app/assets/javascripts/notes/stores/mutations.js
app/assets/javascripts/notes/stores/mutations.js
+13
-9
spec/javascripts/notes/stores/actions_spec.js
spec/javascripts/notes/stores/actions_spec.js
+0
-1
spec/javascripts/notes/stores/mutation_spec.js
spec/javascripts/notes/stores/mutation_spec.js
+21
-9
未找到文件。
app/assets/javascripts/notes/components/issue_comment_form.vue
浏览文件 @
f22f75b7
...
...
@@ -97,6 +97,8 @@
methods
:
{
...
mapActions
([
'
saveNote
'
,
'
stopPolling
'
,
'
restartPolling
'
,
'
removePlaceholderNotes
'
,
]),
setIsSubmitButtonDisabled
(
note
,
isSubmitting
)
{
...
...
@@ -126,10 +128,13 @@
this
.
isSubmitting
=
true
;
this
.
note
=
''
;
// Empty textarea while being requested. Repopulate in catch
this
.
resizeTextarea
();
this
.
stopPolling
();
this
.
saveNote
(
noteData
)
.
then
((
res
)
=>
{
this
.
isSubmitting
=
false
;
this
.
restartPolling
();
if
(
res
.
errors
)
{
if
(
res
.
errors
.
commands_only
)
{
this
.
discard
();
...
...
app/assets/javascripts/notes/stores/actions.js
浏览文件 @
f22f75b7
...
...
@@ -187,6 +187,14 @@ export const poll = ({ commit, state, getters }) => {
});
};
export
const
stopPolling
=
()
=>
{
eTagPoll
.
stop
();
};
export
const
restartPolling
=
()
=>
{
eTagPoll
.
restart
();
};
export
const
fetchData
=
({
commit
,
state
,
getters
})
=>
{
const
requestData
=
{
endpoint
:
state
.
notesData
.
notesPath
,
lastFetchedAt
:
state
.
lastFetchedAt
};
...
...
app/assets/javascripts/notes/stores/mutations.js
浏览文件 @
f22f75b7
...
...
@@ -5,15 +5,19 @@ import * as constants from '../constants';
export
default
{
[
types
.
ADD_NEW_NOTE
](
state
,
note
)
{
const
{
discussion_id
,
type
}
=
note
;
const
noteData
=
{
expanded
:
true
,
id
:
discussion_id
,
individual_note
:
!
(
type
===
constants
.
DISCUSSION_NOTE
),
notes
:
[
note
],
reply_id
:
discussion_id
,
};
state
.
notes
.
push
(
noteData
);
const
[
exists
]
=
state
.
notes
.
filter
(
n
=>
n
.
id
===
note
.
discussion_id
);
if
(
!
exists
)
{
const
noteData
=
{
expanded
:
true
,
id
:
discussion_id
,
individual_note
:
!
(
type
===
constants
.
DISCUSSION_NOTE
),
notes
:
[
note
],
reply_id
:
discussion_id
,
};
state
.
notes
.
push
(
noteData
);
}
},
[
types
.
ADD_NEW_REPLY_TO_DISCUSSION
](
state
,
note
)
{
...
...
spec/javascripts/notes/stores/actions_spec.js
浏览文件 @
f22f75b7
import
*
as
actions
from
'
~/notes/stores/actions
'
;
import
testAction
from
'
./helpers
'
;
import
{
discussionMock
,
notesDataMock
,
userDataMock
,
issueDataMock
,
individualNote
}
from
'
../mock_data
'
;
...
...
spec/javascripts/notes/stores/mutation_spec.js
浏览文件 @
f22f75b7
...
...
@@ -3,19 +3,31 @@ import { note, discussionMock, notesDataMock, userDataMock, issueDataMock, indiv
describe
(
'
Mutation Notes Store
'
,
()
=>
{
describe
(
'
ADD_NEW_NOTE
'
,
()
=>
{
it
(
'
should add a new note to an array of notes
'
,
()
=>
{
const
state
=
{
notes
:
[]
};
let
state
;
let
noteData
;
beforeEach
(()
=>
{
state
=
{
notes
:
[]
};
noteData
=
{
expanded
:
true
,
id
:
note
.
discussion_id
,
individual_note
:
true
,
notes
:
[
note
],
reply_id
:
note
.
discussion_id
,
};
mutations
.
ADD_NEW_NOTE
(
state
,
note
);
});
it
(
'
should add a new note to an array of notes
'
,
()
=>
{
expect
(
state
).
toEqual
({
notes
:
[{
expanded
:
true
,
id
:
note
.
discussion_id
,
individual_note
:
true
,
notes
:
[
note
],
reply_id
:
note
.
discussion_id
,
}],
notes
:
[
noteData
],
});
expect
(
state
.
notes
.
length
).
toBe
(
1
);
});
it
(
'
should not add the same note to the notes array
'
,
()
=>
{
mutations
.
ADD_NEW_NOTE
(
state
,
note
);
expect
(
state
.
notes
.
length
).
toBe
(
1
);
});
});
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录