Skip to content

Commit

Permalink
Build
Browse files Browse the repository at this point in the history
  • Loading branch information
Wildhoney committed Aug 30, 2014
1 parent b9baaaa commit 5f0e47f
Show file tree
Hide file tree
Showing 4 changed files with 9 additions and 8 deletions.
2 changes: 1 addition & 1 deletion bower.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "ember-sockets",
"version": "0.6.9",
"version": "0.6.10",
"homepage": "https://github.com/Wildhoney/EmberSockets",
"main": "dist/ember-sockets.min.js",
"authors": [
Expand Down
9 changes: 5 additions & 4 deletions dist/ember-sockets.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
(function($window, $ember, $io) {
(function($window, $ember, $io, $jq) {

"use strict";

Expand Down Expand Up @@ -70,9 +70,10 @@
* Responsible for establishing a connect to the Socket.io server.
*
* @method connect
* @param params {Object}
* @return {void}
*/
connect: function connect() {
connect: function connect(params) {

/**
* @property server
Expand Down Expand Up @@ -100,7 +101,7 @@
// Create the host:port string for connecting, and then attempt to establish
// a connection.
var options = $ember.get(this, 'options') || {},
socket = $io(server, options);
socket = $io(server, $jq.extend(options, params || {}));

socket.on('error', this.error);

Expand Down Expand Up @@ -351,4 +352,4 @@
});
});

})(window, window.Ember, window.io);
})(window, window.Ember, window.io, window.jQuery);
2 changes: 1 addition & 1 deletion dist/ember-sockets.min.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "ember-sockets",
"version": "0.6.9",
"version": "0.6.10",
"description": "Socket.io (WebSockets) integrated with Ember.js' observer pattern.",
"main": "dist/ember-sockets.min.js",
"scripts": {
Expand Down Expand Up @@ -34,4 +34,4 @@
"socket.io": "~1.0.6",
"underscore": "^1.5.2"
}
}
}

0 comments on commit 5f0e47f

Please sign in to comment.