diff options
| author | Phil Hughes <me@iamphill.com> | 2017-06-30 17:10:12 +0300 |
|---|---|---|
| committer | James Edwards-Jones <jedwardsjones@gitlab.com> | 2017-07-04 23:36:39 +0300 |
| commit | 9883dae4e1b10b48ccafa1aa8a8bd2e2e1a1cdb3 (patch) | |
| tree | 08914e9c4dc2eaf906aa0b274cbb727f3f63cfd8 /app | |
| parent | 55fe1fc927a26e3821e1369ab85ee1e6697878ae (diff) | |
Merge branch '34470-fix-award-slash-command-placeholder' into 'master'
Remove placeholder note when award emoji slash command is applied
Closes #34470
See merge request !12545
Diffstat (limited to 'app')
| -rw-r--r-- | app/assets/javascripts/notes.js | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/app/assets/javascripts/notes.js b/app/assets/javascripts/notes.js index e0a30d2648a..9b68584492d 100644 --- a/app/assets/javascripts/notes.js +++ b/app/assets/javascripts/notes.js @@ -340,6 +340,10 @@ const normalizeNewlines = function(str) { if (!noteEntity.valid) { if (noteEntity.errors.commands_only) { + if (noteEntity.commands_changes && + Object.keys(noteEntity.commands_changes).length > 0) { + $notesList.find('.system-note.being-posted').remove(); + } this.addFlash(noteEntity.errors.commands_only, 'notice', this.parentTimeline); this.refresh(); } |