BigW Consortium Gitlab
Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
G
gitlab-ce
Project
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Commits
Issue Boards
Open sidebar
Forest Godfrey
gitlab-ce
Commits
7e1c91e0
Commit
7e1c91e0
authored
Jul 04, 2016
by
Douwe Maan
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Add confirmation when canceling creating/editing with changes
parent
88889d16
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
12 additions
and
0 deletions
+12
-0
notes.js.coffee
app/assets/javascripts/notes.js.coffee
+12
-0
No files found.
app/assets/javascripts/notes.js.coffee
View file @
7e1c91e0
...
@@ -104,19 +104,31 @@ class @Notes
...
@@ -104,19 +104,31 @@ class @Notes
return
if
isMetaKey
e
return
if
isMetaKey
e
$textarea
=
$
(
e
.
target
)
$textarea
=
$
(
e
.
target
)
# Edit previous note when UP arrow is hit
if
$textarea
.
val
()
is
''
and
e
.
which
is
38
if
$textarea
.
val
()
is
''
and
e
.
which
is
38
myLastNote
=
$
(
"li.note[data-author-id='
#{
gon
.
current_user_id
}
'][data-editable]:last"
)
myLastNote
=
$
(
"li.note[data-author-id='
#{
gon
.
current_user_id
}
'][data-editable]:last"
)
if
myLastNote
.
length
if
myLastNote
.
length
myLastNoteEditBtn
=
myLastNote
.
find
(
'.js-note-edit'
)
myLastNoteEditBtn
=
myLastNote
.
find
(
'.js-note-edit'
)
myLastNoteEditBtn
.
trigger
(
'click'
,
[
true
,
myLastNote
])
myLastNoteEditBtn
.
trigger
(
'click'
,
[
true
,
myLastNote
])
# Cancel creating diff note or editing any note when ESCAPE is hit
if
e
.
which
is
27
if
e
.
which
is
27
discussionNoteForm
=
$textarea
.
closest
(
".js-discussion-note-form"
)
discussionNoteForm
=
$textarea
.
closest
(
".js-discussion-note-form"
)
if
discussionNoteForm
.
length
if
discussionNoteForm
.
length
if
$textarea
.
val
()
isnt
''
return
unless
confirm
(
'Are you sure you want to cancel creating this comment?'
)
@
removeDiscussionNoteForm
(
discussionNoteForm
)
@
removeDiscussionNoteForm
(
discussionNoteForm
)
return
return
editNote
=
$textarea
.
closest
(
".note"
)
editNote
=
$textarea
.
closest
(
".note"
)
if
editNote
.
length
if
editNote
.
length
originalText
=
$textarea
.
closest
(
'form'
).
data
(
'original-note'
)
newText
=
$textarea
.
val
()
if
originalText
isnt
newText
return
unless
confirm
(
'Are you sure you want to cancel editing this comment?'
)
@
removeNoteEditForm
(
editNote
)
@
removeNoteEditForm
(
editNote
)
...
...
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