Merge pull request cocos2d#3171 from pandamicro/develop

Fix UI deep issues

Author: pandamicro

extensions/ccui/base-classes/UIScale9SpriteCanvasRenderCmd.js

@@ -156,6 +156,7 @@
         locContext.setTransform(1, 0, 0, 1, 0, 0);
         locContext.clearRect(0, 0, sizeInPixels.width, sizeInPixels.height);
         cc.renderer._renderingToCacheCanvas(wrapper, node.__instanceId, locScaleFactor, locScaleFactor);
+        cc.renderer._turnToNormalMode();
         if(selTexture && this._state === ccui.Scale9Sprite.state.GRAY)
             selTexture._switchToGray(false);
 
@@ -173,4 +174,4 @@
         this._state = state;
         this._cacheScale9Sprite();
     };
-})();
+})();

extensions/ccui/uiwidgets/UIImageView.js

@@ -53,7 +53,7 @@ ccui.ImageView = ccui.Widget.extend(/** @lends ccui.ImageView# */{
         this._imageTextureSize = cc.size(this._capInsets.width, this._capInsets.height);
         ccui.Widget.prototype.ctor.call(this);
         texType = texType === undefined ? 0 : texType;
-        this.init(imageFileName, texType);
+        this._init(imageFileName, texType);
     },
 
     /**
@@ -62,15 +62,11 @@ ccui.ImageView = ccui.Widget.extend(/** @lends ccui.ImageView# */{
      * @param {Number} [texType==ccui.Widget.LOCAL_TEXTURE]
      * @returns {boolean}
      */
-    init: function(imageFileName, texType){
-        if(ccui.Widget.prototype.init.call(this)){
-            if(imageFileName === undefined)
-                this._imageTexType = ccui.Widget.LOCAL_TEXTURE;
-            else
-                this.loadTexture(imageFileName, texType);
-            return true;
-        }
-        return false;
+    _init: function(imageFileName, texType){
+        if(imageFileName === undefined)
+            this._imageTexType = ccui.Widget.LOCAL_TEXTURE;
+        else
+            this.loadTexture(imageFileName, texType);
     },
 
     _initRenderer: function () {
@@ -330,4 +326,4 @@ ccui.ImageView.create = function (imageFileName, texType) {
  * @constant
  * @type {number}
  */
-ccui.ImageView.RENDERER_ZORDER = -1;
+ccui.ImageView.RENDERER_ZORDER = -1;