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

Author: dingpinglv

cocos2d/tilemap/CCTMXLayer.js

@@ -370,7 +370,7 @@ cc.TMXLayer = cc.SpriteBatchNode.extend(/** @lends cc.TMXLayer# */{
      * @return {Number}
      */
     getTileGIDAt:function (pos, y) {
-        if(!pos)
+        if(pos == null)
             throw "cc.TMXLayer.getTileGIDAt(): pos should be non-null";
         if(y !== undefined)
             pos = cc.p(pos, y);

cocos2d/tilemap/CCTMXLayerCanvasRenderCmd.js

@@ -27,7 +27,6 @@
         cc.SpriteBatchNode.CanvasRenderCmd.call(this, renderable);
         this._needDraw = true;
         this._realWorldTransform = {a: 1, b: 0, c: 0, d: 1, tx: 0, ty: 0};
-        this._childrenRenderCmds = [];
 
         var locCanvas = cc._canvas;
         var tmpCanvas = cc.newElement('canvas');
@@ -46,36 +45,32 @@
     var proto = cc.TMXLayer.CanvasRenderCmd.prototype = Object.create(cc.SpriteBatchNode.CanvasRenderCmd.prototype);
     proto.constructor = cc.TMXLayer.CanvasRenderCmd;
 
-    proto._copyRendererCmds = function (rendererCmds) {
-        if (!rendererCmds)
-            return;
-
-        var locCacheCmds = this._childrenRenderCmds;
-        locCacheCmds.length = 0;
-        for (var i = 0, len = rendererCmds.length; i < len; i++) {
-            locCacheCmds[i] = rendererCmds[i];
-        }
-    };
-
     //set the cache dirty flag for canvas
     proto._setNodeDirtyForCache = function () {
         this._cacheDirty  = true;
     };
 
     proto._renderingChildToCache = function (scaleX, scaleY) {
         if (this._cacheDirty) {
-            var locCacheCmds = this._childrenRenderCmds, wrapper = this._cacheContext,
+            var wrapper = this._cacheContext,
                 context = wrapper.getContext(), locCanvas = this._cacheCanvas;
 
             //wrapper.save();
             context.setTransform(1, 0, 0, 1, 0, 0);
             context.clearRect(0, 0, locCanvas.width, locCanvas.height);
             //reset the cache context
 
-            for (var i = 0, len = locCacheCmds.length; i < len; i++) {
-                locCacheCmds[i].rendering(wrapper, scaleX, scaleY);
-                locCacheCmds[i]._cacheDirty = false;
+            var locChildren = this._node._children;
+            for (var i = 0, len =  locChildren.length; i < len; i++) {
+                if (locChildren[i]){
+                    var selCmd = locChildren[i]._renderCmd;
+                    if(selCmd){
+                        selCmd.rendering(wrapper, scaleX, scaleY);
+                        selCmd._cacheDirty = false;
+                    }
+                }
             }
+
             //wrapper.restore();
             this._cacheDirty = false;
         }
@@ -161,9 +156,6 @@
                 }
            }
 
-            //copy cached render cmd array to TMXLayer renderer
-            this._copyRendererCmds(renderer._cacheToCanvasCmds[instanceID]);
-
             //wrapper.save();
             context.setTransform(1, 0, 0, 1, 0, 0);
             context.clearRect(0, 0, locCanvas.width, locCanvas.height);

extensions/ccui/uiwidgets/UICheckBox.js

@@ -163,7 +163,7 @@ ccui.CheckBox = ccui.Widget.extend(/** @lends ccui.CheckBox# */{
      * @param {ccui.Widget.LOCAL_TEXTURE|ccui.Widget.PLIST_TEXTURE} texType
      */
     loadTextureBackGround: function (backGround, texType) {
-        if (!backGround || (this._backGroundFileName == backGround && this._backGroundTexType == texType))
+        if (!backGround)
             return;
 
         texType = texType || ccui.Widget.LOCAL_TEXTURE;
@@ -206,7 +206,7 @@ ccui.CheckBox = ccui.Widget.extend(/** @lends ccui.CheckBox# */{
      * @param {ccui.Widget.LOCAL_TEXTURE|ccui.Widget.PLIST_TEXTURE} texType
      */
     loadTextureBackGroundSelected: function (backGroundSelected, texType) {
-        if (!backGroundSelected || (this._backGroundSelectedFileName == backGroundSelected && this._backGroundSelectedTexType == texType))
+        if (!backGroundSelected)
             return;
 
         texType = texType || ccui.Widget.LOCAL_TEXTURE;
@@ -246,7 +246,7 @@ ccui.CheckBox = ccui.Widget.extend(/** @lends ccui.CheckBox# */{
      * @param {ccui.Widget.LOCAL_TEXTURE|ccui.Widget.PLIST_TEXTURE} texType
      */
     loadTextureFrontCross: function (cross, texType) {
-        if (!cross || (this._frontCrossFileName == cross && this._frontCrossTexType == texType))
+        if (!cross)
             return;
         texType = texType || ccui.Widget.LOCAL_TEXTURE;
         this._frontCrossFileName = cross;
@@ -285,7 +285,7 @@ ccui.CheckBox = ccui.Widget.extend(/** @lends ccui.CheckBox# */{
      * @param {ccui.Widget.LOCAL_TEXTURE|ccui.Widget.PLIST_TEXTURE} texType
      */
     loadTextureBackGroundDisabled: function (backGroundDisabled, texType) {
-        if (!backGroundDisabled || (this._backGroundDisabledFileName == backGroundDisabled && this._backGroundDisabledTexType == texType))
+        if (!backGroundDisabled)
             return;
         texType = texType || ccui.Widget.LOCAL_TEXTURE;
         this._backGroundDisabledFileName = backGroundDisabled;
@@ -324,7 +324,7 @@ ccui.CheckBox = ccui.Widget.extend(/** @lends ccui.CheckBox# */{
      * @param {ccui.Widget.LOCAL_TEXTURE|ccui.Widget.PLIST_TEXTURE} texType
      */
     loadTextureFrontCrossDisabled: function (frontCrossDisabled, texType) {
-        if (!frontCrossDisabled || (this._frontCrossDisabledFileName == frontCrossDisabled && this._frontCrossDisabledTexType == texType))
+        if (!frontCrossDisabled)
             return;
         texType = texType || ccui.Widget.LOCAL_TEXTURE;
         this._frontCrossDisabledFileName = frontCrossDisabled;