Merge pull request #1707 from zilongshanren/fix-button-callback-event-args

Fix button callback event args
This commit is contained in:
Jare Guo
2017-06-06 15:34:04 +08:00
committed by GitHub
2 changed files with 28 additions and 0 deletions
@@ -144,6 +144,7 @@ cc.Component.EventHandler = cc.Class({
if (typeof(handler) !== 'function') return;
if (this.customEventData != null && this.customEventData !== '') {
params = params.slice();
params.push(this.customEventData);
}
+27
View File
@@ -76,6 +76,33 @@ var jsbSkipModules = [
'../../cocos2d/core/physics/platform/CCPhysicsRayCastCallback.js',
'../../cocos2d/core/physics/platform/CCPhysicsContactListner.js',
'../../cocos2d/core/camera/CCSGCameraNode.js',
'../../cocos2d/core/label/CCSGLabel.js',
'../../cocos2d/core/label/CCSGLabelCanvasRenderCmd.js',
'../../cocos2d/core/label/CCSGLabelWebGLRenderCmd.js',
'../../cocos2d/clipping-nodes/CCClippingNode.js',
'../../cocos2d/clipping-nodes/CCClippingNodeCanvasRenderCmd.js',
'../../cocos2d/clipping-nodes/CCClippingNodeWebGLRenderCmd.js',
'../../cocos2d/core/videoplayer/CCSGVideoPlayer.js',
'../../cocos2d/core/webview/CCSGWebView.js',
'../../cocos2d/core/editbox/CCSGEditBox.js',
'../../cocos2d/particle/CCSGParticleSystem.js',
'../../cocos2d/particle/CCSGParticleSystemCanvasRenderCmd.js',
'../../cocos2d/particle/CCSGParticleSystemWebGLRenderCmd.js',
'../../cocos2d/particle/CCParticleBatchNode.js',
'../../cocos2d/particle/CCParticleBatchNodeCanvasRenderCmd.js',
'../../cocos2d/particle/CCParticleBatchNodeWebGLRenderCmd.js',
'../../cocos2d/tilemap/CCSGTMXTiledMap.js',
'../../cocos2d/tilemap/CCTMXXMLParser.js',
'../../cocos2d/tilemap/CCSGTMXObjectGroup.js',
'../../cocos2d/tilemap/CCSGTMXObject.js',
'../../cocos2d/tilemap/CCSGTMXLayer.js',
'../../cocos2d/tilemap/CCTMXLayerCanvasRenderCmd.js',
'../../cocos2d/tilemap/CCTMXLayerWebGLRenderCmd.js',
'../../cocos2d/motion-streak/CCSGMotionStreak.js',
'../../cocos2d/motion-streak/CCSGMotionStreakWebGLRenderCmd.js',
'../../cocos2d/render-texture/CCRenderTexture.js',
'../../cocos2d/render-texture/CCRenderTextureCanvasRenderCmd.js',
'../../cocos2d/render-texture/CCRenderTextureWebGLRenderCmd.js'
];
gulp.task('build-jsb-extends-dev', function (done) {