Refactor #3985: arguments length check replaced by undefined check in extension

pandamicro · pandamicro · commit a851c874ea07 · 2014-02-10T23:43:39.000+08:00
diff --git a/extensions/CocoStudio/Armature/display/CCDisplayManager.js b/extensions/CocoStudio/Armature/display/CCDisplayManager.js
@@ -252,14 +252,14 @@ ccs.DisplayManager = ccs.Class.extend({
         }
     },
 
-    containPoint:function (/*point|x,y*/) {
+    containPoint: function (point, y) {
         var p = cc.p(0, 0);
-        if (arguments.length == 1) {
-            p.x = arguments[0].x;
-            p.y = arguments[0].y;
-        } else if (arguments.length == 2) {
-            p.x = arguments[0];
-            p.y = arguments[1];
+        if (y === undefined) {
+            p.x = point.x;
+            p.y = point.y;
+        } else {
+            p.x = point;
+            p.y = y;
         }
         if (!this._visible || this._displayIndex < 0) {
             return false;
diff --git a/extensions/CocoStudio/Armature/utils/CCArmatureDataManager.js b/extensions/CocoStudio/Armature/utils/CCArmatureDataManager.js
@@ -221,8 +221,8 @@ ccs.ArmatureDataManager = ccs.Class.extend(/** @lends ccs.ArmatureDataManager# *
      * //example2
      * ccs.ArmatureDataManager.getInstance().addArmatureFileInfo("res/test.png","res/test.plist","res/test.json");
      */
-    addArmatureFileInfo:function (/*imagePath,plistPath,configFilePath*/) {
-        var imagePath,plistPath,configFilePath;
+    addArmatureFileInfo:function (/*imagePath, plistPath, configFilePath*/) {
+        var imagePath, plistPath, configFilePath;
         var isLoadSpriteFrame = false;
         if (arguments.length == 1) {
             configFilePath = arguments[0];
@@ -246,8 +246,8 @@ ccs.ArmatureDataManager = ccs.Class.extend(/** @lends ccs.ArmatureDataManager# *
      * @param {Object} target
      * @param {Function} configFilePath
      */
-    addArmatureFileInfoAsync:function (/*imagePath, plistPath, configFilePath,target,selector*/) {
-        var imagePath, plistPath, configFilePath,target,selector;
+    addArmatureFileInfoAsync:function (/*imagePath, plistPath, configFilePath, target, selector*/) {
+        var imagePath, plistPath, configFilePath, target, selector;
         var isLoadSpriteFrame = false;
         if (arguments.length == 3) {
             configFilePath = arguments[0];
diff --git a/extensions/CocoStudio/GUI/Layouts/UILayoutDefine.js b/extensions/CocoStudio/GUI/Layouts/UILayoutDefine.js
@@ -75,19 +75,18 @@ ccs.Margin = ccs.Class.extend(/** @lends ccs.Margin# */{
     top: 0,
     right: 0,
     bottom: 0,
-    ctor: function () {
-        if (arguments.length == 1) {
-            var uiMargin = arguments[0];
-            this.left = uiMargin.left;
-            this.top = uiMargin.top;
-            this.right = uiMargin.right;
-            this.bottom = uiMargin.bottom;
+    ctor: function (margin, top, right, bottom) {
+        if (top === undefined) {
+            this.left = margin.left;
+            this.top = margin.top;
+            this.right = margin.right;
+            this.bottom = margin.bottom;
         }
-        if (arguments.length == 4) {
-            this.left = arguments[0];
-            this.top = arguments[1];
-            this.right = arguments[2];
-            this.bottom = arguments[3];
+        if (bottom !== undefined) {
+            this.left = margin;
+            this.top = top;
+            this.right = right;
+            this.bottom = bottom;
         }
     },
     /**
diff --git a/extensions/CocoStudio/GUI/UIWidgets/UIButton.js b/extensions/CocoStudio/GUI/UIWidgets/UIButton.js
@@ -485,19 +485,18 @@ ccs.Button = ccs.Widget.extend(/** @lends ccs.Button# */{
      * @param {Number} [y] The anchor point.y of UIButton.
      */
     setAnchorPoint: function (point, y) {
-        if(arguments.length === 2){
-            ccs.Widget.prototype.setAnchorPoint.call(this,point, y);
-            this._buttonNormalRenderer.setAnchorPoint(point, y);
-            this._buttonClickedRenderer.setAnchorPoint(point, y);
-            this._buttonDisableRenderer.setAnchorPoint(point, y);
-            this._titleRenderer.setPosition(this._size.width * (0.5 - this._anchorPoint._x), this._size.height * (0.5 - this._anchorPoint._y));
+        if(y === undefined){
+	        ccs.Widget.prototype.setAnchorPoint.call(this, point);
+	        this._buttonNormalRenderer.setAnchorPoint(point);
+	        this._buttonClickedRenderer.setAnchorPoint(point);
+	        this._buttonDisableRenderer.setAnchorPoint(point);
         } else {
-            ccs.Widget.prototype.setAnchorPoint.call(this,point);
-            this._buttonNormalRenderer.setAnchorPoint(point);
-            this._buttonClickedRenderer.setAnchorPoint(point);
-            this._buttonDisableRenderer.setAnchorPoint(point);
-            this._titleRenderer.setPosition(this._size.width * (0.5 - this._anchorPoint._x), this._size.height * (0.5 - this._anchorPoint._y));
+	        ccs.Widget.prototype.setAnchorPoint.call(this, point, y);
+	        this._buttonNormalRenderer.setAnchorPoint(point, y);
+	        this._buttonClickedRenderer.setAnchorPoint(point, y);
+	        this._buttonDisableRenderer.setAnchorPoint(point, y);
         }
+	    this._titleRenderer.setPosition(this._size.width * (0.5 - this._anchorPoint._x), this._size.height * (0.5 - this._anchorPoint._y));
     },
 
     onSizeChanged: function () {
diff --git a/extensions/CocoStudio/GUI/UIWidgets/UICheckBox.js b/extensions/CocoStudio/GUI/UIWidgets/UICheckBox.js
@@ -389,20 +389,20 @@ ccs.CheckBox = ccs.Widget.extend(/** @lends ccs.CheckBox# */{
      * @param {Number} [y] The anchor point.y of UICheckBox.
      */
     setAnchorPoint: function (point, y) {
-        if(arguments.length === 2){
-            ccs.Widget.prototype.setAnchorPoint.call(this, point, y);
-            this._backGroundBoxRenderer.setAnchorPoint(point, y);
-            this._backGroundSelectedBoxRenderer.setAnchorPoint(point, y);
-            this._backGroundBoxDisabledRenderer.setAnchorPoint(point, y);
-            this._frontCrossRenderer.setAnchorPoint(point, y);
-            this._frontCrossDisabledRenderer.setAnchorPoint(point, y);
+        if(y === undefined){
+	        ccs.Widget.prototype.setAnchorPoint.call(this, point);
+	        this._backGroundBoxRenderer.setAnchorPoint(point);
+	        this._backGroundSelectedBoxRenderer.setAnchorPoint(point);
+	        this._backGroundBoxDisabledRenderer.setAnchorPoint(point);
+	        this._frontCrossRenderer.setAnchorPoint(point);
+	        this._frontCrossDisabledRenderer.setAnchorPoint(point);
         }else{
-            ccs.Widget.prototype.setAnchorPoint.call(this, point);
-            this._backGroundBoxRenderer.setAnchorPoint(point);
-            this._backGroundSelectedBoxRenderer.setAnchorPoint(point);
-            this._backGroundBoxDisabledRenderer.setAnchorPoint(point);
-            this._frontCrossRenderer.setAnchorPoint(point);
-            this._frontCrossDisabledRenderer.setAnchorPoint(point);
+	        ccs.Widget.prototype.setAnchorPoint.call(this, point, y);
+	        this._backGroundBoxRenderer.setAnchorPoint(point, y);
+	        this._backGroundSelectedBoxRenderer.setAnchorPoint(point, y);
+	        this._backGroundBoxDisabledRenderer.setAnchorPoint(point, y);
+	        this._frontCrossRenderer.setAnchorPoint(point, y);
+	        this._frontCrossDisabledRenderer.setAnchorPoint(point, y);
         }
     },
 
diff --git a/extensions/CocoStudio/GUI/UIWidgets/UIImageView.js b/extensions/CocoStudio/GUI/UIWidgets/UIImageView.js
@@ -216,12 +216,12 @@ ccs.ImageView = ccs.Widget.extend(/** @lends ccs.ImageView# */{
      * @param {Number} [y] The anchor point.y of UIImageView.
      */
     setAnchorPoint: function (point, y) {
-        if(arguments.length === 2){
-            ccs.Widget.prototype.setAnchorPoint.call(this, point, y);
-            this._imageRenderer.setAnchorPoint(point, y);
+        if(y === undefined){
+	        ccs.Widget.prototype.setAnchorPoint.call(this, point);
+	        this._imageRenderer.setAnchorPoint(point);
         } else {
-            ccs.Widget.prototype.setAnchorPoint.call(this, point);
-            this._imageRenderer.setAnchorPoint(point);
+	        ccs.Widget.prototype.setAnchorPoint.call(this, point, y);
+	        this._imageRenderer.setAnchorPoint(point, y);
         }
     },
 
diff --git a/extensions/CocoStudio/GUI/UIWidgets/UILabel.js b/extensions/CocoStudio/GUI/UIWidgets/UILabel.js
@@ -263,12 +263,12 @@ ccs.Label = ccs.Widget.extend(/** @lends ccs.Label# */{
      * @param {Number} [y] The anchor point.y of UILabel.
      */
     setAnchorPoint: function (point, y) {
-        if(arguments.length === 2){
-            ccs.Widget.prototype.setAnchorPoint.call(this, point, y);
-            this._labelRenderer.setAnchorPoint(point, y);
+        if(y === undefined){
+	        ccs.Widget.prototype.setAnchorPoint.call(this, point);
+	        this._labelRenderer.setAnchorPoint(point);
         } else {
-            ccs.Widget.prototype.setAnchorPoint.call(this, point);
-            this._labelRenderer.setAnchorPoint(point);
+	        ccs.Widget.prototype.setAnchorPoint.call(this, point, y);
+	        this._labelRenderer.setAnchorPoint(point, y);
         }
     },
 
diff --git a/extensions/CocoStudio/GUI/UIWidgets/UILabelAtlas.js b/extensions/CocoStudio/GUI/UIWidgets/UILabelAtlas.js
@@ -126,12 +126,12 @@ ccs.LabelAtlas = ccs.Widget.extend(/** @lends ccs.LabelAtlas# */{
      * @param {Number} [y] The anchor point.y of UILabelAtlas.
      */
     setAnchorPoint: function (point, y) {
-        if(arguments.length === 2){
-            ccs.Widget.prototype.setAnchorPoint.call(this, point, y);
-            this._labelAtlasRenderer.setAnchorPoint(point, y);
+        if (y === undefined) {
+	        ccs.Widget.prototype.setAnchorPoint.call(this, point);
+	        this._labelAtlasRenderer.setAnchorPoint(point);
         } else {
-            ccs.Widget.prototype.setAnchorPoint.call(this, point);
-            this._labelAtlasRenderer.setAnchorPoint(point);
+	        ccs.Widget.prototype.setAnchorPoint.call(this, point, y);
+	        this._labelAtlasRenderer.setAnchorPoint(point, y);
         }
     },
 
diff --git a/extensions/CocoStudio/GUI/UIWidgets/UILabelBMFont.js b/extensions/CocoStudio/GUI/UIWidgets/UILabelBMFont.js
@@ -92,12 +92,12 @@ ccs.LabelBMFont = ccs.Widget.extend(/** @lends ccs.LabelBMFont# */{
      * @param {Number} [y] The anchor point.y of UILabelBMFont.
      */
     setAnchorPoint: function (point, y) {
-        if(arguments.length === 2){
-            ccs.Widget.prototype.setAnchorPoint.call(this, point, y);
-            this._labelBMFontRenderer.setAnchorPoint(point, y);
+        if(y === undefined){
+	        ccs.Widget.prototype.setAnchorPoint.call(this, point);
+	        this._labelBMFontRenderer.setAnchorPoint(point);
         } else {
-            ccs.Widget.prototype.setAnchorPoint.call(this, point);
-            this._labelBMFontRenderer.setAnchorPoint(point);
+	        ccs.Widget.prototype.setAnchorPoint.call(this, point, y);
+	        this._labelBMFontRenderer.setAnchorPoint(point, y);
         }
     },
 
diff --git a/extensions/CocoStudio/GUI/UIWidgets/UITextField.js b/extensions/CocoStudio/GUI/UIWidgets/UITextField.js
@@ -560,12 +560,12 @@ ccs.TextField = ccs.Widget.extend(/** @lends ccs.TextField# */{
      * @param {Number} [y] The anchor point.y of UILabelBMFont.
      */
     setAnchorPoint: function (point, y) {
-        if(arguments.length === 2){
-            ccs.Widget.prototype.setAnchorPoint.call(this, point, y);
-            this._textFieldRender.setAnchorPoint(point, y);
+        if(y === undefined){
+	        ccs.Widget.prototype.setAnchorPoint.call(this, point);
+	        this._textFieldRender.setAnchorPoint(point);
         } else {
-            ccs.Widget.prototype.setAnchorPoint.call(this, point);
-            this._textFieldRender.setAnchorPoint(point);
+	        ccs.Widget.prototype.setAnchorPoint.call(this, point, y);
+	        this._textFieldRender.setAnchorPoint(point, y);
         }
     },
 
diff --git a/extensions/GUI/CCControlExtension/CCMenuPassive.js b/extensions/GUI/CCControlExtension/CCMenuPassive.js
@@ -369,7 +369,7 @@ cc.MenuPassive = cc.Layer.extend({
 
 /** creates an empty CCMenu */
 cc.MenuPassive.create = function (item) {
-    if (arguments.length == 0) {
+    if (!item) {
         item = null;
     }
 
diff --git a/extensions/GUI/CCControlExtension/CCScale9Sprite.js b/extensions/GUI/CCControlExtension/CCScale9Sprite.js
@@ -350,10 +350,7 @@ cc.Scale9Sprite = cc.NodeRGBA.extend(/** @lends cc.Scale9Sprite# */{
      * @param {Number} [height] The untransformed size's height of the Scale9Sprite.
      */
     setContentSize: function (size, height) {
-        if(arguments.length === 2)
-            cc.Node.prototype.setContentSize.call(this, size, height);
-        else
-            cc.Node.prototype.setContentSize.call(this, size);
+	    cc.Node.prototype.setContentSize.call(this, size, height);
         this._positionsAreDirty = true;
     },
 
@@ -370,7 +367,7 @@ cc.Scale9Sprite = cc.NodeRGBA.extend(/** @lends cc.Scale9Sprite# */{
     },
 
     initWithBatchNode: function (batchNode, rect, rotated, capInsets) {
-        if (arguments.length === 3) {
+        if (capInsets === undefined) {
             capInsets = rotated;
             rotated = false;
         }
diff --git a/extensions/GUI/CCScrollView/CCScrollView.js b/extensions/GUI/CCScrollView/CCScrollView.js
@@ -489,10 +489,10 @@ cc.ScrollView = cc.Layer.extend({
 
     setContentSize: function (size, height) {
         if (this.getContainer() != null) {
-            if(arguments.length === 2)
-                this.getContainer().setContentSize(size, height);
-            else
+            if(height === undefined)
                 this.getContainer().setContentSize(size);
+            else
+                this.getContainer().setContentSize(size, height);
             this.updateInset();
         }
     },
