Issue cocos2d#2416: rename sprite _changeTextureColor

Author: VisualSJ

cocos2d/core/sprites/CCSpriteCanvasRenderCmd.js

@@ -239,18 +239,18 @@
         cc.g_NumberOfDraws++;
     };
 
-    proto._changeTextureColor = function () {
+    proto._updateColor = function () {
         var node = this._node;
         var displayedColor = this._displayedColor;
 
         if(this._colorized){
-            if(displayedColor.r === 255 && displayedColor.g === 255 && displayedColor.b === 255 && displayedColor.a === 255){
+            if(displayedColor.r === 255 && displayedColor.g === 255 && displayedColor.b === 255){
                 this._colorized = false;
                 node.texture = this._originalTexture;
                 return;
             }
         }else
-            if(displayedColor.r === 255 && displayedColor.g === 255 && displayedColor.b === 255 && displayedColor.a === 255)
+            if(displayedColor.r === 255 && displayedColor.g === 255 && displayedColor.b === 255)
                 return;
 
         var locElement, locTexture = node._texture, locRect = this._textureCoord;
@@ -305,7 +305,7 @@
         if (textureLoaded) {
             var curColor = node.getColor();
             if (curColor.r !== 255 || curColor.g !== 255 || curColor.b !== 255)
-                this._changeTextureColor();
+                this._updateColor();
         }
     };
 
@@ -339,12 +339,7 @@
 
     proto._updateDisplayColor = function (parentColor) {
         cc.Node.CanvasRenderCmd.prototype._updateDisplayColor.call(this, parentColor);
-        this._changeTextureColor();
-    };
-
-    proto._syncDisplayColor = function(parentColor){
-        cc.Node.CanvasRenderCmd.prototype._syncDisplayColor.call(this, parentColor);
-        this._changeTextureColor();
+        this._updateColor();
     };
 
     proto._spriteFrameLoadedCallback = function (spriteFrame) {
@@ -354,7 +349,7 @@
         //TODO change
         var curColor = _t.getColor();
         if (curColor.r !== 255 || curColor.g !== 255 || curColor.b !== 255)
-            _t._changeTextureColor();
+            _t._updateColor();
 
         _t.dispatchEvent("load");
     };
@@ -380,7 +375,7 @@
         //set the texture's color after the it loaded
         var locColor = locRenderCmd._displayedColor;
         if (locColor.r != 255 || locColor.g != 255 || locColor.b != 255)
-            locRenderCmd._changeTextureColor();
+            locRenderCmd._updateColor();
 
         // by default use "Self Render".
         // if the sprite is added to a batchnode, then it will automatically switch to "batchnode Render"