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
46ed6cd8
Commit
46ed6cd8
authored
Aug 23, 2017
by
Fatih Acet
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
IssueNotesRefactor: Fix eslint errors.
parent
0d08ba3d
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
16 additions
and
17 deletions
+16
-17
app/assets/javascripts/lib/utils/common_utils.js
app/assets/javascripts/lib/utils/common_utils.js
+1
-1
app/assets/javascripts/notes/components/issue_note.vue
app/assets/javascripts/notes/components/issue_note.vue
+6
-5
app/assets/javascripts/vue_shared/components/markdown/field.vue
...sets/javascripts/vue_shared/components/markdown/field.vue
+9
-11
No files found.
app/assets/javascripts/lib/utils/common_utils.js
View file @
46ed6cd8
...
@@ -32,7 +32,7 @@
...
@@ -32,7 +32,7 @@
const
action
=
gl
.
utils
.
getPagePath
(
2
);
const
action
=
gl
.
utils
.
getPagePath
(
2
);
return
page
===
'
issues
'
&&
action
===
'
show
'
;
return
page
===
'
issues
'
&&
action
===
'
show
'
;
}
}
;
w
.
gl
.
utils
.
ajaxGet
=
function
(
url
)
{
w
.
gl
.
utils
.
ajaxGet
=
function
(
url
)
{
return
$
.
ajax
({
return
$
.
ajax
({
...
...
app/assets/javascripts/notes/components/issue_note.vue
View file @
46ed6cd8
...
@@ -86,16 +86,17 @@
...
@@ -86,16 +86,17 @@
this
.
updateNote
(
data
)
this
.
updateNote
(
data
)
.
then
(()
=>
{
.
then
(()
=>
{
this
.
isEditing
=
false
;
this
.
isEditing
=
false
;
// TODO: this could be moved down, by setting a prop
$
(
this
.
$refs
.
noteBody
.
$el
).
renderGFM
();
$
(
this
.
$refs
.
noteBody
.
$el
).
renderGFM
();
this
.
$refs
.
noteBody
.
resetAutoSave
();
this
.
$refs
.
noteBody
.
resetAutoSave
();
callback
();
})
})
.
catch
(()
=>
Flash
(
.
catch
(()
=>
{
Flash
(
'
Something went wrong while editing your comment. Please try again.
'
,
'
Something went wrong while editing your comment. Please try again.
'
,
'
alert
'
,
'
alert
'
,
$
(
parentElement
)
,
$
(
parentElement
)
);
))
callback
();
.
then
(
callback
);
}
);
},
},
formCancelHandler
(
shouldConfirm
,
isDirty
)
{
formCancelHandler
(
shouldConfirm
,
isDirty
)
{
if
(
shouldConfirm
&&
isDirty
)
{
if
(
shouldConfirm
&&
isDirty
)
{
...
...
app/assets/javascripts/vue_shared/components/markdown/field.vue
View file @
46ed6cd8
...
@@ -55,18 +55,16 @@
...
@@ -55,18 +55,16 @@
if
(
!
this
.
previewMarkdown
)
{
if
(
!
this
.
previewMarkdown
)
{
this
.
markdownPreview
=
''
;
this
.
markdownPreview
=
''
;
}
else
if
(
text
)
{
this
.
markdownPreviewLoading
=
true
;
this
.
$http
.
post
(
this
.
markdownPreviewPath
,
{
text
})
.
then
(
resp
=>
resp
.
json
())
.
then
((
data
)
=>
{
this
.
renderMarkdown
(
data
);
})
.
catch
(()
=>
new
Flash
(
'
Error loading markdown preview
'
));
}
else
{
}
else
{
if
(
text
)
{
this
.
renderMarkdown
();
this
.
markdownPreviewLoading
=
true
;
this
.
$http
.
post
(
this
.
markdownPreviewPath
,
{
text
})
.
then
(
resp
=>
resp
.
json
())
.
then
((
data
)
=>
{
this
.
renderMarkdown
(
data
);
})
.
catch
(()
=>
new
Flash
(
'
Error loading markdown preview
'
));
}
else
{
this
.
renderMarkdown
();
}
}
}
},
},
renderMarkdown
(
data
=
{})
{
renderMarkdown
(
data
=
{})
{
...
...
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