Merge pull request cocos2d#3164 from pandamicro/develop

pandamicro · pandamicro · commit c0242a98fb49 · 2015-10-30T17:28:38.000+08:00
Fix API inconsistency in Scale9Sprite
diff --git a/extensions/ccui/base-classes/UIScale9Sprite.js b/extensions/ccui/base-classes/UIScale9Sprite.js
@@ -946,6 +946,8 @@ ccui.Scale9Sprite = cc.Scale9Sprite = cc.Node.extend(/** @lends ccui.Scale9Sprit
         }
         this.updateWithSprite(sprite, spriteFrame.getRect(),spriteFrame.isRotated(),spriteFrame.getOffset(),spriteFrame.getOriginalSize(),capInsets);
         // Reset insets
+        if (!capInsets)
+            capInsets = cc.rect();
         this._insetLeft = capInsets.x;
         this._insetTop = capInsets.y;
         this._insetRight = this._originalSize.width - this._insetLeft - capInsets.width;

Original file line number	Diff line number	Diff line change
`@@ -946,6 +946,8 @@ ccui.Scale9Sprite = cc.Scale9Sprite = cc.Node.extend(/** @lends ccui.Scale9Sprit`
`946`	`946`	`}`
`947`	`947`	`this.updateWithSprite(sprite, spriteFrame.getRect(),spriteFrame.isRotated(),spriteFrame.getOffset(),spriteFrame.getOriginalSize(),capInsets);`
`948`	`948`	`// Reset insets`
	`949`	`+ if (!capInsets)`
	`950`	`+ capInsets = cc.rect();`
`949`	`951`	`this._insetLeft = capInsets.x;`
`950`	`952`	`this._insetTop = capInsets.y;`
`951`	`953`	`this._insetRight = this._originalSize.width - this._insetLeft - capInsets.width;`