Hopiu/fabric.js
1
0
Fork 0
mirror of https://github.com/Hopiu/fabric.js.git synced 2026-04-27 08:44:42 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #840 from Kienz/patch-2

Browse source 
`fabric.Observable.on` and `fabric.Observable.off` can add/remove multiple handlers (object with key/value pairs). Closes #838
This commit is contained in:
Juriy Zaytsev 2013-09-12 14:49:31 -07:00
commit a7489774fd
2 changed files with 72 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

37
src/mixins/observable.mixin.js
View file

@ -1,12 +1,28 @@
(function(){
/**
* @private
* @param {String} eventName
* @param {Function} handler
*/
function _removeEventListener(eventName, handler) {
if (this.__eventListeners[eventName]) {
if (handler) {
fabric.util.removeFromArray(this.__eventListeners[eventName], handler);
}
else {
this.__eventListeners[eventName].length = 0;
}
}
}
/**
* Observes specified event
* @deprecated `observe` deprecated since 0.8.34 (use `on` instead)
* @memberOf fabric.Observable
* @alias on
* @param {String} eventName
* @param {Function} handler
* @param {String|Object} eventName Event name (eg. 'after:render') or object with key/value pairs (eg. {'after:render': handler, 'selection:cleared': handler})
* @param {Function} handler Function that receives a notification when an event of the specified type occurs
* @return {Self} thisArg
* @chainable
*/
@ -34,8 +50,8 @@
* @deprecated `stopObserving` deprecated since 0.8.34 (use `off` instead)
* @memberOf fabric.Observable
* @alias off
* @param {String} eventName
* @param {Function} handler
* @param {String|Object} eventName Event name (eg. 'after:render') or object with key/value pairs (eg. {'after:render': handler, 'selection:cleared': handler})
* @param {Function} handler Function to be deleted from EventListeners
* @return {Self} thisArg
* @chainable
*/
@ -43,14 +59,15 @@
if (!this.__eventListeners) {
this.__eventListeners = { };
}
if (this.__eventListeners[eventName]) {
if (handler) {
fabric.util.removeFromArray(this.__eventListeners[eventName], handler);
}
else {
this.__eventListeners[eventName].length = 0;
// one object with key/value pairs was passed
if (arguments.length === 1 && typeof arguments[0] === 'object') {
for (var prop in eventName) {
_removeEventListener.call(this, prop, eventName[prop]);
}
}
else {
_removeEventListener.call(this, eventName, handler);
}
return this;
}

59
test/unit/observable.js
View file

@ -17,7 +17,7 @@ test('fire + observe', function() {
});
foo.fire('bar:baz');
equal(true, eventFired);
equal(eventFired, true);
});
test('stopObserving', function() {
@ -32,7 +32,7 @@ test('stopObserving', function() {
foo.stopObserving('bar:baz', handler);
foo.fire('bar:baz');
equal(false, eventFired);
equal(eventFired, false);
});
test('stopObserving without handler', function() {
@ -53,8 +53,39 @@ test('stopObserving without handler', function() {
foo.stopObserving('bar:baz');
foo.fire('bar:baz');
equal(false, eventFired);
equal(false, event2Fired);
equal(eventFired, false);
equal(event2Fired, false);
foo.on('bar:baz', handler);
foo.on('bar:baz', handler2);
foo.stopObserving({'bar:baz': null});
foo.fire('bar:baz');
equal(eventFired, false);
equal(event2Fired, false);
});
test('stopObserving multiple handlers', function() {
var foo = { };
fabric.util.object.extend(foo, fabric.Observable);
var eventFired = false, event2Fired = false;
var handler = function() {
eventFired = true;
};
var handler2 = function() {
event2Fired = true;
};
foo.on({'bar:baz': handler, 'blah:blah': handler2});
foo.stopObserving({'bar:baz': handler, 'blah:blah': handler2});
foo.fire('bar:baz');
equal(eventFired, false);
foo.fire('blah:blah');
equal(event2Fired, false);
});
test('observe multiple handlers', function() {
@ -81,9 +112,9 @@ test('observe multiple handlers', function() {
foo.fire('blah:blah');
foo.fire('moo');
equal(true, barBazFired);
equal(true, blahBlahFired);
equal(true, mooFired);
equal(barBazFired, true);
equal(blahBlahFired, true);
equal(mooFired, true);
});
test('event options', function() {
@ -97,7 +128,7 @@ test('event options', function() {
foo.fire('foo:bar', { value: 'sekret' });
equal('sekret', someValue);
equal(someValue, 'sekret');
});
test('trigger', function() {
@ -112,8 +143,8 @@ test('trigger', function() {
});
foo.trigger('bar:baz');
equal(true, eventFired);
equal(foo, context);
equal(eventFired, true);
equal(context, foo);
});
test('chaining', function() {
@ -131,8 +162,8 @@ test('chaining', function() {
foo.trigger('event2').trigger('event1');
equal(true, event1Fired);
equal(true, event2Fired);
equal(event1Fired, true);
equal(event2Fired, true);
event1Fired = false;
event2Fired = false;
@ -140,6 +171,6 @@ test('chaining', function() {
foo.off('event1').off('event2');
foo.trigger('event2').trigger('event1');
equal(false, event1Fired);
equal(false, event2Fired);
equal(event1Fired, false);
equal(event2Fired, false);
});