diff --git a/cocos2d/core/CCDirector.js b/cocos2d/core/CCDirector.js index a5358bc13b..94a5339e07 100644 --- a/cocos2d/core/CCDirector.js +++ b/cocos2d/core/CCDirector.js @@ -106,6 +106,8 @@ cc.Director = Class.extend(/** @lends cc.Director# */{ ctor: function () { var self = this; + + EventTarget.call(self); self._lastUpdate = Date.now(); cc.eventManager.addCustomListener(cc.game.EVENT_SHOW, function () { self._lastUpdate = Date.now(); @@ -156,9 +158,6 @@ cc.Director = Class.extend(/** @lends cc.Director# */{ this._animationManager = null; } - // Event target - EventTarget.polyfill(this); - // WidgetManager cc._widgetManager.init(this); @@ -967,6 +966,9 @@ cc.Director = Class.extend(/** @lends cc.Director# */{ } }); +// Event target +cc.js.addon(cc.Director.prototype, EventTarget.prototype); + /** * The event projection changed of cc.Director * @constant diff --git a/cocos2d/core/CCGame.js b/cocos2d/core/CCGame.js index b8527a044a..5271aa0b31 100644 --- a/cocos2d/core/CCGame.js +++ b/cocos2d/core/CCGame.js @@ -598,6 +598,7 @@ var game = /** @lends cc.game# */{ } }; -EventTarget.polyfill(game); +EventTarget.call(game); +cc.js.addon(game, EventTarget.prototype); cc.game = module.exports = game; diff --git a/cocos2d/core/CCNode.js b/cocos2d/core/CCNode.js index 86cbde0f0f..b17bcf840a 100644 --- a/cocos2d/core/CCNode.js +++ b/cocos2d/core/CCNode.js @@ -38,6 +38,7 @@ var DontDestroy = Flags.DontDestroy; var Node = cc.Class({ name: 'cc.Node', extends: require('./utils/base-node'), + mixins: [cc.EventTarget], properties: { /** @@ -185,7 +186,7 @@ var Node = cc.Class({ // Remove all listeners for (i = 0, len = this.__eventTargets.length; i < len; ++i) { var target = this.__eventTargets[i]; - target && target.targetOff && target.targetOff(this); + target && target.targetOff(this); } this.__eventTargets.length = 0; diff --git a/cocos2d/core/base-nodes/CCAtlasNode.js b/cocos2d/core/base-nodes/CCAtlasNode.js index 97aa6fb5bd..f7f47f2253 100644 --- a/cocos2d/core/base-nodes/CCAtlasNode.js +++ b/cocos2d/core/base-nodes/CCAtlasNode.js @@ -82,6 +82,8 @@ cc.AtlasNode = _ccsg.Node.extend(/** @lends cc.AtlasNode# */{ */ ctor: function (tile, tileWidth, tileHeight, itemsToRender) { _ccsg.Node.prototype.ctor.call(this); + EventTarget.call(this); + this._blendFunc = {src: cc.BLEND_SRC, dst: cc.BLEND_DST}; this._ignoreContentScaleFactor = false; itemsToRender !== undefined && this.initWithTileFile(tile, tileWidth, tileHeight, itemsToRender); @@ -279,7 +281,7 @@ _p.textureAtlas; /** @expose */ _p.quadsToDraw; -EventTarget.polyfill(_p); +cc.js.addon(_p, EventTarget.prototype); /** * Creates a cc.AtlasNode with an Atlas file the width and height of each item and the quantity of items to render diff --git a/cocos2d/core/components/CCButton.js b/cocos2d/core/components/CCButton.js index f041e5492e..296f6a2574 100644 --- a/cocos2d/core/components/CCButton.js +++ b/cocos2d/core/components/CCButton.js @@ -22,6 +22,8 @@ THE SOFTWARE. ****************************************************************************/ +var EventTarget = require("../event/event-target"); + /** * Enum for transition type * @enum EButton.Transition @@ -117,6 +119,8 @@ var Button = cc.Class({ extends: require('./CCComponent'), ctor: function () { + EventTarget.call(this); + this._touchListener = null; this._mouseListener = null; @@ -490,7 +494,6 @@ var Button = cc.Class({ }); -var EventTarget = require("../event/event-target"); -EventTarget.polyfill(Button.prototype); +cc.js.addon(Button.prototype, EventTarget.prototype); cc.EButton = module.exports = Button; diff --git a/cocos2d/core/components/CCComponent.js b/cocos2d/core/components/CCComponent.js index d51ff798cc..566070cf92 100644 --- a/cocos2d/core/components/CCComponent.js +++ b/cocos2d/core/components/CCComponent.js @@ -536,7 +536,7 @@ var Component = cc.Class({ // Remove all listeners for (i = 0, l = this.__eventTargets.length; i < l; ++i) { target = this.__eventTargets[i]; - target && target.targetOff && target.targetOff(this); + target && target.targetOff(this); } this.__eventTargets.length = 0; // onDestroy diff --git a/cocos2d/core/event/event-target.js b/cocos2d/core/event/event-target.js index 0557795e4e..277b5cb980 100644 --- a/cocos2d/core/event/event-target.js +++ b/cocos2d/core/event/event-target.js @@ -96,16 +96,13 @@ var _doSendEvent = function (owner, event) { * @class EventTarget */ var EventTarget = function () { -}; - -JS.mixin(EventTarget.prototype, { /** * @property _capturingListeners * @type {EventListeners} * @default null * @private */ - _capturingListeners: null, + this._capturingListeners = null; /** * @property _bubblingListeners @@ -113,7 +110,10 @@ JS.mixin(EventTarget.prototype, { * @default null * @private */ - _bubblingListeners: null, + this._bubblingListeners = null; +}; + +JS.mixin(EventTarget.prototype, { /** * Checks whether the EventTarget object has any callback registered for a specific type of event. @@ -209,8 +209,12 @@ JS.mixin(EventTarget.prototype, { * @param {Object} target - The target to be searched for all related callbacks */ targetOff: function (target) { - this._capturingListeners.removeAll(target); - this._bubblingListeners.removeAll(target); + if (this._capturingListeners) { + this._capturingListeners.removeAll(target); + } + if (this._bubblingListeners) { + this._bubblingListeners.removeAll(target); + } }, /** @@ -314,30 +318,4 @@ JS.mixin(EventTarget.prototype, { } }); -/** - * Polyfill the functionalities of EventTarget into a existing object. - * @static - * @memberof EventTarget - * @param {Object} object - An object to be extended with EventTarget capability - */ -EventTarget.polyfill = function (object) { - var proto = EventTarget.prototype; - // Can't use cc.js.mixin because we don't want to inject polyfill or overwrite _getXXXTargets - object._capturingListeners = null; - object._bubblingListeners = null; - - object.hasEventListener = proto.hasEventListener; - object.on = proto.on; - object.off = proto.off; - object.once = proto.once; - object.dispatchEvent = proto.dispatchEvent; - object.emit = proto.emit; - if (!object._isTargetActive) - object._isTargetActive = proto._isTargetActive; - if (!object._getCapturingTargets) - object._getCapturingTargets = proto._getCapturingTargets; - if (!object._getBubblingTargets) - object._getBubblingTargets = proto._getBubblingTargets; -}; - cc.EventTarget = module.exports = EventTarget; diff --git a/cocos2d/core/sprites/CCSprite.js b/cocos2d/core/sprites/CCSprite.js index b798b250bf..e11beae34a 100644 --- a/cocos2d/core/sprites/CCSprite.js +++ b/cocos2d/core/sprites/CCSprite.js @@ -125,6 +125,8 @@ cc.Sprite = _ccsg.Node.extend(/** @lends cc.Sprite# */{ ctor: function (fileName, rect, rotated) { var self = this; _ccsg.Node.prototype.ctor.call(self); + EventTarget.call(self); + self._shouldBeHidden = false; self._offsetPosition = cc.p(0, 0); self._unflippedOffsetPositionFromCenter = cc.p(0, 0); @@ -1025,7 +1027,8 @@ cc.Sprite.createWithSpriteFrame = cc.Sprite.create; */ cc.Sprite.INDEX_NOT_INITIALIZED = -1; -EventTarget.polyfill(cc.Sprite.prototype); +cc.js.addon(cc.Sprite.prototype, EventTarget.prototype); + cc.assert(cc.js.isFunction(cc._tmp.PrototypeSprite), cc._LogInfos.MissingFile, "SpritesPropertyDefine.js"); cc._tmp.PrototypeSprite(); diff --git a/cocos2d/core/sprites/CCSpriteFrame.js b/cocos2d/core/sprites/CCSpriteFrame.js index 76cf1c71df..0ba3b8324e 100644 --- a/cocos2d/core/sprites/CCSpriteFrame.js +++ b/cocos2d/core/sprites/CCSpriteFrame.js @@ -49,6 +49,7 @@ var EventTarget = require("../event/event-target"); cc.SpriteFrame = cc.Class(/** @lends cc.SpriteFrame# */{ name:'cc.SpriteFrame', extends:require('../assets/CCAsset'), + mixins: [EventTarget], //properties:{ // /** @@ -560,8 +561,6 @@ proto.copyWithZone = proto.clone; */ proto.copy = proto.clone; -EventTarget.polyfill(proto); - /** *

* Create a cc.SpriteFrame with a texture filename, rect, rotated, offset and originalSize in pixels.
diff --git a/cocos2d/core/textures/CCTexture2D.js b/cocos2d/core/textures/CCTexture2D.js index c1f52f3e14..fdc68fbcb2 100644 --- a/cocos2d/core/textures/CCTexture2D.js +++ b/cocos2d/core/textures/CCTexture2D.js @@ -143,6 +143,7 @@ var Texture2D = cc.Class(/** @lends cc.Texture2D# */{ name: 'cc.Texture2D', extends: require('../assets/CCRawAsset'), + mixins: [EventTarget], ctor: function () { this.url = null; @@ -592,8 +593,6 @@ cc.defineGetterSetter(_p, "width", _p._getWidth); _p.height; cc.defineGetterSetter(_p, "height", _p._getHeight); -EventTarget.polyfill(Texture2D.prototype); - game.once(game.EVENT_RENDERER_INITED, function () { if(cc._renderType === game.RENDER_TYPE_CANVAS) { diff --git a/cocos2d/labels/CCLabel.js b/cocos2d/labels/CCLabel.js index 22b037d732..3dd81c2fce 100644 --- a/cocos2d/labels/CCLabel.js +++ b/cocos2d/labels/CCLabel.js @@ -131,6 +131,8 @@ cc.Label = _ccsg.Node.extend({ //fontHandle it is a font name or bmfont file. ctor: function(string, fontHandle, type) { + EventTarget.call(this); + fontHandle = fontHandle || ""; this._fontHandle = fontHandle; type = type || 0; @@ -1087,7 +1089,7 @@ cc.BMFontHelper = { var _p = cc.Label.prototype; -EventTarget.polyfill(_p); +cc.js.addon(_p, EventTarget.prototype); cc.js.mixin(_p, cc.BMFontHelper); cc.Label.Type = cc.Enum({ diff --git a/cocos2d/labels/CCLabelBMFont.js b/cocos2d/labels/CCLabelBMFont.js index 60789475a1..24d5c1b88c 100644 --- a/cocos2d/labels/CCLabelBMFont.js +++ b/cocos2d/labels/CCLabelBMFont.js @@ -155,6 +155,8 @@ cc.LabelBMFont = cc.SpriteBatchNode.extend(/** @lends cc.LabelBMFont# */{ */ ctor: function (str, fntFile, width, alignment, imageOffset) { cc.SpriteBatchNode.prototype.ctor.call(this); + EventTarget.call(this); + this._imageOffset = cc.p(0, 0); this._reusedChar = []; this._cascadeColorEnabled = true; @@ -841,7 +843,7 @@ cc.LabelBMFont = cc.SpriteBatchNode.extend(/** @lends cc.LabelBMFont# */{ (function(){ var p = cc.LabelBMFont.prototype; - EventTarget.polyfill(p); + cc.js.addon(p, EventTarget.prototype); /** @expose */ p.string; diff --git a/extensions/ccui/base-classes/UIScale9Sprite.js b/extensions/ccui/base-classes/UIScale9Sprite.js index e51d7d9e88..8d5696eda0 100644 --- a/extensions/ccui/base-classes/UIScale9Sprite.js +++ b/extensions/ccui/base-classes/UIScale9Sprite.js @@ -95,6 +95,8 @@ ccui.Scale9Sprite = cc.Scale9Sprite = _ccsg.Node.extend(/** @lends ccui.Scale9Sp ctor: function(file, rect, capInsets) { _ccsg.Node.prototype.ctor.call(this); + EventTarget.call(this); + this._nonSliceSpriteAnchor = cc.p(0.5,0.5); this._originalSize = cc.size(0,0); this._preferredSize = cc.rect(0,0,0,0); @@ -1043,7 +1045,7 @@ ccui.Scale9Sprite = cc.Scale9Sprite = _ccsg.Node.extend(/** @lends ccui.Scale9Sp }); var _p = ccui.Scale9Sprite.prototype; -EventTarget.polyfill(_p); +cc.js.addon(_p, EventTarget.prototype); // Extended properties /** @expose */ diff --git a/extensions/ccui/base-classes/UIWidget.js b/extensions/ccui/base-classes/UIWidget.js index 59af44235f..ac376092f5 100644 --- a/extensions/ccui/base-classes/UIWidget.js +++ b/extensions/ccui/base-classes/UIWidget.js @@ -163,6 +163,8 @@ ccui.Widget = ccui.ProtectedNode.extend(/** @lends ccui.Widget# */{ */ ctor: function () { cc.ProtectedNode.prototype.ctor.call(this); + EventTarget.call(this); + this._brightStyle = ccui.Widget.BRIGHT_STYLE_NONE; this._touchBeganPosition = cc.p(0, 0); this._touchMovePosition = cc.p(0, 0); @@ -1903,7 +1905,7 @@ ccui.Widget.create = function () { return new ccui.Widget(); }; -EventTarget.polyfill(ccui.Widget.prototype); +cc.js.addon(ccui.Widget.prototype, EventTarget.prototype); ccui.Widget._focusedWidget = null; //both layout & widget will be stored in this variable ccui.Widget._focusNavigationController = null; diff --git a/external/gaf/Library/GAFAsset.js b/external/gaf/Library/GAFAsset.js index c66fddde39..79b8371ed8 100644 --- a/external/gaf/Library/GAFAsset.js +++ b/external/gaf/Library/GAFAsset.js @@ -242,6 +242,8 @@ gaf.Asset = cc._Class.extend ctor : function() { + EventTarget.call(this); + this._header = {}; this._timeLines = []; this._textFields = []; @@ -425,4 +427,4 @@ gaf.Asset.createWithBundle = function (zipFilePath, entryFile, delegate) return asset; }; -EventTarget.polyfill(gaf.Asset.prototype); +cc.js.addon(gaf.Asset.prototype, EventTarget.prototype); diff --git a/test/qunit/unit/_init.js b/test/qunit/unit/_init.js index 4acf77ea6a..1c627e5738 100644 --- a/test/qunit/unit/_init.js +++ b/test/qunit/unit/_init.js @@ -109,22 +109,23 @@ var TestScript = cc.Class({ // polyfills to test engine extends -cc.engine = { - attachedObjsForEditor: {}, +cc.engine = new (cc.Class({ + extends: cc.EventTarget, + properties: { + attachedObjsForEditor: { + default: {} + }, + }, getInstanceById: function (uuid) { return this.attachedObjsForEditor[uuid] || null; - }, -}; + } +}))(); Editor.log = cc.log; Editor.warn = cc.warn; Editor.error = cc.error; Editor.info = cc.info; -// - -cc.EventTarget.polyfill(cc.engine); - var assetDir = '../test/qunit/assets'; var canvas;