wiselinks 0.5.2 → 0.5.3

data/VERSION

@@ -1 +1 @@
-0.5.2
+0.5.3

data/lib/assets/javascripts/wiselinks.js.coffee

@@ -14,6 +14,7 @@ class Wiselinks
     self = this
 
     @options = jQuery.extend(self._defaults(), @options);
+    @template_id = new Date().getTime()
 
     if self.enabled()
       @assets_digest = $("meta[name='assets-digest']").attr("content")
@@ -28,9 +29,12 @@ class Wiselinks
       History.Adapter.bind(
         window,
         "statechange"
-        (event, data) ->    
-          state = History.getState()         
-          self._call(state.url, state.data.target, state.data.render)        
+        (event, data) ->          
+          state = History.getState()
+          if self._template_id_changed(state)
+            self._call(state.url, null, 'template')
+          else            
+            self._call(state.url, state.data.target, state.data.render)        
       )
       
       $(document).on(
@@ -57,10 +61,11 @@ class Wiselinks
     !History.emulated.pushState || @options.html4 == true 
 
   load: (url, target, render = 'template') ->    
-    History.pushState({ timestamp: (new Date().getTime()), render: render, target: target }, document.title, url )
+    @template_id = new Date().getTime() if render != 'partial'
+    History.pushState({ template_id: @template_id, render: render, target: target }, document.title, url )
 
-  reload: () ->    
-    History.replaceState({ timestamp: (new Date().getTime()), render: 'template' }, document.title, History.getState().url )
+  reload: () ->
+    History.replaceState({ template_id: @template_id, render: 'template' }, document.title, History.getState().url )
 
   _defaults: ->
     html4: true
@@ -157,6 +162,9 @@ class Wiselinks
   _assets_changed: (digest) ->
     @assets_digest? && @assets_digest != digest
 
+  _template_id_changed: (state) ->    
+    !state.data.template_id? || state.data.template_id != @template_id
+
   _set_title: (xhr) ->
     value = xhr.getResponseHeader('X-Wiselinks-Title')
     document.title = decodeURI(value) if value?

data/wiselinks.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "wiselinks"
-  s.version = "0.5.2"
+  s.version = "0.5.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Igor Alexandrov", "Alexey Solilin", "Julia Egorova"]
-  s.date = "2013-02-22"
+  s.date = "2013-02-24"
   s.email = "igor.alexandrov@gmail.com"
   s.extra_rdoc_files = [
     "LICENSE",

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: wiselinks
 version: !ruby/object:Gem::Version
-  version: 0.5.2
+  version: 0.5.3
   prerelease: 
 platform: ruby
 authors:
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-22 00:00:00.000000000 Z
+date: 2013-02-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: shoulda
@@ -187,7 +187,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 4413024695425373985
+      hash: 933560943679734063
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: