wiselinks 0.5.4 → 0.5.5

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
data/VERSION CHANGED
@@ -1 +1 @@
1
- 0.5.4
1
+ 0.5.5
@@ -29,7 +29,7 @@ class Wiselinks
29
29
  History.Adapter.bind(
30
30
  window,
31
31
  "statechange"
32
- (event, data) ->
32
+ (event, data) ->
33
33
  state = History.getState()
34
34
 
35
35
  if self._template_id_changed(state)
@@ -76,7 +76,14 @@ class Wiselinks
76
76
  self = this
77
77
 
78
78
  $target = if state.data.target? then $(state.data.target) else self.$target
79
- $document = $(document).trigger('page:loading', [$target, state.data.render, state.url])
79
+ $document = $(document)
80
+
81
+ if @redirected
82
+ $document.trigger('page:redirected', [$target, state.data.render, state.url])
83
+ @redirected = null
84
+ return
85
+
86
+ $document.trigger('page:loading', [$target, state.data.render, state.url])
80
87
 
81
88
  $.ajax(
82
89
  url: state.url
@@ -90,18 +97,18 @@ class Wiselinks
90
97
  url = xhr.getResponseHeader('X-Wiselinks-Url')
91
98
 
92
99
  if self._assets_changed(xhr.getResponseHeader('X-Wiselinks-Assets-Digest'))
93
- window.location.reload(true)
94
- else if url? && url != window.location.href
95
- $document.trigger('page:redirected', [$target, state.data.render, url])
96
- if ( xhr && xhr.readyState < 4)
97
- xhr.onreadystatechange = $.noop
98
- xhr.abort()
99
- History.replaceState(History.getState().data, document.title, url )
100
+ window.location.reload(true)
100
101
  else
101
102
  self._set_title(xhr)
102
-
103
- $target.html(data)
104
103
 
104
+ if url? && url != window.location.href
105
+ if ( xhr && xhr.readyState < 4)
106
+ xhr.onreadystatechange = $.noop
107
+ xhr.abort()
108
+ self.redirected = true
109
+ History.replaceState(History.getState().data, document.title, url )
110
+
111
+ $target.html(data)
105
112
  $document.trigger('page:done', [$target, status, state.ur, data])
106
113
  ).fail(
107
114
  (xhr, status, error) ->
@@ -5,11 +5,11 @@
5
5
 
6
6
  Gem::Specification.new do |s|
7
7
  s.name = "wiselinks"
8
- s.version = "0.5.4"
8
+ s.version = "0.5.5"
9
9
 
10
10
  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
11
11
  s.authors = ["Igor Alexandrov", "Alexey Solilin", "Julia Egorova"]
12
- s.date = "2013-03-20"
12
+ s.date = "2013-03-26"
13
13
  s.email = "igor.alexandrov@gmail.com"
14
14
  s.extra_rdoc_files = [
15
15
  "LICENSE",
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: wiselinks
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.5.4
4
+ version: 0.5.5
5
5
  prerelease:
6
6
  platform: ruby
7
7
  authors:
@@ -11,7 +11,7 @@ authors:
11
11
  autorequire:
12
12
  bindir: bin
13
13
  cert_chain: []
14
- date: 2013-03-20 00:00:00.000000000 Z
14
+ date: 2013-03-26 00:00:00.000000000 Z
15
15
  dependencies:
16
16
  - !ruby/object:Gem::Dependency
17
17
  name: shoulda
@@ -187,7 +187,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
187
187
  version: '0'
188
188
  segments:
189
189
  - 0
190
- hash: -3940307628221105571
190
+ hash: -1131362532542417886
191
191
  required_rubygems_version: !ruby/object:Gem::Requirement
192
192
  none: false
193
193
  requirements: