Include L.Mixin.Events again; add deprecation notice (#5365)

Close #5358
This commit is contained in:
Per Liedman 2017-03-07 09:53:24 +01:00 committed by Iván Sánchez Ortega
parent da1a89871d
commit c18ac11efb
3 changed files with 34 additions and 2 deletions

View File

@ -604,4 +604,20 @@ describe('Events', function () {
});
});
describe('#L.Mixin.Events', function () {
it('can be used from includes', function () {
var EventClass = L.Class.extend({
includes: L.Mixin.Events
});
var obj = new EventClass();
var spy = sinon.spy();
obj.on('test', spy);
obj.fire('test');
expect(spy.called).to.be(true);
});
});
});

View File

@ -48,6 +48,7 @@ Class.extend = function (props) {
// mix includes into the prototype
if (props.includes) {
checkDeprecatedMixinEvents(props.includes);
Util.extend.apply(null, [proto].concat(props.includes));
delete props.includes;
}
@ -109,3 +110,17 @@ Class.addInitHook = function (fn) { // (Function) || (String, args...)
this.prototype._initHooks.push(init);
return this;
};
function checkDeprecatedMixinEvents(includes) {
if (!L || !L.Mixin) { return; }
includes = L.Util.isArray(includes) ? includes : [includes];
for (var i = 0; i < includes.length; i++) {
if (includes[i] === L.Mixin.Events) {
console.warn('Deprecated include of L.Mixin.Events: ' +
'this property will be removed in future releases, ' +
'please inherit from L.Evented instead.', new Error().stack);
}
}
}

View File

@ -3,8 +3,9 @@ export {Browser};
export {Class} from './Class';
export {Evented} from './Events';
// export var Mixin = {Events: Evented.prototype};
import {Evented} from './Events';
export {Evented};
export var Mixin = {Events: Evented.prototype};
export {Handler} from './Handler';