Merge pull request #2401 from dingpinglv/develop

Fixed a bug of cc.Sprite that its flipped function is incorrect in Canvas

Author: dingpinglv

cocos2d/core/base-nodes/CCNode.js

@@ -2796,10 +2796,8 @@ if (cc._renderType === cc._RENDER_TYPE_CANVAS) {
             }
 
             // adjust anchorPoint
-            if(!this._flippedX)                 //TODO modify for new renderer
-                t.tx += Cos * -appX * sx + -Sin * appY * sy;
-            if(!this._flippedY)
-                t.ty -= Sin * -appX * sx + Cos * appY * sy;
+            t.tx += Cos * -appX * sx + -Sin * appY * sy;
+            t.ty -= Sin * -appX * sx + Cos * appY * sy;
 
             // if ignore anchorPoint
             if (_t._ignoreAnchorPointForPosition) {

cocos2d/core/renderer/RendererCanvas.js

@@ -185,10 +185,14 @@ if (cc._renderType === cc._RENDER_TYPE_CANVAS) {
             if (blendChange)
                 context.globalCompositeOperation = node._blendFuncStr;
 
-            if (node._flippedX)
+            if (node._flippedX){
+                locX = -locX - locWidth;
                 context.scale(-1, 1);
-            if (node._flippedY)
+            }
+            if (node._flippedY){
+                locY = node._offsetPosition.y;
                 context.scale(1, -1);
+            }
 
             if (node._texture) {
                 image = node._texture._htmlElementObj;