Skip to content

Fix small issues #3483

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

Merged
merged 3 commits into from
May 9, 2017
Merged

Fix small issues #3483

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d4d9cdf
Fix eventManager memory leak
pandamicro May 9, 2017
f192b7d
Listen to orientationChange event only on mobile
pandamicro May 9, 2017
0ff97d0
Fix texture cache.dumpCachedTextureInfo
pandamicro May 9, 2017
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
76 changes: 39 additions & 37 deletions cocos2d/core/event-manager/CCEventListener.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -277,15 +277,16 @@ cc.EventListener.CUSTOM = 8;

cc._EventListenerCustom = cc.EventListener.extend({
_onCustomEvent: null,
ctor: function (listenerId, callback) {
ctor: function (listenerId, callback, target) {
this._onCustomEvent = callback;
var selfPointer = this;
var listener = function (event) {
if (selfPointer._onCustomEvent !== null)
selfPointer._onCustomEvent(event);
};
this._target = target;

cc.EventListener.prototype.ctor.call(this, cc.EventListener.CUSTOM, listenerId, listener);
cc.EventListener.prototype.ctor.call(this, cc.EventListener.CUSTOM, listenerId, this._callback);
},

_callback: function (event) {
if (this._onCustomEvent !== null)
this._onCustomEvent.call(this._target, event);
},

checkAvailable: function () {
Expand All @@ -308,31 +309,31 @@ cc._EventListenerMouse = cc.EventListener.extend({
onMouseScroll: null,

ctor: function () {
var selfPointer = this;
var listener = function (event) {
var eventType = cc.EventMouse;
switch (event._eventType) {
case eventType.DOWN:
if (selfPointer.onMouseDown)
selfPointer.onMouseDown(event);
break;
case eventType.UP:
if (selfPointer.onMouseUp)
selfPointer.onMouseUp(event);
break;
case eventType.MOVE:
if (selfPointer.onMouseMove)
selfPointer.onMouseMove(event);
break;
case eventType.SCROLL:
if (selfPointer.onMouseScroll)
selfPointer.onMouseScroll(event);
break;
default:
break;
}
};
cc.EventListener.prototype.ctor.call(this, cc.EventListener.MOUSE, cc._EventListenerMouse.LISTENER_ID, listener);
cc.EventListener.prototype.ctor.call(this, cc.EventListener.MOUSE, cc._EventListenerMouse.LISTENER_ID, this._callback);
},

_callback: function (event) {
var eventType = cc.EventMouse;
switch (event._eventType) {
case eventType.DOWN:
if (this.onMouseDown)
this.onMouseDown(event);
break;
case eventType.UP:
if (this.onMouseUp)
this.onMouseUp(event);
break;
case eventType.MOVE:
if (this.onMouseMove)
this.onMouseMove(event);
break;
case eventType.SCROLL:
if (this.onMouseScroll)
this.onMouseScroll(event);
break;
default:
break;
}
},

clone: function () {
Expand Down Expand Up @@ -501,11 +502,12 @@ cc._EventListenerFocus = cc.EventListener.extend({
},
onFocusChanged: null,
ctor: function(){
var listener = function(event){
if(this.onFocusChanged)
this.onFocusChanged(event._widgetLoseFocus, event._widgetGetFocus);
};
cc.EventListener.prototype.ctor.call(this, cc.EventListener.FOCUS, cc._EventListenerFocus.LISTENER_ID, listener);
cc.EventListener.prototype.ctor.call(this, cc.EventListener.FOCUS, cc._EventListenerFocus.LISTENER_ID, this._callback);
},
_callback: function (event) {
if (this.onFocusChanged) {
this.onFocusChanged(event._widgetLoseFocus, event._widgetGetFocus);
}
}
});

Expand Down
6 changes: 3 additions & 3 deletions cocos2d/core/event-manager/CCEventManager.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -258,8 +258,8 @@ cc.eventManager = /** @lends cc.eventManager# */{

if (!this._inDispatch) {
listeners.clear();
delete this._listenersMap[listenerID];
}
delete this._listenersMap[listenerID];
}

var locToAddedListeners = this._toAddedListeners, listener;
Expand Down Expand Up @@ -751,8 +751,8 @@ cc.eventManager = /** @lends cc.eventManager# */{
* @param {function} callback
* @return {cc.EventListener} the generated event. Needed in order to remove the event from the dispatcher
*/
addCustomListener: function (eventName, callback) {
var listener = new cc._EventListenerCustom(eventName, callback);
addCustomListener: function (eventName, callback, target) {
var listener = new cc._EventListenerCustom(eventName, callback, target);
this.addListener(listener, 1);
return listener;
},
Expand Down
6 changes: 4 additions & 2 deletions cocos2d/core/platform/CCEGLView.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -184,6 +184,10 @@ cc.EGLView = cc.Class.extend(/** @lends cc.view# */{
_t._rpFixedWidth = new cc.ResolutionPolicy(_strategyer.EQUAL_TO_FRAME, _strategy.FIXED_WIDTH);

_t._targetDensityDPI = cc.DENSITYDPI_HIGH;

if (sys.isMobile) {
window.addEventListener('orientationchange', this._orientationChange);
}
},

// Resize helper functions
Expand Down Expand Up @@ -276,14 +280,12 @@ cc.EGLView = cc.Class.extend(/** @lends cc.view# */{
if (!this.__resizeWithBrowserSize) {
this.__resizeWithBrowserSize = true;
window.addEventListener('resize', this._resizeEvent);
window.addEventListener('orientationchange', this._orientationChange);
}
} else {
//disable
if (this.__resizeWithBrowserSize) {
this.__resizeWithBrowserSize = false;
window.removeEventListener('resize', this._resizeEvent);
window.removeEventListener('orientationchange', this._orientationChange);
}
}
},
Expand Down
6 changes: 3 additions & 3 deletions cocos2d/core/textures/CCTextureCache.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -279,11 +279,11 @@ cc.textureCache = /** @lends cc.textureCache# */{
var selTexture = locTextures[key];
count++;
if (selTexture.getHtmlElementObj() instanceof HTMLImageElement)
cc.log(cc._LogInfos.textureCache_dumpCachedTextureInfo, key, selTexture.getHtmlElementObj().src, selTexture.pixelsWidth, selTexture.pixelsHeight);
cc.log(cc._LogInfos.textureCache_dumpCachedTextureInfo, key, selTexture.getHtmlElementObj().src, selTexture.getPixelsWide(), selTexture.getPixelsHigh());
else {
cc.log(cc._LogInfos.textureCache_dumpCachedTextureInfo_2, key, selTexture.pixelsWidth, selTexture.pixelsHeight);
cc.log(cc._LogInfos.textureCache_dumpCachedTextureInfo_2, key, selTexture.getPixelsWide(), selTexture.getPixelsHigh());
}
totalBytes += selTexture.pixelsWidth * selTexture.pixelsHeight * 4;
totalBytes += selTexture.getPixelsWide() * selTexture.getPixelsHigh() * 4;
}

var locTextureColorsCache = this._textureColorsCache;
Expand Down