mirror of
https://github.com/vale981/event-pubsub
synced 2025-03-04 17:11:38 -05:00
Fix for *,* or someEvent,* thanks to @hxsf and @conordickinson
This commit is contained in:
parent
af149485e2
commit
aa34d14485
2 changed files with 9 additions and 24 deletions
|
@ -19,28 +19,13 @@ function unsub(type,handler){
|
|||
}
|
||||
checkScope.apply(this);
|
||||
|
||||
if(type=='*'){
|
||||
var params=Array.prototype.slice.call(arguments,1);
|
||||
for(
|
||||
var keys = Object.keys(this._events_),
|
||||
count = keys.length,
|
||||
i=0;
|
||||
i<count;
|
||||
i++
|
||||
){
|
||||
params.unshift(keys[i]);
|
||||
this.off.apply(this,params);
|
||||
}
|
||||
if(handler=='*'){
|
||||
delete this._events_[type];
|
||||
}
|
||||
|
||||
if(!this._events_[type])
|
||||
return;
|
||||
|
||||
if(handler=='*'){
|
||||
delete this._events_[type];
|
||||
return;
|
||||
}
|
||||
|
||||
for(var i=0,
|
||||
count=this._events_[type].length;
|
||||
i<count;
|
||||
|
|
|
@ -1,10 +1,10 @@
|
|||
var events = new require('../../event-pubsub.js')();
|
||||
|
||||
/************************************\
|
||||
*
|
||||
*
|
||||
* The events var was instantiated
|
||||
* as it's own scope
|
||||
*
|
||||
*
|
||||
* **********************************/
|
||||
|
||||
events.on(
|
||||
|
@ -23,7 +23,7 @@ events.on(
|
|||
{
|
||||
type:'myObject',
|
||||
data:{
|
||||
x:'YAY, Objects!'
|
||||
x:'YAY, Objects!'
|
||||
}
|
||||
}
|
||||
)
|
||||
|
@ -34,17 +34,17 @@ events.on(
|
|||
'world',
|
||||
function(data){
|
||||
console.log('World event got',data);
|
||||
events.off('*');
|
||||
events.off('*','*');
|
||||
console.log('Removed all events');
|
||||
}
|
||||
);
|
||||
|
||||
/**********************************\
|
||||
*
|
||||
*
|
||||
* Demonstrate * event (on all events)
|
||||
* remove this for less verbose
|
||||
* example
|
||||
*
|
||||
*
|
||||
* ********************************/
|
||||
events.on(
|
||||
'*',
|
||||
|
@ -59,4 +59,4 @@ events.on(
|
|||
events.trigger(
|
||||
'hello',
|
||||
'world'
|
||||
);
|
||||
);
|
||||
|
|
Loading…
Add table
Reference in a new issue