turbograft 0.1.9 → 0.1.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 339420a1b56e444a79742242d2869ae2bba8247f
-  data.tar.gz: 6e0deb25a236353a81614717832c8ebc879faba5
+  metadata.gz: 4d6ed5cfa12fb229dbe15a95c663d588fb286968
+  data.tar.gz: eb7db0db4ab8e83d2b99c84a734afd249abf976e
 SHA512:
-  metadata.gz: 343f99d91124eb41e6b50f9cb46a5ed20bf08e11f29cd10c0ad7bcc86fe1e24db027a5c7e4fdc6ace66a7d3ec951995d667174fafa6a80a5bea4e28a85e58272
-  data.tar.gz: 0c17a4a20d47a58148d87eed573e130950f39473886e19dcfa0d965921c0dff9d032c764066749b58702ddf2d5fa443506253a708d9c3c4bfd9617f57d166789
+  metadata.gz: 139ff3da9750ac52978ab7de428a2da45ff9b506c0a5c42d29a33dfdbd9aafa07535cbf88870ebea0df5309c3d56493f34b45f6bf016cd19f139caa017ea00aa
+  data.tar.gz: 63a0480ab0ab39cb02133ab41692745f0ae15a30b742e0869543b28c9094e54bb393a16dd1b7986f92abf45746f7f3950c3e16a8dffe6d52c0115d7f31f3ee08

data/lib/assets/javascripts/turbograft/turbolinks.coffee

@@ -119,12 +119,11 @@ class window.Turbolinks
   changePage = (title, body, csrfToken, runScripts, partialReplace, onlyKeys = [], exceptKeys = []) ->
     document.title = title if title
 
-    refreshedNodes = []
-    refreshedNodes = refreshRefreshAlwaysNodes(body)
     if onlyKeys.length
-      refreshedNodes = refreshedNodes.concat refreshNodesWithKeys(onlyKeys, body)
-      return refreshedNodes
+      nodesToRefresh = [].concat(getNodesWithRefreshAlways(), getNodesMatchingRefreshKeys(onlyKeys))
+      return refreshNodes(nodesToRefresh, body)
     else
+      refreshNodes(getNodesWithRefreshAlways(), body)
       persistStaticElements(body)
       if exceptKeys.length
         refreshAllExceptWithKeys(exceptKeys, body)
@@ -141,6 +140,21 @@ class window.Turbolinks
 
     return
 
+  getNodesMatchingRefreshKeys = (keys) ->
+    matchingNodes = []
+    for key in keys
+      for node in document.querySelectorAll("[refresh=#{key}]")
+        matchingNodes.push(node)
+
+    return matchingNodes
+
+  getNodesWithRefreshAlways = ->
+    matchingNodes = []
+    for node in document.querySelectorAll("[refresh-always]")
+      matchingNodes.push(node)
+
+    return matchingNodes
+
   deleteRefreshNeverNodes = (body) ->
     for node in body.querySelectorAll('[refresh-never]')
       node.parentNode.removeChild(node)
@@ -176,21 +190,6 @@ class window.Turbolinks
 
     refreshedNodes
 
-  refreshRefreshAlwaysNodes = (body) ->
-    allNodesToBeRefreshed = []
-    for node in document.querySelectorAll("[refresh-always]")
-      allNodesToBeRefreshed.push(node)
-
-    return refreshNodes(allNodesToBeRefreshed, body)
-
-  refreshNodesWithKeys = (keys, body) ->
-    allNodesToBeRefreshed = []
-    for key in keys
-      for node in document.querySelectorAll("[refresh=#{key}]")
-        allNodesToBeRefreshed.push(node)
-
-    return refreshNodes(allNodesToBeRefreshed, body)
-
   keepNodes = (body, allNodesToKeep) ->
     for existingNode in allNodesToKeep
       unless nodeId = existingNode.getAttribute('id')

data/lib/turbograft/version.rb

@@ -1,3 +1,3 @@
 module TurboGraft
-  VERSION = '0.1.9'
+  VERSION = '0.1.10'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: turbograft
 version: !ruby/object:Gem::Version
-  version: 0.1.9
+  version: 0.1.10
 platform: ruby
 authors:
 - Kristian Plettenberg-Dussault
@@ -13,7 +13,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-15 00:00:00.000000000 Z
+date: 2015-01-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: coffee-rails