Remove poll_js and inline JS script, fixes #3133

sidekiq · Sep 12, 2016 · 0c09878 · 0c09878
1 parent 1c05404
commit 0c09878
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 8 deletions.
diff --git a/lib/sidekiq/web/helpers.rb b/lib/sidekiq/web/helpers.rb
@@ -55,6 +55,14 @@ def display_custom_head
       @head_html.join if defined?(@head_html)
     end
 
+    def poll_path
+      if current_path != '' && params['poll']
+        root_path + current_path
+      else
+        ""
+      end
+    end
+
     # Given a browser request Accept-Language header like
     # "fr-FR,fr;q=0.8,en-US;q=0.6,en;q=0.4,ru;q=0.2", this function
     # will return "fr" since that's the first code with a matching

diff --git a/test/test_web.rb b/test/test_web.rb
@@ -305,7 +305,7 @@ def perform(a, b)
     it 'calls updatePage() once when polling' do
       get '/busy?poll=true'
       assert_equal 200, last_response.status
-      assert_equal 1, last_response.body.scan('updatePage(').count
+      assert_equal 1, last_response.body.scan('data-poll-path="/busy').count
     end
 
     it 'escape job args and error messages' do

diff --git a/web/assets/javascripts/application.js b/web/assets/javascripts/application.js
diff --git a/web/views/_poll_js.erb b/web/views/_poll_js.erb
diff --git a/web/views/layout.erb b/web/views/layout.erb
@@ -12,7 +12,7 @@
     <meta name="google" content="notranslate" />
     <%= display_custom_head %>
   </head>
-  <body class="admin">
+  <body class="admin" data-poll-path="<%= poll_path %>">
     <%= erb :_nav %>
     <div id="page">
       <div class="container">
@@ -28,6 +28,5 @@
       </div>
     </div>
     <%= erb :_footer %>
-    <%= erb :_poll_js %>
   </body>
 </html>