Change page reload on ajax request in livepoll mode [skip ci]

mrkcor · Mar 26, 2015 · c168362 · c168362
1 parent 087bd03
commit c168362
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 3 deletions.
diff --git a/Changes.md b/Changes.md
@@ -1,6 +1,7 @@
 HEAD
 -----------
 
+- Change page reload on ajax request in livepoll mode [#2266]
 - **Improve ActiveJob integration** - Web UI now shows ActiveJobs in a
   nicer format and job logging shows the actual class name [#2248, #2259]
 - Add Sidekiq::Process#dump\_threads API to trigger TTIN output [#2247]

diff --git a/web/assets/javascripts/application.js b/web/assets/javascripts/application.js
diff --git a/web/views/_poll.erb b/web/views/_poll.erb
@@ -1,10 +1,10 @@
 <% if current_path != '' %>
   <% if params[:poll] %>
     <script>
-        setInterval("window.location.reload(true)", parseInt(localStorage.timeInterval) || 2000);
+      updatePage('<%= root_path + current_path %>')
     </script>
-    <a id="live-poll" class="btn btn-primary active" href="<%= root_path %><%= current_path %>"><%= t('StopPolling') %></a>
+    <a id="live-poll" class="btn btn-primary active" href="<%= root_path + current_path %>"><%= t('StopPolling') %></a>
   <% else %>
-    <a id="live-poll" class="btn btn-primary" href="<%= root_path %><%= current_path %>?<%= qparams(poll: true) %>"><%= t('LivePoll') %></a>
+    <a id="live-poll" class="btn btn-primary" href="<%= root_path + current_path %>?<%= qparams(poll: true) %>"><%= t('LivePoll') %></a>
   <% end %>
 <% end %>