Repository: flex-sdk Updated Branches: refs/heads/develop b709fd13a -> a722cf981
FLEX-34854 Minor edits while checking a mustella failure. Project: http://git-wip-us.apache.org/repos/asf/flex-sdk/repo Commit: http://git-wip-us.apache.org/repos/asf/flex-sdk/commit/33c0a067 Tree: http://git-wip-us.apache.org/repos/asf/flex-sdk/tree/33c0a067 Diff: http://git-wip-us.apache.org/repos/asf/flex-sdk/diff/33c0a067 Branch: refs/heads/develop Commit: 33c0a067ada244eb5f867037a2d920e4f85895e9 Parents: b709fd1 Author: Mihai Chira <[email protected]> Authored: Thu Jul 16 22:23:14 2015 +0200 Committer: Mihai Chira <[email protected]> Committed: Thu Jul 16 22:23:14 2015 +0200 ---------------------------------------------------------------------- .../framework/src/mx/collections/Sort.as | 9 +++-- .../Japanese/tests/runtimeErrorTests.mxml | 37 +++++++++++--------- 2 files changed, 25 insertions(+), 21 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/33c0a067/frameworks/projects/framework/src/mx/collections/Sort.as ---------------------------------------------------------------------- diff --git a/frameworks/projects/framework/src/mx/collections/Sort.as b/frameworks/projects/framework/src/mx/collections/Sort.as index 6348691..2859f48 100644 --- a/frameworks/projects/framework/src/mx/collections/Sort.as +++ b/frameworks/projects/framework/src/mx/collections/Sort.as @@ -264,8 +264,8 @@ public class Sort extends EventDispatcher implements ISort */ public function set compareFunction(value:Function):void { - _compareFunction = value; - usingCustomCompareFunction = _compareFunction != null; + _compareFunction = value; + usingCustomCompareFunction = _compareFunction != null; } //---------------------------------- @@ -402,8 +402,7 @@ public class Sort extends EventDispatcher implements ISort { fieldsForCompare = []; //build up the fields we can compare, if we skip a field in the - //middle throw an error. it is ok to not have all the fields - //though + //middle throw an error. It is ok to not have all the fields though var field:ISortField; var hadPreviousFieldName:Boolean = true; for (var i:int = 0; i < fields.length; i++) @@ -431,7 +430,7 @@ public class Sort extends EventDispatcher implements ISort } else { - //this is ok because sometimes a sortfield might + //this is ok because sometimes a SortField might //have a custom comparator fieldsForCompare.push(null); } http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/33c0a067/mustella/tests/LangPacks/Japanese/tests/runtimeErrorTests.mxml ---------------------------------------------------------------------- diff --git a/mustella/tests/LangPacks/Japanese/tests/runtimeErrorTests.mxml b/mustella/tests/LangPacks/Japanese/tests/runtimeErrorTests.mxml index a168bf8..cde5798 100644 --- a/mustella/tests/LangPacks/Japanese/tests/runtimeErrorTests.mxml +++ b/mustella/tests/LangPacks/Japanese/tests/runtimeErrorTests.mxml @@ -59,7 +59,7 @@ private function triggerMissingCardNumberRTE():void{ var ccv:CreditCardValidator = new CreditCardValidator(); - var obj:Object = new Object(); + var obj:Object = {}; obj.cardType=CreditCardValidatorCardType.MASTER_CARD; obj.cardNumber=null; CreditCardValidator.validateCreditCard(ccv, obj, ""); @@ -145,40 +145,45 @@ s.findItem(null, null, null); } - private function cmpFn(o1:Object, o2:Object):void{ + private function cmpFn(o1:Object, o2:Object):void + { } private function triggerFindConditionRTE():void{ - var a:Array = new Array(); - var s:Sort = new Sort(); - a.push("a"); + var a:Array = []; + a.push("a"); + + var s:Sort = new Sort(); s.compareFunction = cmpFn; - var sfArray:Array = new Array(); + + var sfArray:Array = []; sfArray.push(new SortField("0")); sfArray.push(new SortField("field1")); - var o:Object = new Object(); + + var o:Object = {}; o["0"] = undefined; o["field1"] = 2; + s.fields = sfArray; s.findItem(a, o, null); } private function triggerFindRestrictionRTE():void{ - var a:Array = new Array(); + var a:Array = []; var s:Sort = new Sort(); a.push("a"); s.compareFunction = cmpFn; - var sfArray:Array = new Array(); + var sfArray:Array = []; sfArray.push(new SortField("0")); - var o:Object = new Object(); + var o:Object = {}; o["0"] = undefined; s.fields = sfArray; s.findItem(a, o, null); } private function triggerUnknownModeRTE():void{ - var a:Array = new Array(); + var a:Array = []; var s:Sort = new Sort(); a.push(new Object()); s.compareFunction = cmpFn; @@ -186,11 +191,11 @@ } private function triggerNonUniqueRTE():void{ - var a:Array = new Array(); + var a:Array = []; var s:Sort = new Sort(); a.push("a"); a.push("b"); - var sfArray:Array = new Array(); + var sfArray:Array = []; sfArray.push(new SortField("0")); s.fields = sfArray; s.unique = true; @@ -198,13 +203,13 @@ } private function triggerNoComparatorSortFieldRTE():void{ - var a:Array = new Array(); + var a:Array = []; var s:Sort = new Sort(); var o2:Object = new Object(); o2["0"] = new Bitmap(); a.push(null); a.push(o2); - var sfArray:Array = new Array(); + var sfArray:Array = []; sfArray.push(new SortField("0")); sfArray.push(new SortField("1")); s.fields = sfArray; @@ -214,7 +219,7 @@ private function triggerInvalidTypeRTE():void{ var x:XMLListAdapter = new XMLListAdapter(); - x.addItemAt(new Object(), 0); + x.addItemAt({}, 0); } private function triggerColumnNotFoundRTE():void{
