Permalink
Browse files

Merge branch 'r1.12.1'

  • Loading branch information...
2 parents 6553034 + 1496adb commit 24239eb5b3a0855f8ecf5c808f28f638a34907d3 @pl pl committed May 3, 2012
Showing with 13 additions and 7 deletions.
  1. +1 −1 .gitmodules
  2. +6 −0 CHANGELOG.markdown
  3. +2 −2 JFile
  4. +3 −3 src/pusher_connection.js
  5. +1 −1 test/sane/tests/connection.js
View
2 .gitmodules
@@ -1,3 +1,3 @@
[submodule "src/web-socket-js"]
path = src/web-socket-js
- url = git://github.com/newbamboo/web-socket-js.git
+ url = git://github.com/pusher/web-socket-js.git
View
6 CHANGELOG.markdown
@@ -1,5 +1,11 @@
# Changelog
+## 1.12.1 (2012-05-03)
+
+[CHANGED] The error argument passed into `socket.onerror()` is included with the error emitted to the user.
+
+[FIXED] impermanentlyClosing to impermanentlyClosing state machine transition.
+
## 1.12.0 (2012-04-14)
[NEW] Use `channel.members.me` to get the id and info for the local presence user. See the docs for more information: http://pusher.com/docs
View
4 JFile
@@ -7,7 +7,7 @@ target_dir './dist'
src_dir './src'
-version '1.12.0'
+version '1.12.1'
bundle 'pusher.js' do
license 'pusher-licence.js'
@@ -48,4 +48,4 @@ end
# some_dependency.min.js
filter :min do |src, config|
src.gsub /<DEPENDENCY_SUFFIX>/, '.min'
-end
+end
View
6 src/pusher_connection.js
@@ -6,11 +6,11 @@
'waiting': ['connecting', 'permanentlyClosed'],
'connecting': ['open', 'permanentlyClosing', 'impermanentlyClosing', 'waiting'],
'open': ['connected', 'permanentlyClosing', 'impermanentlyClosing', 'waiting'],
- 'connected': ['permanentlyClosing', 'impermanentlyClosing', 'waiting'],
+ 'connected': ['permanentlyClosing', 'waiting'],
'impermanentlyClosing': ['waiting', 'permanentlyClosing'],
'permanentlyClosing': ['permanentlyClosed'],
'permanentlyClosed': ['waiting'],
- 'failed': ['permanentlyClosing']
+ 'failed': ['permanentlyClosed']
};
@@ -477,7 +477,7 @@
Connection.prototype.disconnect = function() {
if (this._machine.is('permanentlyClosed')) return;
- if (this._machine.is('waiting')) {
+ if (this._machine.is('waiting') || this._machine.is('failed')) {
this._machine.transition('permanentlyClosed');
} else {
this._machine.transition('permanentlyClosing');
View
2 test/sane/tests/connection.js
@@ -967,7 +967,7 @@
connection.disconnect();
},
function(e) {
- test.equal(e.newState, 'permanentlyClosing', 'the state should transition to "permanentlyClosing".');
+ test.equal(e.newState, 'permanentlyClosed');
test.finish();
}
]);

0 comments on commit 24239eb

Please sign in to comment.