Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
1
Merge Requests
1
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
gitlab-ce
Commits
63792707
Commit
63792707
authored
Mar 23, 2019
by
Douwe Maan
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Remove now-unnecessary md-preview class
parent
146b55c9
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
10 additions
and
8 deletions
+10
-8
app/assets/javascripts/vue_shared/components/markdown/field.vue
...sets/javascripts/vue_shared/components/markdown/field.vue
+2
-2
app/views/projects/_md_preview.html.haml
app/views/projects/_md_preview.html.haml
+1
-1
spec/features/snippets/notes_on_personal_snippets_spec.rb
spec/features/snippets/notes_on_personal_snippets_spec.rb
+1
-1
spec/features/snippets/user_creates_snippet_spec.rb
spec/features/snippets/user_creates_snippet_spec.rb
+1
-1
spec/javascripts/vue_shared/components/markdown/field_spec.js
.../javascripts/vue_shared/components/markdown/field_spec.js
+5
-3
No files found.
app/assets/javascripts/vue_shared/components/markdown/field.vue
View file @
63792707
...
@@ -215,7 +215,7 @@ export default {
...
@@ -215,7 +215,7 @@ export default {
<div
<div
v-show=
"previewMarkdown"
v-show=
"previewMarkdown"
ref=
"markdown-preview"
ref=
"markdown-preview"
class=
"
md-preview
js-vue-md-preview md-preview-holder"
class=
"js-vue-md-preview md-preview-holder"
>
>
<suggestions
<suggestions
v-if=
"hasSuggestion"
v-if=
"hasSuggestion"
...
@@ -233,7 +233,7 @@ export default {
...
@@ -233,7 +233,7 @@ export default {
<div
<div
v-show=
"previewMarkdown"
v-show=
"previewMarkdown"
ref=
"markdown-preview"
ref=
"markdown-preview"
class=
"
md-preview
js-vue-md-preview md md-preview-holder"
class=
"js-vue-md-preview md md-preview-holder"
v-html=
"markdownPreview"
v-html=
"markdownPreview"
></div>
></div>
</
template
>
</
template
>
...
...
app/views/projects/_md_preview.html.haml
View file @
63792707
...
@@ -22,7 +22,7 @@
...
@@ -22,7 +22,7 @@
.md-write-holder
.md-write-holder
=
yield
=
yield
.md.md-preview-holder.js-md-preview.hide
.md-preview
{
data:
{
url:
url
}
}
.md.md-preview-holder.js-md-preview.hide
{
data:
{
url:
url
}
}
.referenced-commands.hide
.referenced-commands.hide
-
if
referenced_users
-
if
referenced_users
...
...
spec/features/snippets/notes_on_personal_snippets_spec.rb
View file @
63792707
...
@@ -70,7 +70,7 @@ describe 'Comments on personal snippets', :js do
...
@@ -70,7 +70,7 @@ describe 'Comments on personal snippets', :js do
fill_in
'note[note]'
,
with:
'This is **awesome**!'
fill_in
'note[note]'
,
with:
'This is **awesome**!'
find
(
'.js-md-preview-button'
).
click
find
(
'.js-md-preview-button'
).
click
page
.
within
(
'.new-note .md-preview'
)
do
page
.
within
(
'.new-note .md-preview
-holder
'
)
do
expect
(
page
).
to
have_content
(
'This is awesome!'
)
expect
(
page
).
to
have_content
(
'This is awesome!'
)
expect
(
page
).
to
have_selector
(
'strong'
)
expect
(
page
).
to
have_selector
(
'strong'
)
end
end
...
...
spec/features/snippets/user_creates_snippet_spec.rb
View file @
63792707
...
@@ -37,7 +37,7 @@ describe 'User creates snippet', :js do
...
@@ -37,7 +37,7 @@ describe 'User creates snippet', :js do
dropzone_file
Rails
.
root
.
join
(
'spec'
,
'fixtures'
,
'banana_sample.gif'
)
dropzone_file
Rails
.
root
.
join
(
'spec'
,
'fixtures'
,
'banana_sample.gif'
)
find
(
'.js-md-preview-button'
).
click
find
(
'.js-md-preview-button'
).
click
page
.
within
(
'#new_personal_snippet .md-preview'
)
do
page
.
within
(
'#new_personal_snippet .md-preview
-holder
'
)
do
expect
(
page
).
to
have_content
(
'My Snippet'
)
expect
(
page
).
to
have_content
(
'My Snippet'
)
link
=
find
(
'a.no-attachment-icon img[alt="banana_sample"]'
)[
'src'
]
link
=
find
(
'a.no-attachment-icon img[alt="banana_sample"]'
)[
'src'
]
...
...
spec/javascripts/vue_shared/components/markdown/field_spec.js
View file @
63792707
...
@@ -5,7 +5,7 @@ import fieldComponent from '~/vue_shared/components/markdown/field.vue';
...
@@ -5,7 +5,7 @@ import fieldComponent from '~/vue_shared/components/markdown/field.vue';
function
assertMarkdownTabs
(
isWrite
,
writeLink
,
previewLink
,
vm
)
{
function
assertMarkdownTabs
(
isWrite
,
writeLink
,
previewLink
,
vm
)
{
expect
(
writeLink
.
parentNode
.
classList
.
contains
(
'
active
'
)).
toEqual
(
isWrite
);
expect
(
writeLink
.
parentNode
.
classList
.
contains
(
'
active
'
)).
toEqual
(
isWrite
);
expect
(
previewLink
.
parentNode
.
classList
.
contains
(
'
active
'
)).
toEqual
(
!
isWrite
);
expect
(
previewLink
.
parentNode
.
classList
.
contains
(
'
active
'
)).
toEqual
(
!
isWrite
);
expect
(
vm
.
$el
.
querySelector
(
'
.md-preview
'
).
style
.
display
).
toEqual
(
isWrite
?
'
none
'
:
''
);
expect
(
vm
.
$el
.
querySelector
(
'
.md-preview
-holder
'
).
style
.
display
).
toEqual
(
isWrite
?
'
none
'
:
''
);
}
}
describe
(
'
Markdown field component
'
,
()
=>
{
describe
(
'
Markdown field component
'
,
()
=>
{
...
@@ -80,7 +80,9 @@ describe('Markdown field component', () => {
...
@@ -80,7 +80,9 @@ describe('Markdown field component', () => {
previewLink
.
click
();
previewLink
.
click
();
Vue
.
nextTick
(()
=>
{
Vue
.
nextTick
(()
=>
{
expect
(
vm
.
$el
.
querySelector
(
'
.md-preview
'
).
textContent
.
trim
()).
toContain
(
'
Loading…
'
);
expect
(
vm
.
$el
.
querySelector
(
'
.md-preview-holder
'
).
textContent
.
trim
()).
toContain
(
'
Loading…
'
,
);
done
();
done
();
});
});
...
@@ -90,7 +92,7 @@ describe('Markdown field component', () => {
...
@@ -90,7 +92,7 @@ describe('Markdown field component', () => {
previewLink
.
click
();
previewLink
.
click
();
setTimeout
(()
=>
{
setTimeout
(()
=>
{
expect
(
vm
.
$el
.
querySelector
(
'
.md-preview
'
).
innerHTML
).
toContain
(
expect
(
vm
.
$el
.
querySelector
(
'
.md-preview
-holder
'
).
innerHTML
).
toContain
(
'
<p>markdown preview</p>
'
,
'
<p>markdown preview</p>
'
,
);
);
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment