diff options
| author | Jacob Schatz <jschatz1@gmail.com> | 2016-07-11 17:19:17 -0400 |
|---|---|---|
| committer | Jacob Schatz <jschatz1@gmail.com> | 2016-07-11 17:19:17 -0400 |
| commit | 0452e0a57e24fdd65f559cc1a8629892714adc7a (patch) | |
| tree | bf33ca472a3d434770783d80b5d10211383e706c /app/assets/javascripts/notes.js.coffee | |
| parent | 7690513495d02d14af8a1a0cb3bf00f243ec0419 (diff) | |
| parent | f76596380fb545c54b14c6bfc339a68a1dc162d3 (diff) | |
| download | gitlab-ce-faster-diffs.tar.gz | |
Merge branch 'master' into faster-diffsfaster-diffs
Diffstat (limited to 'app/assets/javascripts/notes.js.coffee')
| -rw-r--r-- | app/assets/javascripts/notes.js.coffee | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/app/assets/javascripts/notes.js.coffee b/app/assets/javascripts/notes.js.coffee index 0b7d8f64456..0ea54faae1a 100644 --- a/app/assets/javascripts/notes.js.coffee +++ b/app/assets/javascripts/notes.js.coffee @@ -194,8 +194,7 @@ class @Notes renderNote: (note) -> unless note.valid if note.award - flash = new Flash('You have already awarded this emoji!', 'alert') - flash.pinTo('.header-content') + new Flash('You have already awarded this emoji!', 'alert') return if note.award @@ -325,6 +324,8 @@ class @Notes form.find("#note_position").remove() form.find("#note_type").remove() + @parentTimeline = form.parents('.timeline') + ### General note form setup. @@ -357,8 +358,7 @@ class @Notes @renderNote(note) addNoteError: (xhr, note, status) => - flash = new Flash('Your comment could not be submitted! Please check your network connection and try again.', 'alert') - flash.pinTo('.md-area') + new Flash('Your comment could not be submitted! Please check your network connection and try again.', 'alert', @parentTimeline) ### Called in response to the new note form being submitted |