Skip to content

Avoids duplicated registration of event handler/Optional deregistration of event handlers #32

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

Open
Eduardo-M-Cavalcanti wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Avoids duplicated registration of event handler/Optional deregistration of event handlers #32

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
300ae38
=Avoids duplicated registration of event handler
Eduardo-M-Cavalcanti Nov 17, 2015
e0f4358
Optional deregistration of event handlers. Allows deregistration of m…
Eduardo-M-Cavalcanti Nov 17, 2015
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
26 changes: 22 additions & 4 deletions ng-websocket.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -200,18 +200,36 @@

me.$$eventMap[event] = me.$$eventMap[event] || [];
for (var i = 0; i < handlers.length; i++) {
me.$$eventMap[event].push(handlers[i]);
if (me.$$eventMap[event].indexOf(handlers[i]) < 0)
me.$$eventMap[event].push(handlers[i]);
}

return me;
};

me.$un = function (event) {
me.$un = function () {

var handlers = [], index, eventMap;

Array.prototype.push.apply(handlers, arguments);

var event = handlers.shift();

if (typeof event !== 'string') throw new Error('$un needs a String representing an event.');

if (typeof me.$$eventMap[event] !== 'undefined') delete me.$$eventMap[event];
if (handlers.length == 0) {
if (typeof me.$$eventMap[event] !== 'undefined')
delete me.$$eventMap[event];
}
else {
for (var i = 0; i < handlers.length; i++) {
index = me.$$eventMap[event].indexOf(handlers[i]);

return me;
if (index >= 0 ) {
me.$$eventMap[event].splice(index, 1);
}
}
}
};

me.$$send = function (message) {
Expand Down