Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Trigger a angular $digest cycle when an event is fired. #38

Closed
wants to merge 1 commit into from
Closed

Trigger a angular $digest cycle when an event is fired. #38

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 11 additions & 14 deletions ng-websocket.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,8 @@
return wsp;
};

wsp.$get = ['$http', function ($http) {
return new $websocketService(wsp.$$config, $http);
wsp.$get = ['$http', '$rootScope', function ($http, $rootScope) {
return new $websocketService(wsp.$$config, $http, $rootScope);
}];
}

Expand All @@ -39,7 +39,7 @@
* @description
* HTML5 Websocket service for AngularJS
*/
function $websocketService (cfg, $http) {
function $websocketService (cfg, $http, $rootScope) {
var wss = this;

wss.$$websocketList = {};
Expand Down Expand Up @@ -68,7 +68,7 @@
if (typeof ws === 'undefined') {
var wsCfg = angular.extend({}, wss.$$config, cfg);

ws = new $websocket(wsCfg, $http);
ws = new $websocket(wsCfg, $http, $rootScope);
wss.$$websocketList[wsCfg.url] = ws;
}

Expand All @@ -83,7 +83,7 @@
* @description
* HTML5 Websocket wrapper class for AngularJS
*/
function $websocket (cfg, $http) {
function $websocket (cfg, $http, $rootScope) {
var me = this;

if (typeof cfg === 'undefined' || (typeof cfg === 'object' && typeof cfg.url === 'undefined')) throw new Error('An url must be specified for WebSocket');
Expand Down Expand Up @@ -113,7 +113,12 @@

if (typeof handlers !== 'undefined') {
for (var i = 0; i < handlers.length; i++) {
if (typeof handlers[i] === 'function') handlers[i].apply(me, args);
if (typeof handlers[i] === 'function') {
handlers[i].apply(me, args);
if (!$rootScope.$$phase) {
$rootScope.$digest();
}
}
}
}
};
Expand Down Expand Up @@ -182,14 +187,6 @@
me.$CLOSING = 2;
me.$CLOSED = 3;

// TODO: it doesn't refresh the view (maybe $apply on something?)
/*me.$bind = function (event, scope, model) {
me.$on(event, function (message) {
model = message;
scope.$apply();
});
};*/

me.$on = function () {
var handlers = [];

Expand Down