Merge pull request #65 from edgurgel/fix-invalid-init-js

Fix invalid init js
edgurgel · Sep 24, 2017 · 86171b8 · 86171b8
2 parents 6ec566b + eff5ac8
commit 86171b8
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 9 deletions.
diff --git a/priv/static/js/app.js b/priv/static/js/app.js
@@ -15342,8 +15342,11 @@ var views = {
 
 function handleDOMContentLoaded() {
   var viewName = document.getElementsByTagName('body')[0].dataset.jsViewPath;
+  var view = views[viewName];
 
-  views[viewName].init();
+  if (view) {
+    view.init();
+  }
 }
 
 window.addEventListener('DOMContentLoaded', handleDOMContentLoaded, false);
@@ -15490,8 +15493,8 @@ var QueuesIndex = function () {
 exports.default = QueuesIndex;
 });
 
-;require.alias("phoenix/priv/static/phoenix.js", "phoenix");
-require.alias("phoenix_html/priv/static/phoenix_html.js", "phoenix_html");
+;require.alias("phoenix_html/priv/static/phoenix_html.js", "phoenix_html");
+require.alias("phoenix/priv/static/phoenix.js", "phoenix");
 require.alias("rickshaw/rickshaw.js", "rickshaw");
 require.alias("d3/d3.js", "d3");require.register("___globals___", function(exports, require, module) {
 

diff --git a/priv/static/js/app.js.map b/priv/static/js/app.js.map
diff --git a/web/channels/room_channel.ex b/web/channels/room_channel.ex
@@ -5,13 +5,13 @@ defmodule VerkWeb.RoomChannel do
 
   @doc false
   def join("rooms:jobs", _, socket) do
-    {:ok, _pid} = TrackingJobsHandler.start_link(self)
+    {:ok, _pid} = TrackingJobsHandler.start_link(self())
     {:ok, socket}
   end
 
   @doc false
   def join("rooms:queues", _, socket) do
-    {:ok, _pid} = TrackingQueuesHandler.start_link(self)
+    {:ok, _pid} = TrackingQueuesHandler.start_link(self())
     {:ok, socket}
   end
 

diff --git a/web/static/js/main.js b/web/static/js/main.js
@@ -7,8 +7,9 @@ const views = {
 
 function handleDOMContentLoaded() {
   const viewName = document.getElementsByTagName('body')[0].dataset.jsViewPath;
+  const view = views[viewName];
 
-  views[viewName].init();
+  if (view) { view.init(); }
 }
 
 window.addEventListener('DOMContentLoaded', handleDOMContentLoaded, false);
diff --git a/web/templates/shared/job_modal.html.eex b/web/templates/shared/job_modal.html.eex
@@ -53,8 +53,8 @@
         <%= unless assigns[:perform_at] do %>
           <%= link to: job_path(@conn, :show, @job.queue, @job.jid) do %>
             <button type="button" class="btn btn-info">Inspect</button>
-          <%= end %>
-        <%= end %>
+          <% end %>
+        <% end %>
         <button type="button" class="btn btn-default" data-dismiss="modal">Close</button>
       </div>
     </div>