diff options
| author | Ben Yorke <bendyorke@gmail.com> | 2016-05-12 09:11:36 -0500 |
|---|---|---|
| committer | Jacob Schatz <jschatz1@gmail.com> | 2016-05-27 12:10:28 -0400 |
| commit | 31e5f081e4750008ce731b2ab40c565cd64a477d (patch) | |
| tree | 42c445876f1a050a3987b9360e878ec0ad3c5bd0 | |
| parent | d59f0d90e4eb2feff510cd7fb344e46b0286a1df (diff) | |
| download | gitlab-ce-31e5f081e4750008ce731b2ab40c565cd64a477d.tar.gz | |
Update notes immediately after closing/reopening
| -rw-r--r-- | CHANGELOG | 1 | ||||
| -rw-r--r-- | app/assets/javascripts/notes.js.coffee | 8 |
2 files changed, 5 insertions, 4 deletions
diff --git a/CHANGELOG b/CHANGELOG index ed454903a8d..cf00bd9a5af 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -115,6 +115,7 @@ v 8.7.6 - Fix links on wiki pages for relative url setups. !4131 (Artem Sidorenko) - Fix import from GitLab.com to a private instance failure. !4181 - Fix external imports not finding the import data. !4106 + - Fix notification delay when changing status of an issue v 8.7.5 - Fix relative links in wiki pages. !4050 diff --git a/app/assets/javascripts/notes.js.coffee b/app/assets/javascripts/notes.js.coffee index 8131d923677..f8151963fa7 100644 --- a/app/assets/javascripts/notes.js.coffee +++ b/app/assets/javascripts/notes.js.coffee @@ -114,9 +114,9 @@ class @Notes @refresh() , @pollingInterval - refresh: -> + refresh: => return if @refreshing is true - refreshing = true + @refreshing = true if not document.hidden and document.URL.indexOf(@noteable_url) is 0 @getContent() @@ -134,8 +134,8 @@ class @Notes @renderDiscussionNote(note) else @renderNote(note) - always: => - @refreshing = false + .always () => + @refreshing = false ### Increase @pollingInterval up to 120 seconds on every function call, |