diff options
| author | Jacob Schatz <jschatz@gitlab.com> | 2016-06-14 22:03:58 +0000 |
|---|---|---|
| committer | Jacob Schatz <jschatz@gitlab.com> | 2016-06-14 22:03:58 +0000 |
| commit | 27f75cf4a870c01682b9d76c46b23b7a3e1e0339 (patch) | |
| tree | 7d68781f9b9f638f6894f0fd0c2e9a9633e59f10 | |
| parent | 5ac17fb2fa5b3f3ef8c4bed16f97d402858efe6f (diff) | |
| parent | e20aa4581b0d17eae36d9722ee8789af47f57727 (diff) | |
| download | gitlab-ce-27f75cf4a870c01682b9d76c46b23b7a3e1e0339.tar.gz | |
Merge branch 'rs-fix-note-polling' into 'master'
Fix note polling when a window has been hidden
`refresh` was called, `refreshing` was set to true, but then because
`document.hidden` was true, `getContent` was never called, and
`refreshing` never got reset to `false`, which stopped polling entirely
until refresh.
See merge request !4635
| -rw-r--r-- | CHANGELOG | 2 | ||||
| -rw-r--r-- | app/assets/javascripts/notes.js.coffee | 6 |
2 files changed, 6 insertions, 2 deletions
diff --git a/CHANGELOG b/CHANGELOG index 80103cddd43..291d769722e 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -9,6 +9,8 @@ v 8.9.0 (unreleased) - Allow enabling wiki page events from Webhook management UI - Bump rouge to 1.11.0 - Fix issue with arrow keys not working in search autocomplete dropdown + - Fix an issue where note polling stopped working if a window was in the + background during a refresh. - Make EmailsOnPushWorker use Sidekiq mailers queue - Fix wiki page events' webhook to point to the wiki repository - Don't show tags for revert and cherry-pick operations diff --git a/app/assets/javascripts/notes.js.coffee b/app/assets/javascripts/notes.js.coffee index ad216910c8d..e2d3241437b 100644 --- a/app/assets/javascripts/notes.js.coffee +++ b/app/assets/javascripts/notes.js.coffee @@ -115,12 +115,14 @@ class @Notes , @pollingInterval refresh: => - return if @refreshing is true - @refreshing = true if not document.hidden and document.URL.indexOf(@noteable_url) is 0 @getContent() getContent: -> + return if @refreshing + + @refreshing = true + $.ajax url: @notes_url data: "last_fetched_at=" + @last_fetched_at |