Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
李少辉-开发者
gitlab-foss
提交
242820e2
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 搜索 >>
提交
242820e2
编写于
4月 11, 2018
作者:
S
Simon Knox
提交者:
Fatih Acet
4月 11, 2018
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Resolve "When editing a comment in an issue, the preview mode is toggled in the main textarea"
上级
2a7d011a
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
29 addition
and
19 deletion
+29
-19
app/assets/javascripts/vue_shared/components/markdown/header.vue
...ets/javascripts/vue_shared/components/markdown/header.vue
+6
-4
changelogs/unreleased/44697-prevue.yml
changelogs/unreleased/44697-prevue.yml
+5
-0
spec/javascripts/vue_shared/components/markdown/header_spec.js
...javascripts/vue_shared/components/markdown/header_spec.js
+18
-15
未找到文件。
app/assets/javascripts/vue_shared/components/markdown/header.vue
浏览文件 @
242820e2
...
...
@@ -27,20 +27,22 @@
$
(
document
).
off
(
'
markdown-preview:hide.vue
'
,
this
.
writeMarkdownTab
);
},
methods
:
{
isMarkdownForm
(
form
)
{
return
form
&&
!
form
.
find
(
'
.js-vue-markdown-field
'
).
length
;
isValid
(
form
)
{
return
!
form
||
form
.
find
(
'
.js-vue-markdown-field
'
).
length
||
$
(
this
.
$el
).
closest
(
'
form
'
)
===
form
[
0
];
},
previewMarkdownTab
(
event
,
form
)
{
if
(
event
.
target
.
blur
)
event
.
target
.
blur
();
if
(
this
.
isMarkdownForm
(
form
))
return
;
if
(
!
this
.
isValid
(
form
))
return
;
this
.
$emit
(
'
preview-markdown
'
);
},
writeMarkdownTab
(
event
,
form
)
{
if
(
event
.
target
.
blur
)
event
.
target
.
blur
();
if
(
this
.
isMarkdownForm
(
form
))
return
;
if
(
!
this
.
isValid
(
form
))
return
;
this
.
$emit
(
'
write-markdown
'
);
},
...
...
changelogs/unreleased/44697-prevue.yml
0 → 100644
浏览文件 @
242820e2
---
title
:
Make toggle markdown preview shortcut only toggle selected field
merge_request
:
author
:
type
:
fixed
spec/javascripts/vue_shared/components/markdown/header_spec.js
浏览文件 @
242820e2
import
Vue
from
'
vue
'
;
import
$
from
'
jquery
'
;
import
headerComponent
from
'
~/vue_shared/components/markdown/header.vue
'
;
describe
(
'
Markdown field header component
'
,
()
=>
{
let
vm
;
beforeEach
(
(
done
)
=>
{
beforeEach
(
done
=>
{
const
Component
=
Vue
.
extend
(
headerComponent
);
vm
=
new
Component
({
...
...
@@ -17,24 +18,18 @@ describe('Markdown field header component', () => {
});
it
(
'
renders markdown buttons
'
,
()
=>
{
expect
(
vm
.
$el
.
querySelectorAll
(
'
.js-md
'
).
length
,
).
toBe
(
7
);
expect
(
vm
.
$el
.
querySelectorAll
(
'
.js-md
'
).
length
).
toBe
(
7
);
});
it
(
'
renders `write` link as active when previewMarkdown is false
'
,
()
=>
{
expect
(
vm
.
$el
.
querySelector
(
'
li:nth-child(1)
'
).
classList
.
contains
(
'
active
'
),
).
toBeTruthy
();
expect
(
vm
.
$el
.
querySelector
(
'
li:nth-child(1)
'
).
classList
.
contains
(
'
active
'
)).
toBeTruthy
();
});
it
(
'
renders `preview` link as active when previewMarkdown is true
'
,
(
done
)
=>
{
it
(
'
renders `preview` link as active when previewMarkdown is true
'
,
done
=>
{
vm
.
previewMarkdown
=
true
;
Vue
.
nextTick
(()
=>
{
expect
(
vm
.
$el
.
querySelector
(
'
li:nth-child(2)
'
).
classList
.
contains
(
'
active
'
),
).
toBeTruthy
();
expect
(
vm
.
$el
.
querySelector
(
'
li:nth-child(2)
'
).
classList
.
contains
(
'
active
'
)).
toBeTruthy
();
done
();
});
...
...
@@ -52,16 +47,24 @@ describe('Markdown field header component', () => {
expect
(
vm
.
$emit
).
toHaveBeenCalledWith
(
'
write-markdown
'
);
});
it
(
'
blurs preview link after click
'
,
(
done
)
=>
{
it
(
'
does not emit toggle markdown event when triggered from another form
'
,
()
=>
{
spyOn
(
vm
,
'
$emit
'
);
$
(
document
).
triggerHandler
(
'
markdown-preview:show
'
,
[
$
(
'
<form><textarea class="markdown-area"></textarea></textarea></form>
'
),
]);
expect
(
vm
.
$emit
).
not
.
toHaveBeenCalled
();
});
it
(
'
blurs preview link after click
'
,
done
=>
{
const
link
=
vm
.
$el
.
querySelector
(
'
li:nth-child(2) a
'
);
spyOn
(
HTMLElement
.
prototype
,
'
blur
'
);
link
.
click
();
setTimeout
(()
=>
{
expect
(
link
.
blur
,
).
toHaveBeenCalled
();
expect
(
link
.
blur
).
toHaveBeenCalled
();
done
();
});
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录