From 5e782c5bf7a4edc28e32026ecda361582f4ce4a5 Mon Sep 17 00:00:00 2001
From: kbparagua <kb.paragua@gmail.com>
Date: Wed, 2 Mar 2016 00:16:09 +0800
Subject: [PATCH] refactor hook

---
 app/views/paloma/_hook.html.erb               | 34 +++++++++++--------
 .../app/assets/javascripts/application.js     |  2 +-
 2 files changed, 20 insertions(+), 16 deletions(-)

diff --git a/app/views/paloma/_hook.html.erb b/app/views/paloma/_hook.html.erb
index 485db75..191acc5 100644
--- a/app/views/paloma/_hook.html.erb
+++ b/app/views/paloma/_hook.html.erb
@@ -3,26 +3,30 @@
 <div class="js-paloma-hook" data-palomaid="<%= id %>">
   <script type="text/javascript">
     (function(){
-      // Do not continue if Paloma not found.
-      if (window['Paloma'] === undefined) {
-        return true;
-      }
 
+      if (window['Paloma'] === undefined) return true;
       Paloma.env = '<%= Rails.env %>';
 
-      // Remove any callback details if any
-      var hook =
-        document.querySelector("[data-palomaid='" + <%= id %> + "']")[0];
-
-      if (hook) hook.parentNode.removeChild(hook);
-
-      var request = <%= request.to_json.html_safe %>;
+      var id = "<%= id %>",
+          request = <%= request.to_json.html_safe %>;
 
       Paloma.engine.setRequest({
-        id: "<%= id %>",
-        resource: request['resource'],
-        action: request['action'],
-        params: request['params']});
+        id: id,
+        resource: request.resource,
+        action: request.action,
+        params: request.params
+      });
+
+      // Remove old hooks
+      var hooks = document.getElementsByClassName('js-paloma-hook');
+
+      for (var i = 0, n = hooks.length; i < n; i++){
+        var hook = hooks[i],
+            palomaid = hook.dataset.palomaid.toString();
+
+        if (palomaid != id) hook.parentNode.removeChild(hook);
+      }
+
     })();
   </script>
 </div>
diff --git a/test_app/app/assets/javascripts/application.js b/test_app/app/assets/javascripts/application.js
index 208e6dc..cd20709 100644
--- a/test_app/app/assets/javascripts/application.js
+++ b/test_app/app/assets/javascripts/application.js
@@ -13,7 +13,7 @@
 //= require jquery
 //= require jquery.turbolinks
 //= require jquery_ujs
-//=# require turbolinks
+//= require turbolinks
 //= require paloma
 //= require_tree .