wiselinks 0.6.1 → 0.6.2

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    wiselinks (0.6.1)
+    wiselinks (0.6.2)
 
 GEM
   remote: https://rubygems.org/

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

@@ -6,9 +6,9 @@ class RequestManager
 
     # If been redirected, just trigger event and exit
     # 
-    if @redirected
-      self._handle_redirect($target, state)
-      return
+    if @redirected?
+      @redirected = null
+      return      
 
     # Trigger loading event
     # 
@@ -24,14 +24,15 @@ class RequestManager
     
       dataType: "html"
     ).done(
-      (data, status, xhr) ->
+      (data, status, xhr) ->        
         url = xhr.getResponseHeader('X-Wiselinks-Url')
 
         if self._assets_changed(xhr.getResponseHeader('X-Wiselinks-Assets-Digest'))
           window.location.reload(true)        
         else
-          if url? && url != window.location.href
-            self._redirect_to(url, xhr)
+          state = History.getState()        
+          if url? && url != state.url
+            self._redirect_to(url, $target, state, xhr)
                   
           $target.html(data)
 
@@ -48,20 +49,14 @@ class RequestManager
   _assets_changed: (digest) ->
     @options.assets_digest? && @options.assets_digest != digest
 
-  _handle_redirect: ($target, state) ->
-    $(document).trigger('page:redirected', [$target, state.data.render, state.url])
-    @redirected = null
-
-  _redirect_to: (url, xhr) ->
+  _redirect_to: (url, $target, state, xhr) ->
     if ( xhr && xhr.readyState < 4)
       xhr.onreadystatechange = $.noop
       xhr.abort()
-
-    @redirected = true
     
-    this._title('Redirecting…')
-    History.replaceState(History.getState().data, document.title, url )
-
+    @redirected = true
+    $(document).trigger('page:redirected', [$target, state.data.render, url])
+    History.replaceState(state.data, document.title, url)
 
   _loading: ($target, state) ->
     $(document).trigger('page:loading', [$target, state.data.render, state.url])
@@ -78,7 +73,7 @@ class RequestManager
   _title: (value) ->
     if value?  
       $(document).trigger('page:title', decodeURI(value))
-      document.title = decodeURI(value) if value?
+      document.title = decodeURI(value)
   
 
 window._Wiselinks = {} if window._Wiselinks == undefined

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

@@ -5,12 +5,12 @@
 #= require _form
 
 class Wiselinks
-  constructor: ($target = $('body'), options = {}) ->
+  constructor: ($target = $('body'), @options = {}) ->
     this._try_jquery()
 
-    if this.enabled()
-      options = $.extend(this._defaults(), options)
-      @page = new _Wiselinks.Page($target, options)
+    @options = $.extend(this._defaults(), @options)
+    if this.enabled()      
+      @page = new _Wiselinks.Page($target, @options)
 
   enabled: ->
     !History.emulated.pushState || @options.html4 == true 

data/lib/wiselinks/version.rb

@@ -4,7 +4,7 @@ module Wiselinks
   module Version
     MAJOR = 0
     MINOR = 6
-    PATCH = 1
+    PATCH = 2
     BUILD = nil
 
     STRING = [MAJOR, MINOR, PATCH, BUILD].compact.join('.')

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: wiselinks
 version: !ruby/object:Gem::Version
-  version: 0.6.1
+  version: 0.6.2
   prerelease: 
 platform: ruby
 authors:
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-01 00:00:00.000000000 Z
+date: 2013-06-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -368,7 +368,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2703865657821195857
+      hash: 515463621627356025
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -377,7 +377,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2703865657821195857
+      hash: 515463621627356025
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24