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

Merge branch 'rs-fix-note-polling' into 'master'
27f75cf4 · Jacob Schatz · 5ac17fb2 · e20aa458 · 27f75cf4 · 27f75cf4
Commit 27f75cf4 authored Jun 14, 2016 by Jacob Schatz
Hide whitespace changes
Inline Side-by-side

Showing with 6 additions and 2 deletions

CHANGELOG CHANGELOG +2 -0

notes.js.coffee app/assets/javascripts/notes.js.coffee +4 -2

No files found.
--- 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

--- 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