Merge branch 'develop' of https://github.com/cocos2d/cocos2d-js into develop

Author: honghui

frameworks/cocos2d-html5

@@ -348,7 +348,7 @@ _p._ctor = function(fileName, rect){
 /************************  ProgressTimer  *************************/
 _p = cc.ProgressTimer.prototype;
 _p._ctor = function(sprite){
-    sprite && this.initWithSprite(sprite);
+    sprite !== undefined && this.initWithSprite(sprite);
 };
 
 /************************  TextFieldTTF  *************************/
@@ -447,12 +447,12 @@ cc.CardinalSplineTo.prototype._ctor = cc.CardinalSplineBy.prototype._ctor = func
 };
 
 cc.CatmullRomTo.prototype._ctor = cc.CatmullRomBy.prototype._ctor = function(dt, points) {
-    points && this.initWithDuration(dt, points);
+    points !== undefined && this.initWithDuration(dt, points);
 };
 
 _p = cc.ActionEase.prototype;
 _p._ctor = function(action) {
-    action && this.initWithAction(action);
+    action !== undefined && this.initWithAction(action);
 };
 cc.EaseExponentialIn._ctor
     = cc.EaseExponentialOut._ctor
@@ -534,7 +534,7 @@ cc.Lens3D.prototype._ctor = function(duration, gridSize, position, radius) {
 cc.FlipY3D.prototype._ctor
     = cc.FlipX3D.prototype._ctor
     = function(duration) {
-    duration !== undefiend && this.initWithDuration(duration, cc.size(1, 1));
+    duration !== undefined && this.initWithDuration(duration, cc.size(1, 1));
 };
 
 cc.Waves3D.prototype._ctor = function(duration, gridSize, waves, amplitude) {
@@ -597,7 +597,7 @@ cc.Repeat.prototype._ctor = function(action, times) {
 };
 
 cc.RepeatForever.prototype._ctor = function(action) {
-    action && this.initWithAction(action);
+    action !== undefined && this.initWithAction(action);
 };
 
 cc.Spawn.prototype._ctor = function(tempArray) {
@@ -819,14 +819,14 @@ cc.LabelTTF.prototype._ctor = function(text, fontName, fontSize, dimensions, hAl
 /************************  Other classes  *************************/
 
 cc.EventTouch.prototype._ctor = function(touches) {
-    touches && cc.EventTouch.prototype.setTouches.call(this, touches);
+    touches !== undefined && cc.EventTouch.prototype.setTouches.call(this, touches);
 };
 cc.Touch.prototype._ctor = function(x, y, id) {
     id !== undefined && cc.Touch.prototype.setTouchInfo.call(this, x, y, id);
 };
 
 cc.GLProgram.prototype._ctor = function(vShaderFileName, fShaderFileName) {
-    vShaderFileName && fShaderFileName && cc.GLProgram.prototype.init.call(this, vShaderFileName, fShaderFileName);
+    vShaderFileName !== undefined && fShaderFileName !== undefined && cc.GLProgram.prototype.init.call(this, vShaderFileName, fShaderFileName);
 };
 
 

frameworks/js-bindings/bindings/script/jsb_create_apis.js

@@ -92,7 +92,7 @@ ccui.RichElementCustomNode.prototype._ctor = function(tag, color, opacity, custo
 };
 
 jsb.EventListenerAssetsManager.prototype._ctor = function(assetsManager, callback) {
-    callback && this.init(assetsManager, callback);
+    callback !== undefined && this.init(assetsManager, callback);
 };
 
 cc.Scale9Sprite.prototype._ctor = function(file, rect, capInsets){
@@ -158,11 +158,11 @@ cc.ControlSlider.prototype._ctor = function(bgFile, progressFile, thumbFile){
 };
 
 cc.ControlStepper.prototype._ctor = function(minusSprite, plusSprite){
-    plusSprite && this.initWithMinusSpriteAndPlusSprite(minusSprite, plusSprite);
+    plusSprite !== undefined && this.initWithMinusSpriteAndPlusSprite(minusSprite, plusSprite);
 };
 
 cc.ControlSwitch.prototype._ctor = function(maskSprite, onSprite, offSprite, thumbSprite, onLabel, offLabel){
-    offLabel && this.initWithMaskSprite(maskSprite, onSprite, offSprite, thumbSprite, onLabel, offLabel);
+    offLabel !== undefined && this.initWithMaskSprite(maskSprite, onSprite, offSprite, thumbSprite, onLabel, offLabel);
 };
 
 cc.TableView.prototype._ctor = function(dataSouurce, size, container){
@@ -181,19 +181,19 @@ cc.ScrollView.prototype._ctor = function(size, container) {
 /************************  Cocostudio  *************************/
 
 ccs.Armature.prototype._ctor = function(name, parentBone) {
-    parentBone && ccs.Armature.prototype.init.call(this, name, parentBone);
+    parentBone !== undefined && ccs.Armature.prototype.init.call(this, name, parentBone);
 };
 
 ccs.Bone.prototype._ctor = function(name) {
-    name && ccs.Bone.prototype.init.call(this, name);
+    name !== undefined && ccs.Bone.prototype.init.call(this, name);
 };
 
 ccs.ArmatureAnimation.prototype._ctor = function(armature) {
-    armature && ccs.ArmatureAnimation.prototype.init.call(this, armature);
+    armature !== undefined && ccs.ArmatureAnimation.prototype.init.call(this, armature);
 };
 
 ccs.Tween.prototype._ctor = function(bone) {
-    bone && ccs.Tween.prototype.init.call(this, bone);
+    bone !== undefined && ccs.Tween.prototype.init.call(this, bone);
 };
 
 ccs.BatchNode.prototype._ctor = function() {
@@ -205,7 +205,7 @@ ccs.DecorativeDisplay.prototype._ctor = function() {
 };
 
 ccs.DisplayManager.prototype._ctor = function(bone) {
-    bone && ccs.DisplayManager.prototype.init.call(this, bone);
+    bone !== undefined && ccs.DisplayManager.prototype.init.call(this, bone);
 };
 
 ccs.Skin.prototype._ctor = function(fileName, rect) {
@@ -222,7 +222,7 @@ ccs.Skin.prototype._ctor = function(fileName, rect) {
 };
 
 ccs.ColliderDetector.prototype._ctor = function(bone) {
-    bone && ccs.ColliderDetector.prototype.init.call(this, bone);
+    bone !== undefined && ccs.ColliderDetector.prototype.init.call(this, bone);
 };
 
 ccs.TriggerObj.prototype._ctor = function() {