You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flex.apache.org by ah...@apache.org on 2014/04/25 00:32:06 UTC
[01/10] git commit: [flex-sdk] [refs/heads/release4.12.0] -
FLEX-34228 missing "; " or "; " in wrong place
Repository: flex-sdk
Updated Branches:
refs/heads/release4.12.0 9d586e662 -> 4a1399919
FLEX-34228 missing ";" or ";" in wrong place
Project: http://git-wip-us.apache.org/repos/asf/flex-sdk/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-sdk/commit/4b6c6ac6
Tree: http://git-wip-us.apache.org/repos/asf/flex-sdk/tree/4b6c6ac6
Diff: http://git-wip-us.apache.org/repos/asf/flex-sdk/diff/4b6c6ac6
Branch: refs/heads/release4.12.0
Commit: 4b6c6ac61179d811b94fabb8b68266e80b55d33b
Parents: 6517a4b
Author: Justin Mclean <jm...@apache.org>
Authored: Wed Apr 16 09:39:25 2014 +1000
Committer: Justin Mclean <jm...@apache.org>
Committed: Wed Apr 16 09:39:25 2014 +1000
----------------------------------------------------------------------
frameworks/projects/charts/src/mx/charts/series/PieSeries.as | 2 +-
.../experimental/src/spark/components/DataNavigator.as | 4 ++--
.../projects/experimental/src/spark/containers/Accordion.as | 2 +-
.../projects/experimental/src/spark/skins/AccordionSkin.mxml | 2 +-
.../projects/experimental/src/spark/skins/ColorPickerSkin.mxml | 2 +-
.../experimental/src/spark/skins/DataAccordionSkin.mxml | 2 +-
.../experimental/src/spark/skins/DataNavigatorSkin.mxml | 2 +-
.../projects/experimental/src/spark/skins/MenuBarSkin.mxml | 2 +-
frameworks/projects/experimental/src/spark/skins/MenuSkin.mxml | 2 +-
.../projects/experimental/src/spark/skins/NavigatorSkin.mxml | 2 +-
.../experimental/src/spark/skins/TabNavigatorSkin.mxml | 2 +-
frameworks/projects/framework/src/mx/utils/ObjectUtil.as | 2 +-
frameworks/projects/rpc/src/mx/rpc/http/HTTPMultiService.as | 2 +-
frameworks/projects/rpc/src/mx/rpc/soap/SOAPDecoder.as | 2 +-
.../projects/spark/src/spark/accessibility/DataGridAccImpl.as | 2 +-
frameworks/projects/spark/src/spark/components/Callout.as | 2 +-
frameworks/projects/spark/src/spark/components/Grid.as | 2 +-
.../spark/src/spark/components/supportClasses/ListBase.as | 6 +++---
.../projects/spark/src/spark/layouts/ConstraintLayout.as | 2 +-
.../projects/spark/src/spark/skins/spark/ComboBoxSkin.mxml | 2 +-
.../spark/src/spark/skins/spark/ComboBoxTextInputSkin.mxml | 2 +-
.../projects/spark/src/spark/skins/spark/DataGridSkin.mxml | 2 +-
.../projects/spark/src/spark/skins/spark/DropDownListSkin.mxml | 2 +-
frameworks/projects/spark/src/spark/skins/spark/ListSkin.mxml | 2 +-
.../src/spark/skins/spark/NumericStepperTextInputSkin.mxml | 2 +-
.../projects/spark/src/spark/skins/spark/TextAreaSkin.mxml | 2 +-
.../projects/spark/src/spark/skins/spark/TextInputSkin.mxml | 2 +-
.../projects/sparkskins/src/mx/skins/spark/BorderSkin.mxml | 2 +-
.../sparkskins/src/mx/skins/spark/TextInputBorderSkin.mxml | 2 +-
29 files changed, 32 insertions(+), 32 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/4b6c6ac6/frameworks/projects/charts/src/mx/charts/series/PieSeries.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/charts/src/mx/charts/series/PieSeries.as b/frameworks/projects/charts/src/mx/charts/series/PieSeries.as
index fb64092..97783b1 100644
--- a/frameworks/projects/charts/src/mx/charts/series/PieSeries.as
+++ b/frameworks/projects/charts/src/mx/charts/series/PieSeries.as
@@ -3070,7 +3070,7 @@ public class PieSeries extends Series
// angle = (angle - _startAngleRadians) % (twoMP);
// if (angle < 0)
// angle += twoMP;
- return angle
+ return angle;
}
/**
http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/4b6c6ac6/frameworks/projects/experimental/src/spark/components/DataNavigator.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/experimental/src/spark/components/DataNavigator.as b/frameworks/projects/experimental/src/spark/components/DataNavigator.as
index e88cd88..be8d18e 100644
--- a/frameworks/projects/experimental/src/spark/components/DataNavigator.as
+++ b/frameworks/projects/experimental/src/spark/components/DataNavigator.as
@@ -608,7 +608,7 @@ package spark.components
public function set labelField(value:String):void
{
if (value == _labelField)
- return
+ return;
_labelField = value;
_labelFieldOrFunctionChanged = true;
@@ -657,7 +657,7 @@ package spark.components
public function set labelFunction(value:Function):void
{
if (value == _labelFunction)
- return
+ return;
_labelFunction = value;
_labelFieldOrFunctionChanged = true;
http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/4b6c6ac6/frameworks/projects/experimental/src/spark/containers/Accordion.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/experimental/src/spark/containers/Accordion.as b/frameworks/projects/experimental/src/spark/containers/Accordion.as
index eec61d5..ab92eb5 100644
--- a/frameworks/projects/experimental/src/spark/containers/Accordion.as
+++ b/frameworks/projects/experimental/src/spark/containers/Accordion.as
@@ -449,7 +449,7 @@ package spark.containers
*/
public function set labelField( value:String ):void
{
- if( labelField == value ) return
+ if( labelField == value ) return;
if( buttonBar )
{
http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/4b6c6ac6/frameworks/projects/experimental/src/spark/skins/AccordionSkin.mxml
----------------------------------------------------------------------
diff --git a/frameworks/projects/experimental/src/spark/skins/AccordionSkin.mxml b/frameworks/projects/experimental/src/spark/skins/AccordionSkin.mxml
index f66ef65..9867253 100644
--- a/frameworks/projects/experimental/src/spark/skins/AccordionSkin.mxml
+++ b/frameworks/projects/experimental/src/spark/skins/AccordionSkin.mxml
@@ -60,7 +60,7 @@
/**
* @private
*/
- override public function get contentItems():Array { return contentFill };
+ override public function get contentItems():Array { return contentFill; }
/**
* @private
http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/4b6c6ac6/frameworks/projects/experimental/src/spark/skins/ColorPickerSkin.mxml
----------------------------------------------------------------------
diff --git a/frameworks/projects/experimental/src/spark/skins/ColorPickerSkin.mxml b/frameworks/projects/experimental/src/spark/skins/ColorPickerSkin.mxml
index c4e8544..65a7933 100644
--- a/frameworks/projects/experimental/src/spark/skins/ColorPickerSkin.mxml
+++ b/frameworks/projects/experimental/src/spark/skins/ColorPickerSkin.mxml
@@ -102,7 +102,7 @@
*/
override public function get contentItems():Array
{
- return contentFill
+ return contentFill;
}
/**
* @private
http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/4b6c6ac6/frameworks/projects/experimental/src/spark/skins/DataAccordionSkin.mxml
----------------------------------------------------------------------
diff --git a/frameworks/projects/experimental/src/spark/skins/DataAccordionSkin.mxml b/frameworks/projects/experimental/src/spark/skins/DataAccordionSkin.mxml
index d137ba0..50ed3de 100644
--- a/frameworks/projects/experimental/src/spark/skins/DataAccordionSkin.mxml
+++ b/frameworks/projects/experimental/src/spark/skins/DataAccordionSkin.mxml
@@ -61,7 +61,7 @@
/**
* @private
*/
- override public function get contentItems():Array { return contentFill };
+ override public function get contentItems():Array { return contentFill; }
/**
* @private
http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/4b6c6ac6/frameworks/projects/experimental/src/spark/skins/DataNavigatorSkin.mxml
----------------------------------------------------------------------
diff --git a/frameworks/projects/experimental/src/spark/skins/DataNavigatorSkin.mxml b/frameworks/projects/experimental/src/spark/skins/DataNavigatorSkin.mxml
index 32b911e..584fcae 100644
--- a/frameworks/projects/experimental/src/spark/skins/DataNavigatorSkin.mxml
+++ b/frameworks/projects/experimental/src/spark/skins/DataNavigatorSkin.mxml
@@ -61,7 +61,7 @@
/**
* @private
*/
- override public function get contentItems():Array { return contentFill };
+ override public function get contentItems():Array { return contentFill; }
/**
* @private
http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/4b6c6ac6/frameworks/projects/experimental/src/spark/skins/MenuBarSkin.mxml
----------------------------------------------------------------------
diff --git a/frameworks/projects/experimental/src/spark/skins/MenuBarSkin.mxml b/frameworks/projects/experimental/src/spark/skins/MenuBarSkin.mxml
index abee0da..263a2a3 100644
--- a/frameworks/projects/experimental/src/spark/skins/MenuBarSkin.mxml
+++ b/frameworks/projects/experimental/src/spark/skins/MenuBarSkin.mxml
@@ -81,7 +81,7 @@
/**
* @private
*/
- override public function get contentItems():Array {return contentFill}
+ override public function get contentItems():Array { return contentFill; }
/**
* @private
http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/4b6c6ac6/frameworks/projects/experimental/src/spark/skins/MenuSkin.mxml
----------------------------------------------------------------------
diff --git a/frameworks/projects/experimental/src/spark/skins/MenuSkin.mxml b/frameworks/projects/experimental/src/spark/skins/MenuSkin.mxml
index b3493e9..efd5a0e 100644
--- a/frameworks/projects/experimental/src/spark/skins/MenuSkin.mxml
+++ b/frameworks/projects/experimental/src/spark/skins/MenuSkin.mxml
@@ -81,7 +81,7 @@
/**
* @private
*/
- override public function get contentItems():Array {return contentFill}
+ override public function get contentItems():Array { return contentFill; }
/**
* @private
http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/4b6c6ac6/frameworks/projects/experimental/src/spark/skins/NavigatorSkin.mxml
----------------------------------------------------------------------
diff --git a/frameworks/projects/experimental/src/spark/skins/NavigatorSkin.mxml b/frameworks/projects/experimental/src/spark/skins/NavigatorSkin.mxml
index c297fb6..ad9488d 100644
--- a/frameworks/projects/experimental/src/spark/skins/NavigatorSkin.mxml
+++ b/frameworks/projects/experimental/src/spark/skins/NavigatorSkin.mxml
@@ -52,7 +52,7 @@
/**
* @private
*/
- override public function get contentItems():Array { return contentFill };
+ override public function get contentItems():Array { return contentFill; }
/**
* @private
http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/4b6c6ac6/frameworks/projects/experimental/src/spark/skins/TabNavigatorSkin.mxml
----------------------------------------------------------------------
diff --git a/frameworks/projects/experimental/src/spark/skins/TabNavigatorSkin.mxml b/frameworks/projects/experimental/src/spark/skins/TabNavigatorSkin.mxml
index 34fbb0a..269ca6c 100644
--- a/frameworks/projects/experimental/src/spark/skins/TabNavigatorSkin.mxml
+++ b/frameworks/projects/experimental/src/spark/skins/TabNavigatorSkin.mxml
@@ -52,7 +52,7 @@
/**
* @private
*/
- override public function get contentItems():Array { return contentFill };
+ override public function get contentItems():Array { return contentFill; }
/**
* @private
http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/4b6c6ac6/frameworks/projects/framework/src/mx/utils/ObjectUtil.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/framework/src/mx/utils/ObjectUtil.as b/frameworks/projects/framework/src/mx/utils/ObjectUtil.as
index 742d978..2e79ed9 100644
--- a/frameworks/projects/framework/src/mx/utils/ObjectUtil.as
+++ b/frameworks/projects/framework/src/mx/utils/ObjectUtil.as
@@ -1444,7 +1444,7 @@ public class ObjectUtil
if (oRef != refs[o])
refs[o] = oRef;
- return oRef
+ return oRef;
}
/**
http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/4b6c6ac6/frameworks/projects/rpc/src/mx/rpc/http/HTTPMultiService.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/rpc/src/mx/rpc/http/HTTPMultiService.as b/frameworks/projects/rpc/src/mx/rpc/http/HTTPMultiService.as
index 9744134..7f896da 100644
--- a/frameworks/projects/rpc/src/mx/rpc/http/HTTPMultiService.as
+++ b/frameworks/projects/rpc/src/mx/rpc/http/HTTPMultiService.as
@@ -511,7 +511,7 @@ public dynamic class HTTPMultiService extends AbstractService
var op:AbstractOperation = operations[i];
ol.push(op);
}
- return ol
+ return ol;
}
//--------------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/4b6c6ac6/frameworks/projects/rpc/src/mx/rpc/soap/SOAPDecoder.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/rpc/src/mx/rpc/soap/SOAPDecoder.as b/frameworks/projects/rpc/src/mx/rpc/soap/SOAPDecoder.as
index 75ce40f..0d754f5 100644
--- a/frameworks/projects/rpc/src/mx/rpc/soap/SOAPDecoder.as
+++ b/frameworks/projects/rpc/src/mx/rpc/soap/SOAPDecoder.as
@@ -262,7 +262,7 @@ public class SOAPDecoder extends XMLDecoder implements ISOAPDecoder
}
log.info("Decoded SOAP response into result [{0} millis]", getTimer() - startTime);
- return soapResult
+ return soapResult;
}
protected function decodeEnvelope(responseXML:XML):SOAPResult
http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/4b6c6ac6/frameworks/projects/spark/src/spark/accessibility/DataGridAccImpl.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/spark/src/spark/accessibility/DataGridAccImpl.as b/frameworks/projects/spark/src/spark/accessibility/DataGridAccImpl.as
index 7dd75ae..67de4eb 100644
--- a/frameworks/projects/spark/src/spark/accessibility/DataGridAccImpl.as
+++ b/frameworks/projects/spark/src/spark/accessibility/DataGridAccImpl.as
@@ -1381,7 +1381,7 @@ internal class ItemAccInfo
if (int(childID) <= 0)
return true;
if (!dataGrid.dataProvider || !dataGrid.columns)
- return true
+ return true;
if (childID > maxChildID)
return true;
return false;
http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/4b6c6ac6/frameworks/projects/spark/src/spark/components/Callout.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/spark/src/spark/components/Callout.as b/frameworks/projects/spark/src/spark/components/Callout.as
index 7b0d137..e7574b5 100644
--- a/frameworks/projects/spark/src/spark/components/Callout.as
+++ b/frameworks/projects/spark/src/spark/components/Callout.as
@@ -1555,7 +1555,7 @@ public class Callout extends SkinnablePopUpContainer
direction = ArrowDirection.DOWN;
}
- return direction
+ return direction;
}
/**
http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/4b6c6ac6/frameworks/projects/spark/src/spark/components/Grid.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/spark/src/spark/components/Grid.as b/frameworks/projects/spark/src/spark/components/Grid.as
index 329274a..ce87b44 100644
--- a/frameworks/projects/spark/src/spark/components/Grid.as
+++ b/frameworks/projects/spark/src/spark/components/Grid.as
@@ -776,7 +776,7 @@ public class Grid extends Group implements IDataGridElement, IDataProviderEnhanc
}
else
{
- return false
+ return false;
}
}
http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/4b6c6ac6/frameworks/projects/spark/src/spark/components/supportClasses/ListBase.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/spark/src/spark/components/supportClasses/ListBase.as b/frameworks/projects/spark/src/spark/components/supportClasses/ListBase.as
index 13a3785..a03a30a 100644
--- a/frameworks/projects/spark/src/spark/components/supportClasses/ListBase.as
+++ b/frameworks/projects/spark/src/spark/components/supportClasses/ListBase.as
@@ -488,7 +488,7 @@ public class ListBase extends SkinnableDataContainer implements IDataProviderEnh
}
else
{
- return false
+ return false;
}
}
@@ -568,7 +568,7 @@ public class ListBase extends SkinnableDataContainer implements IDataProviderEnh
public function set labelField(value:String):void
{
if (value == _labelField)
- return
+ return;
_labelField = value;
labelFieldOrFunctionChanged = true;
@@ -619,7 +619,7 @@ public class ListBase extends SkinnableDataContainer implements IDataProviderEnh
public function set labelFunction(value:Function):void
{
if (value == _labelFunction)
- return
+ return;
_labelFunction = value;
labelFieldOrFunctionChanged = true;
http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/4b6c6ac6/frameworks/projects/spark/src/spark/layouts/ConstraintLayout.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/spark/src/spark/layouts/ConstraintLayout.as b/frameworks/projects/spark/src/spark/layouts/ConstraintLayout.as
index 60ef4cd..64db42d 100644
--- a/frameworks/projects/spark/src/spark/layouts/ConstraintLayout.as
+++ b/frameworks/projects/spark/src/spark/layouts/ConstraintLayout.as
@@ -591,7 +591,7 @@ public class ConstraintLayout extends LayoutBase
*/
override mx_internal function get virtualLayoutSupported():Boolean
{
- return false
+ return false;
}
/**
http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/4b6c6ac6/frameworks/projects/spark/src/spark/skins/spark/ComboBoxSkin.mxml
----------------------------------------------------------------------
diff --git a/frameworks/projects/spark/src/spark/skins/spark/ComboBoxSkin.mxml b/frameworks/projects/spark/src/spark/skins/spark/ComboBoxSkin.mxml
index 86b6aad..5760e2f 100644
--- a/frameworks/projects/spark/src/spark/skins/spark/ComboBoxSkin.mxml
+++ b/frameworks/projects/spark/src/spark/skins/spark/ComboBoxSkin.mxml
@@ -55,7 +55,7 @@ is defined by the ComboBoxTextInputSkin class.
/**
* @private
*/
- override public function get contentItems():Array {return contentFill};
+ override public function get contentItems():Array {return contentFill; }
/**
* @private
http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/4b6c6ac6/frameworks/projects/spark/src/spark/skins/spark/ComboBoxTextInputSkin.mxml
----------------------------------------------------------------------
diff --git a/frameworks/projects/spark/src/spark/skins/spark/ComboBoxTextInputSkin.mxml b/frameworks/projects/spark/src/spark/skins/spark/ComboBoxTextInputSkin.mxml
index e5ef6eb..ce853ed 100644
--- a/frameworks/projects/spark/src/spark/skins/spark/ComboBoxTextInputSkin.mxml
+++ b/frameworks/projects/spark/src/spark/skins/spark/ComboBoxTextInputSkin.mxml
@@ -57,7 +57,7 @@
/**
* @private
*/
- override public function get contentItems():Array {return contentFill};
+ override public function get contentItems():Array {return contentFill; }
/**
* @private
http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/4b6c6ac6/frameworks/projects/spark/src/spark/skins/spark/DataGridSkin.mxml
----------------------------------------------------------------------
diff --git a/frameworks/projects/spark/src/spark/skins/spark/DataGridSkin.mxml b/frameworks/projects/spark/src/spark/skins/spark/DataGridSkin.mxml
index 4b7784d..cf77c62 100644
--- a/frameworks/projects/spark/src/spark/skins/spark/DataGridSkin.mxml
+++ b/frameworks/projects/spark/src/spark/skins/spark/DataGridSkin.mxml
@@ -299,7 +299,7 @@ declarations define DataGrid skin parts except <code>headerColumnSeparator</code
/**
* @private
*/
- override public function get contentItems():Array {return contentFill};
+ override public function get contentItems():Array { return contentFill; }
/**
* @private
http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/4b6c6ac6/frameworks/projects/spark/src/spark/skins/spark/DropDownListSkin.mxml
----------------------------------------------------------------------
diff --git a/frameworks/projects/spark/src/spark/skins/spark/DropDownListSkin.mxml b/frameworks/projects/spark/src/spark/skins/spark/DropDownListSkin.mxml
index f894789..4c29ac0 100644
--- a/frameworks/projects/spark/src/spark/skins/spark/DropDownListSkin.mxml
+++ b/frameworks/projects/spark/src/spark/skins/spark/DropDownListSkin.mxml
@@ -55,7 +55,7 @@
/**
* @private
*/
- override public function get contentItems():Array {return contentFill};
+ override public function get contentItems():Array { return contentFill; }
/**
* @private
*/
http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/4b6c6ac6/frameworks/projects/spark/src/spark/skins/spark/ListSkin.mxml
----------------------------------------------------------------------
diff --git a/frameworks/projects/spark/src/spark/skins/spark/ListSkin.mxml b/frameworks/projects/spark/src/spark/skins/spark/ListSkin.mxml
index a6ff3f4..86dd46d 100644
--- a/frameworks/projects/spark/src/spark/skins/spark/ListSkin.mxml
+++ b/frameworks/projects/spark/src/spark/skins/spark/ListSkin.mxml
@@ -74,7 +74,7 @@
/**
* @private
*/
- override public function get contentItems():Array {return contentFill};
+ override public function get contentItems():Array { return contentFill; }
/**
* @private
http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/4b6c6ac6/frameworks/projects/spark/src/spark/skins/spark/NumericStepperTextInputSkin.mxml
----------------------------------------------------------------------
diff --git a/frameworks/projects/spark/src/spark/skins/spark/NumericStepperTextInputSkin.mxml b/frameworks/projects/spark/src/spark/skins/spark/NumericStepperTextInputSkin.mxml
index d608c8d..837e9eb 100644
--- a/frameworks/projects/spark/src/spark/skins/spark/NumericStepperTextInputSkin.mxml
+++ b/frameworks/projects/spark/src/spark/skins/spark/NumericStepperTextInputSkin.mxml
@@ -70,7 +70,7 @@
/**
* @private
*/
- override public function get contentItems():Array {return contentFill};
+ override public function get contentItems():Array { return contentFill; }
/**
* @private
http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/4b6c6ac6/frameworks/projects/spark/src/spark/skins/spark/TextAreaSkin.mxml
----------------------------------------------------------------------
diff --git a/frameworks/projects/spark/src/spark/skins/spark/TextAreaSkin.mxml b/frameworks/projects/spark/src/spark/skins/spark/TextAreaSkin.mxml
index 326216b..76a4f60 100644
--- a/frameworks/projects/spark/src/spark/skins/spark/TextAreaSkin.mxml
+++ b/frameworks/projects/spark/src/spark/skins/spark/TextAreaSkin.mxml
@@ -79,7 +79,7 @@
/**
* @private
*/
- override public function get contentItems():Array {return contentFill};
+ override public function get contentItems():Array { return contentFill; }
/**
* @private
http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/4b6c6ac6/frameworks/projects/spark/src/spark/skins/spark/TextInputSkin.mxml
----------------------------------------------------------------------
diff --git a/frameworks/projects/spark/src/spark/skins/spark/TextInputSkin.mxml b/frameworks/projects/spark/src/spark/skins/spark/TextInputSkin.mxml
index 9fe7e82..5997534 100644
--- a/frameworks/projects/spark/src/spark/skins/spark/TextInputSkin.mxml
+++ b/frameworks/projects/spark/src/spark/skins/spark/TextInputSkin.mxml
@@ -73,7 +73,7 @@
/**
* @private
*/
- override public function get contentItems():Array {return contentFill};
+ override public function get contentItems():Array { return contentFill; }
/**
* @private
http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/4b6c6ac6/frameworks/projects/sparkskins/src/mx/skins/spark/BorderSkin.mxml
----------------------------------------------------------------------
diff --git a/frameworks/projects/sparkskins/src/mx/skins/spark/BorderSkin.mxml b/frameworks/projects/sparkskins/src/mx/skins/spark/BorderSkin.mxml
index 8c6371d..a340e41 100644
--- a/frameworks/projects/sparkskins/src/mx/skins/spark/BorderSkin.mxml
+++ b/frameworks/projects/sparkskins/src/mx/skins/spark/BorderSkin.mxml
@@ -47,7 +47,7 @@
/**
* @private
*/
- override public function get contentItems():Array {return contentFill};
+ override public function get contentItems():Array { return contentFill; }
/* Define the border item. */
static private const borderItem:Array = ["borderStroke"];
http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/4b6c6ac6/frameworks/projects/sparkskins/src/mx/skins/spark/TextInputBorderSkin.mxml
----------------------------------------------------------------------
diff --git a/frameworks/projects/sparkskins/src/mx/skins/spark/TextInputBorderSkin.mxml b/frameworks/projects/sparkskins/src/mx/skins/spark/TextInputBorderSkin.mxml
index 2d2669a..2e95718 100644
--- a/frameworks/projects/sparkskins/src/mx/skins/spark/TextInputBorderSkin.mxml
+++ b/frameworks/projects/sparkskins/src/mx/skins/spark/TextInputBorderSkin.mxml
@@ -47,7 +47,7 @@
/**
* @private
*/
- override public function get contentItems():Array {return contentFill};
+ override public function get contentItems():Array { return contentFill; }
/* Define the border items.*/
static private const borderItem:Array = ["borderStroke"];
[09/10] git commit: [flex-sdk] [refs/heads/release4.12.0] - Try to
get FlexUnit CI build to call SDK 'downloads.xml' with 'build.noprompt=true'
so it won't get stuck on the BlazeDS download...
Posted by ah...@apache.org.
Try to get FlexUnit CI build to call SDK 'downloads.xml' with 'build.noprompt=true' so it won't get stuck on the BlazeDS download...
Signed-off-by: Erik de Bruin <er...@ixsoftware.nl>
Project: http://git-wip-us.apache.org/repos/asf/flex-sdk/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-sdk/commit/920ee214
Tree: http://git-wip-us.apache.org/repos/asf/flex-sdk/tree/920ee214
Diff: http://git-wip-us.apache.org/repos/asf/flex-sdk/diff/920ee214
Branch: refs/heads/release4.12.0
Commit: 920ee2149cb44657330d8072e00b6b404e83f315
Parents: 7389eb0
Author: Erik de Bruin <er...@ixsoftware.nl>
Authored: Thu Apr 24 12:35:50 2014 +0200
Committer: Erik de Bruin <er...@ixsoftware.nl>
Committed: Thu Apr 24 12:35:50 2014 +0200
----------------------------------------------------------------------
ide/flashbuilder/makeApacheFlexForIDE.bat | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/920ee214/ide/flashbuilder/makeApacheFlexForIDE.bat
----------------------------------------------------------------------
diff --git a/ide/flashbuilder/makeApacheFlexForIDE.bat b/ide/flashbuilder/makeApacheFlexForIDE.bat
index 7e51799..05a115b 100755
--- a/ide/flashbuilder/makeApacheFlexForIDE.bat
+++ b/ide/flashbuilder/makeApacheFlexForIDE.bat
@@ -102,7 +102,9 @@ if not exist "%tempDir%" mkdir "%tempDir%"
REM
REM the third-party downloads, including the optional components
REM
-call ant -f "%FLEX_HOME%/frameworks/downloads.xml"
+REM (note: the %2 argument is to allow for '-Dbuild.noprompt=true' when building FlexUnit on CI.
+REM
+call ant -f "%FLEX_HOME%/frameworks/downloads.xml" %2
REM
REM Download AIR Runtime Kit for Windows
[08/10] git commit: [flex-sdk] [refs/heads/release4.12.0] - Removed
commented trace
Posted by ah...@apache.org.
Removed commented trace
Project: http://git-wip-us.apache.org/repos/asf/flex-sdk/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-sdk/commit/7389eb08
Tree: http://git-wip-us.apache.org/repos/asf/flex-sdk/tree/7389eb08
Diff: http://git-wip-us.apache.org/repos/asf/flex-sdk/diff/7389eb08
Branch: refs/heads/release4.12.0
Commit: 7389eb08866614676d728b7575f20f21909bab0c
Parents: 36cece0
Author: mamsellem <ma...@systar.com>
Authored: Thu Apr 24 01:24:49 2014 +0200
Committer: mamsellem <ma...@systar.com>
Committed: Thu Apr 24 01:24:49 2014 +0200
----------------------------------------------------------------------
frameworks/projects/framework/src/mx/utils/MediaQueryParser.as | 1 -
1 file changed, 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/7389eb08/frameworks/projects/framework/src/mx/utils/MediaQueryParser.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/framework/src/mx/utils/MediaQueryParser.as b/frameworks/projects/framework/src/mx/utils/MediaQueryParser.as
index 4d8224a..6fee0b0 100644
--- a/frameworks/projects/framework/src/mx/utils/MediaQueryParser.as
+++ b/frameworks/projects/framework/src/mx/utils/MediaQueryParser.as
@@ -551,7 +551,6 @@ public class MediaQueryParser extends EventDispatcher
deviceWidth = new CSSDimension(w, deviceDPI);
deviceHeight = new CSSDimension(h, deviceDPI);
flexDeviceDiagonal = new CSSDimension( diag, deviceDPI );
- // trace(" width:", deviceWidth, " height: ", deviceHeight, " diag:", flexDeviceDiagonal);
return needToUpdateStyles;
}
[07/10] git commit: [flex-sdk] [refs/heads/release4.12.0] - FIXED -
FLEX-34230 StageText skins prevents garbage collection of component with
TextInputs and TextAreas now, ScrollableStageText does not prevent GC anymore
Posted by ah...@apache.org.
FIXED - FLEX-34230 StageText skins prevents garbage collection of component with TextInputs and TextAreas
now, ScrollableStageText does not prevent GC anymore
Project: http://git-wip-us.apache.org/repos/asf/flex-sdk/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-sdk/commit/36cece0d
Tree: http://git-wip-us.apache.org/repos/asf/flex-sdk/tree/36cece0d
Diff: http://git-wip-us.apache.org/repos/asf/flex-sdk/diff/36cece0d
Branch: refs/heads/release4.12.0
Commit: 36cece0de258b0ecacc43e0083a57ac7ec9e63ad
Parents: 8150c26
Author: mamsellem <ma...@systar.com>
Authored: Thu Apr 24 00:54:10 2014 +0200
Committer: mamsellem <ma...@systar.com>
Committed: Thu Apr 24 01:07:04 2014 +0200
----------------------------------------------------------------------
.../supportClasses/ScrollableStageText.as | 162 ++++++++-----------
1 file changed, 63 insertions(+), 99 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/36cece0d/frameworks/projects/mobilecomponents/src/spark/components/supportClasses/ScrollableStageText.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/mobilecomponents/src/spark/components/supportClasses/ScrollableStageText.as b/frameworks/projects/mobilecomponents/src/spark/components/supportClasses/ScrollableStageText.as
index da971cc..200265e 100644
--- a/frameworks/projects/mobilecomponents/src/spark/components/supportClasses/ScrollableStageText.as
+++ b/frameworks/projects/mobilecomponents/src/spark/components/supportClasses/ScrollableStageText.as
@@ -367,7 +367,7 @@ public class ScrollableStageText extends UIComponent implements IStyleableEdita
super();
_multiline = multiline;
- stageText = StageTextPool.current.acquireStageText(this);
+ stageText = StageTextPool.current.acquireStageText(multiline);
stageText.visible = false;
if (!defaultStyles)
@@ -453,6 +453,11 @@ public class ScrollableStageText extends UIComponent implements IStyleableEdita
*/
protected var stageText:StageText;
+ /** @private
+ * last instance of stage text to be reused if added again to stage
+ */
+ protected var savedStageText: StageText = null;
+
/**
* Flag indicating one or more styles have changed. If invalidateStyleFlag
* is false, commitStyles is a no-op, so it is safe to call commitStyles
@@ -1717,8 +1722,10 @@ public class ScrollableStageText extends UIComponent implements IStyleableEdita
var needsRestore:Boolean = false;
if (stageText == null)
{
- needsRestore = !StageTextPool.current.hasCachedStageText(this);
- stageText = StageTextPool.current.acquireStageText(this);
+ stageText = StageTextPool.current.acquireStageText(multiline, savedStageText);
+ if (stageText !== savedStageText)
+ needsRestore = true ; // returned a different stageText, so needs to restore its properties
+ savedStageText = null; // clear savedStageText
stageText.visible = false;
}
@@ -1788,7 +1795,8 @@ public class ScrollableStageText extends UIComponent implements IStyleableEdita
stageText.removeEventListener(KeyboardEvent.KEY_DOWN, stageText_keyDownHandler);
stageText.removeEventListener(KeyboardEvent.KEY_UP, stageText_keyUpHandler);
- StageTextPool.current.releaseStageText(this, stageText);
+ StageTextPool.current.releaseStageText(stageText, multiline);
+ savedStageText = stageText; // save for potential recycling
stageText = null;
if (proxy != null)
@@ -1999,11 +2007,22 @@ public class ScrollableStageText extends UIComponent implements IStyleableEdita
import flash.events.TimerEvent;
import flash.text.StageText;
-import flash.utils.Dictionary;
-import flash.utils.Timer;
import flash.text.StageTextInitOptions;
-import spark.components.supportClasses.ScrollableStageText;
+import flash.utils.Timer;
+/** @private
+ * StageTextPool maintains a pool a StageText to avoid allocating a new StageText each time a TextInput is added to stage.
+ *
+ * StageText are removed from the pool when a TextInput is added to the stage and added back when it removed from stage.
+ * If this causes the pool to grow
+ * larger than its reserve size, this starts a timer to check and reduce
+ * the size of the pool poolTimerInterval milliseconds later.
+ * StageText are disposed before being purged from the pool.
+ *
+ * Not that SST keeps a reference to its last used StageText in savedStageText property, when it's removed from stage.
+ * If the SST is added back to stage, it can reuse its saved StageText if it's also still in the pool (which means it has not been disposed, or used by anoter SST).
+ *
+ */
class StageTextPool
{
//--------------------------------------------------------------------------
@@ -2030,11 +2049,11 @@ class StageTextPool
return _current;
}
- //--------------------------------------------------------------------------
- //
- // Constructor
- //
- //--------------------------------------------------------------------------
+ //--------------------------------------------------------------------------
+ //
+ // Constructor
+ //
+ //--------------------------------------------------------------------------
/**
* @private
@@ -2048,8 +2067,6 @@ class StageTextPool
//
//--------------------------------------------------------------------------
- private var map_StyleableStageText_to_StageText:Dictionary = new Dictionary(true);
- private var map_StageText_to_StyleableStageText:Dictionary = new Dictionary(true);
private var multilinePool:Vector.<StageText> = new Vector.<StageText>();
private var multilinePoolTimer:Timer;
@@ -2066,32 +2083,34 @@ class StageTextPool
//--------------------------------------------------------------------------
/**
- * Acquires a StageText and removes it from the pool. If the host
- * StyleableStageText2 has recently released a StageText and that StageText
- * is still in the pool, that StageText will be returned.
+ * Acquires a StageText and removes it from the pool.
+ * if savedStageText is not null, will use it only if it is still in the pool (which means not disposed, and not used by someone else)
+ * if savedStageText is null => always create a new instance.
*/
- public function acquireStageText(host:ScrollableStageText):StageText
+ public function acquireStageText(multiline: Boolean, savedStageText: StageText = null):StageText
{
- var result:StageText = map_StyleableStageText_to_StageText[host];
+ var result: StageText = null;
+ var pool: Vector.<StageText> = multiline ? multilinePool : singleLinePool;
- if (!result)
+ if (savedStageText != null)
{
- if (host.multiline)
+ // reuse it if still in the pool.
+ var index: int;
+ index = pool.indexOf(savedStageText);
+ if (index >= 0)
{
- if (multilinePool.length == 0)
- while (multilinePool.length < poolReserve)
- multilinePool.push(new StageText(new StageTextInitOptions(true)));
-
- result = multilinePool.pop();
+ result = savedStageText;
+ pool.splice(index, 1);
}
- else
- {
- if (singleLinePool.length == 0)
- while (singleLinePool.length < poolReserve)
- singleLinePool.push(new StageText(new StageTextInitOptions(false)));
+ }
- result = singleLinePool.pop();
- }
+ // not found or savedStageText was null, always create new
+ if (result == null)
+ {
+ if (pool.length == 0)
+ while (pool.length < poolReserve)
+ pool.push(new StageText(new StageTextInitOptions(multiline)));
+ result = pool.pop();
// The first time a StageText is acquired, it's guaranteed to have been
// newly-created. Take that opportunity to stash away the StageText's
@@ -2132,50 +2151,20 @@ class StageTextPool
result[prop] = cleanProperties[prop];
}
}
- else
- {
- var index:int;
-
- if (host.multiline)
- {
- index = multilinePool.indexOf(result);
- multilinePool.splice(index, 1);
- }
- else
- {
- index = singleLinePool.indexOf(result);
- singleLinePool.splice(index, 1);
- }
- }
-
- uncacheStageText(result);
-
return result;
}
- /**
- * Returns true if the StageText that would be returned by acquireStageText
- * for the given StyleableStageText2 will be the same as the last StageText
- * it released.
- */
- public function hasCachedStageText(host:ScrollableStageText):Boolean
- {
- return map_StyleableStageText_to_StageText[host] !== undefined;
- }
/**
- * Puts a StageText back into the pool and caches the StyleableStageText2/
- * StageText pair so the same StageText may be returned if the
- * StyleableStageText2 re-acquires it. If this causes the pool to grow
+ * Puts a StageText back into the pool when SST is removed from stage.
+ * (note: the StageText has also been saved in the SST)
+ * If this causes the pool to grow
* larger than its reserve size, this starts a timer to check and reduce
* the size of the pool poolTimerInterval milliseconds later.
*/
- public function releaseStageText(host:ScrollableStageText, stageText:StageText):void
+ public function releaseStageText(stageText: StageText, multiline: Boolean): void
{
- map_StyleableStageText_to_StageText[host] = stageText;
- map_StageText_to_StyleableStageText[stageText] = host;
-
- if (host.multiline)
+ if (multiline)
{
multilinePool.push(stageText);
@@ -2222,39 +2211,14 @@ class StageTextPool
/**
* Return the pool to its reserve size.
*/
- private function shrinkPool(multiline:Boolean):void
+ private function shrinkPool(multiline: Boolean): void
{
- var oldStageText:StageText;
-
- if (multiline)
+ var oldStageText: StageText;
+ var pool: Vector.<StageText> = multiline ? multilinePool : singleLinePool;
+ while (pool.length > poolReserve)
{
- while (multilinePool.length > poolReserve)
- {
- oldStageText = multilinePool.shift();
- uncacheStageText(oldStageText);
- oldStageText.dispose();
- }
- }
- else
- {
- while (singleLinePool.length > poolReserve)
- {
- oldStageText = singleLinePool.shift();
- uncacheStageText(oldStageText);
- oldStageText.dispose();
- }
+ oldStageText = pool.shift();
+ oldStageText.dispose();
}
}
-
- /**
- * Remove a StageText and its last known StyleableStageText2 host from the
- * cache.
- */
- private function uncacheStageText(stageText:StageText):void
- {
- var host:ScrollableStageText = map_StageText_to_StyleableStageText[stageText];
-
- delete map_StyleableStageText_to_StageText[host];
- delete map_StageText_to_StyleableStageText[stageText];
- }
}
\ No newline at end of file
[10/10] git commit: [flex-sdk] [refs/heads/release4.12.0] - Accept
Patch for FLEX-33948
Posted by ah...@apache.org.
Accept Patch for FLEX-33948
Project: http://git-wip-us.apache.org/repos/asf/flex-sdk/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-sdk/commit/4a139991
Tree: http://git-wip-us.apache.org/repos/asf/flex-sdk/tree/4a139991
Diff: http://git-wip-us.apache.org/repos/asf/flex-sdk/diff/4a139991
Branch: refs/heads/release4.12.0
Commit: 4a13999192e5ebb8ab9d435069e226f6b9f30759
Parents: 920ee21
Author: Alex Harui <ah...@apache.org>
Authored: Thu Apr 24 15:30:19 2014 -0700
Committer: Alex Harui <ah...@apache.org>
Committed: Thu Apr 24 15:30:19 2014 -0700
----------------------------------------------------------------------
.../supportClasses/DropDownListBase.as | 147 ++++++++++++++++++-
1 file changed, 140 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/4a139991/frameworks/projects/spark/src/spark/components/supportClasses/DropDownListBase.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/spark/src/spark/components/supportClasses/DropDownListBase.as b/frameworks/projects/spark/src/spark/components/supportClasses/DropDownListBase.as
index a2fe333..aaba442 100644
--- a/frameworks/projects/spark/src/spark/components/supportClasses/DropDownListBase.as
+++ b/frameworks/projects/spark/src/spark/components/supportClasses/DropDownListBase.as
@@ -29,7 +29,7 @@ import flash.events.MouseEvent;
import flash.geom.Point;
import mx.collections.IList;
-import mx.core.mx_internal;
+import mx.core.InteractionMode;
import mx.events.CollectionEvent;
import mx.events.FlexEvent;
@@ -37,8 +37,8 @@ import spark.components.List;
import spark.core.NavigationUnit;
import spark.events.DropDownEvent;
import spark.events.IndexChangeEvent;
-import spark.utils.LabelUtil;
+import mx.core.mx_internal;
use namespace mx_internal;
//--------------------------------------
@@ -437,11 +437,13 @@ public class DropDownListBase extends List
return;
_dropDownController = value;
-
+
_dropDownController.addEventListener(DropDownEvent.OPEN, dropDownController_openHandler);
_dropDownController.addEventListener(DropDownEvent.CLOSE, dropDownController_closeHandler);
- if (openButton)
+ _dropDownController.closeOnResize = _closeDropDownOnResize;
+
+ if (openButton)
_dropDownController.openButton = openButton;
if (dropDown)
_dropDownController.dropDown = dropDown;
@@ -467,7 +469,72 @@ public class DropDownListBase extends List
return false;
}
- //----------------------------------
+ //----------------------------------
+ // closeDropDownOnResize
+ //----------------------------------
+
+ /**
+ * @private
+ *
+ * cached value: getStyle("interactionMode") == InteractionMode.TOUCH
+ */
+ private var isTouchInteractionMode:Boolean = false;
+
+ /**
+ * @private
+ *
+ * do not know what default value for closeDropDownOnResize will be until styles have been applied,
+ * but user may set property before that. this flag indicates whether property has been explicitly set,
+ * and so will not need to be determined from css when stylesInitialized() or styleChanged() is called.
+ */
+ private var isCloseDropDownOnResizeExplicitlySet:Boolean = false;
+
+ /**
+ * @private
+ */
+ protected var _closeDropDownOnResize:Boolean = true;
+
+ [Inspectable(category="General", enumeration="true,false", defaultValue="true")]
+
+ /**
+ * When <code>true</code>, resizing the system manager
+ * closes the drop down.
+ * For mobile applications, this property is set
+ * to <code>false</code> so that the drop down stays open when the
+ * page orientation changes.
+ *
+ * @default true
+ *
+ * @langversion 3.0
+ * @playerversion Flash 10
+ * @playerversion AIR 1.5
+ * @productversion Flex 4.12
+ */
+ public function get closeDropDownOnResize():Boolean
+ {
+ return _closeDropDownOnResize;
+ }
+
+ /**
+ * @private
+ */
+ public function set closeDropDownOnResize(value:Boolean):void
+ {
+ setCloseDropDownOnResize(value, true);
+ }
+
+ /**
+ * @private
+ */
+ private function setCloseDropDownOnResize(value:Boolean, explicitlySet:Boolean):void
+ {
+ _closeDropDownOnResize = value;
+ isCloseDropDownOnResizeExplicitlySet ||= explicitlySet;
+ if (dropDownController)
+ dropDownController.closeOnResize = _closeDropDownOnResize;
+ }
+
+ //----------------------------------
// userProposedSelectedIndex
//----------------------------------
@@ -498,6 +565,69 @@ public class DropDownListBase extends List
//
//--------------------------------------------------------------------------
+ /**
+ * @private
+ *
+ * @langversion 3.0
+ * @playerversion Flash 10
+ * @playerversion AIR 1.5
+ * @productversion Flex 4.12
+ */
+ override public function stylesInitialized():void
+ {
+ super.stylesInitialized();
+ setInteractionMode();
+ }
+
+ /**
+ * @private
+ *
+ * @langversion 3.0
+ * @playerversion Flash 10
+ * @playerversion AIR 1.5
+ * @productversion Flex 4.12
+ */
+ override public function styleChanged(styleProp:String):void
+ {
+ super.styleChanged(styleProp);
+ if (!styleProp || styleProp == "styleName" || styleProp == "interactionMode")
+ setInteractionMode();
+ }
+
+ /**
+ * @private
+ *
+ * @langversion 3.0
+ * @playerversion Flash 10
+ * @playerversion AIR 1.5
+ * @productversion Flex 4.12
+ */
+ private function setInteractionMode():void
+ {
+ isTouchInteractionMode = getStyle("interactionMode") == InteractionMode.TOUCH;
+ if (!isCloseDropDownOnResizeExplicitlySet)
+ setCloseDropDownOnResize(!isTouchInteractionMode, false);
+ }
+
+ /**
+ * @private
+ *
+ * @langversion 3.0
+ * @playerversion Flash 10
+ * @playerversion AIR 1.5
+ * @productversion Flex 4.12
+ */
+ override public function setSelectedIndex(rowIndex:int, dispatchChangeEvent:Boolean = false, changeCaret:Boolean = true):void
+ {
+ super.setSelectedIndex(rowIndex, dispatchChangeEvent, changeCaret);
+ if (isTouchInteractionMode)
+ {
+ userProposedSelectedIndex = rowIndex;
+ closeDropDown(true);
+ }
+ }
+
+
/**
* @private
* Called by the initialize() method of UIComponent
@@ -738,8 +868,11 @@ public class DropDownListBase extends List
override protected function item_mouseDownHandler(event:MouseEvent):void
{
super.item_mouseDownHandler(event);
- userProposedSelectedIndex = selectedIndex;
- closeDropDown(true);
+ if (!isTouchInteractionMode)
+ {
+ userProposedSelectedIndex = selectedIndex;
+ closeDropDown(true);
+ }
}
/**
[03/10] git commit: [flex-sdk] [refs/heads/release4.12.0] - This test
inconsistently fails on the MustellaVM,
but no related bugs have been filed. As these failures 'cry wolf' a little too
often, I've excluded the test altogether.
Posted by ah...@apache.org.
This test inconsistently fails on the MustellaVM, but no related bugs have been filed. As these failures 'cry wolf' a little too often, I've excluded the test altogether.
Signed-off-by: Erik de Bruin <er...@ixsoftware.nl>
Project: http://git-wip-us.apache.org/repos/asf/flex-sdk/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-sdk/commit/378b859d
Tree: http://git-wip-us.apache.org/repos/asf/flex-sdk/tree/378b859d
Diff: http://git-wip-us.apache.org/repos/asf/flex-sdk/diff/378b859d
Branch: refs/heads/release4.12.0
Commit: 378b859dcbec20831815d430ac1cb1eaf519764a
Parents: f415a89
Author: Erik de Bruin <er...@ixsoftware.nl>
Authored: Wed Apr 16 09:10:48 2014 +0200
Committer: Erik de Bruin <er...@ixsoftware.nl>
Committed: Wed Apr 16 09:11:02 2014 +0200
----------------------------------------------------------------------
mustella/tests/ExcludeListWin.txt | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/378b859d/mustella/tests/ExcludeListWin.txt
----------------------------------------------------------------------
diff --git a/mustella/tests/ExcludeListWin.txt b/mustella/tests/ExcludeListWin.txt
index ab0c98c..54fa51c 100644
--- a/mustella/tests/ExcludeListWin.txt
+++ b/mustella/tests/ExcludeListWin.txt
@@ -1185,6 +1185,7 @@ gumbo/components/List/styles/List_Tile_tester$ListKeyDown_MouseClick,
gumbo/components/List/styles/List_Tile_tester$ListKeyDown_Programmatic,
gumbo/components/ListDragDrop/events/SparkDNDList_events$HListAbcDND1_dragExit,
gumbo/components/ListDragDrop/events/SparkDNDList_events$HListDefaultRenderer_dragExit,
+gumbo/components/ListDragDrop/events/SparkDNDList_events$ListAbcDND1_dragComplete,
gumbo/components/ListDragDrop/events/SparkDNDList_events$ListAbcDND1_dragExit,
gumbo/components/ListDragDrop/events/SparkDNDList_events$TileListColDefaultRenderer_dragExit,
gumbo/components/ListDragDrop/events/SparkDNDList_events$TileListColDefaultRenderer_dragExit,
[06/10] git commit: [flex-sdk] [refs/heads/release4.12.0] - Merge
branch 'develop' of https://git-wip-us.apache.org/repos/asf/flex-sdk into
develop
Posted by ah...@apache.org.
Merge branch 'develop' of https://git-wip-us.apache.org/repos/asf/flex-sdk into develop
Project: http://git-wip-us.apache.org/repos/asf/flex-sdk/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-sdk/commit/8150c264
Tree: http://git-wip-us.apache.org/repos/asf/flex-sdk/tree/8150c264
Diff: http://git-wip-us.apache.org/repos/asf/flex-sdk/diff/8150c264
Branch: refs/heads/release4.12.0
Commit: 8150c264fae1cfa382281d355f4b823fe38c89ae
Parents: 063dcdc e214164
Author: mamsellem <ma...@systar.com>
Authored: Mon Apr 21 23:09:14 2014 +0200
Committer: mamsellem <ma...@systar.com>
Committed: Mon Apr 21 23:09:14 2014 +0200
----------------------------------------------------------------------
.../charts/src/mx/charts/series/PieSeries.as | 2 +-
.../src/spark/components/DataNavigator.as | 4 ++--
.../src/spark/containers/Accordion.as | 2 +-
.../src/spark/skins/AccordionSkin.mxml | 2 +-
.../src/spark/skins/ColorPickerSkin.mxml | 2 +-
.../src/spark/skins/DataAccordionSkin.mxml | 2 +-
.../src/spark/skins/DataNavigatorSkin.mxml | 2 +-
.../src/spark/skins/MenuBarSkin.mxml | 2 +-
.../experimental/src/spark/skins/MenuSkin.mxml | 2 +-
.../src/spark/skins/NavigatorSkin.mxml | 2 +-
.../src/spark/skins/TabNavigatorSkin.mxml | 2 +-
.../src/mx/formatters/DateFormatter.as | 12 ++++++-----
.../src/mx/resources/ResourceManagerImpl.as | 5 ++++-
.../framework/src/mx/utils/ObjectUtil.as | 2 +-
.../rpc/src/mx/rpc/http/HTTPMultiService.as | 2 +-
.../projects/rpc/src/mx/rpc/soap/SOAPDecoder.as | 2 +-
.../src/spark/accessibility/DataGridAccImpl.as | 2 +-
.../spark/src/spark/components/Callout.as | 2 +-
.../projects/spark/src/spark/components/Grid.as | 2 +-
.../src/spark/components/RichEditableText.as | 4 ++--
.../components/gridClasses/DataGridEditor.as | 22 ++++++++++++++++++--
.../spark/components/supportClasses/ListBase.as | 6 +++---
.../spark/src/spark/layouts/ConstraintLayout.as | 2 +-
.../src/spark/skins/spark/ComboBoxSkin.mxml | 2 +-
.../skins/spark/ComboBoxTextInputSkin.mxml | 2 +-
.../src/spark/skins/spark/DataGridSkin.mxml | 2 +-
.../src/spark/skins/spark/DropDownListSkin.mxml | 2 +-
.../spark/src/spark/skins/spark/ListSkin.mxml | 2 +-
.../spark/NumericStepperTextInputSkin.mxml | 2 +-
.../src/spark/skins/spark/TextAreaSkin.mxml | 2 +-
.../src/spark/skins/spark/TextInputSkin.mxml | 2 +-
.../src/mx/skins/spark/BorderSkin.mxml | 2 +-
.../src/mx/skins/spark/TextInputBorderSkin.mxml | 2 +-
ide/addAIRtoSDK.sh | 19 +++++++++++------
ide/checkAllPlayerGlobals.bat | 2 ++
ide/checkAllPlayerGlobals.sh | 4 ++--
ide/setFlashPlayerVersion.sh | 2 +-
mustella/tests/ExcludeListWin.txt | 1 +
38 files changed, 84 insertions(+), 51 deletions(-)
----------------------------------------------------------------------
[05/10] git commit: [flex-sdk] [refs/heads/release4.12.0] - FIXED -
FLEX-34231 StageText displays wrong text
Posted by ah...@apache.org.
FIXED - FLEX-34231 StageText displays wrong text
Project: http://git-wip-us.apache.org/repos/asf/flex-sdk/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-sdk/commit/063dcdc2
Tree: http://git-wip-us.apache.org/repos/asf/flex-sdk/tree/063dcdc2
Diff: http://git-wip-us.apache.org/repos/asf/flex-sdk/diff/063dcdc2
Branch: refs/heads/release4.12.0
Commit: 063dcdc244e89ba2e0e435880b619813b4666184
Parents: c5b0ff1
Author: mamsellem <ma...@systar.com>
Authored: Mon Apr 21 23:08:55 2014 +0200
Committer: mamsellem <ma...@systar.com>
Committed: Mon Apr 21 23:08:55 2014 +0200
----------------------------------------------------------------------
.../supportClasses/ScrollableStageText.as | 20 +++++++++++++-------
1 file changed, 13 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/063dcdc2/frameworks/projects/mobilecomponents/src/spark/components/supportClasses/ScrollableStageText.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/mobilecomponents/src/spark/components/supportClasses/ScrollableStageText.as b/frameworks/projects/mobilecomponents/src/spark/components/supportClasses/ScrollableStageText.as
index c03ef69..da971cc 100644
--- a/frameworks/projects/mobilecomponents/src/spark/components/supportClasses/ScrollableStageText.as
+++ b/frameworks/projects/mobilecomponents/src/spark/components/supportClasses/ScrollableStageText.as
@@ -1736,14 +1736,20 @@ public class ScrollableStageText extends UIComponent implements IStyleableEdita
{
restoreStageText();
}
- else if (savedSelectionAnchorIndex > 0 || savedSelectionActiveIndex > 0)
+ else
{
- // Even if the StageText has been retrieved from the cache, its
- // selection is not preserved. Restore the selection if necessary.
- if (savedSelectionAnchorIndex <= _text.length && savedSelectionActiveIndex <= _text.length)
- stageText.selectRange(savedSelectionAnchorIndex, savedSelectionActiveIndex);
- savedSelectionAnchorIndex = 0;
- savedSelectionActiveIndex = 0;
+ //always restore text, even if recycled, as it may have changed when the SST was not on stage cf. https://issues.apache.org/jira/browse/FLEX-34231
+ // for now, we ignore external changes to other props
+ stageText.text = _text ;
+ if (savedSelectionAnchorIndex > 0 || savedSelectionActiveIndex > 0)
+ {
+ // Even if the StageText has been retrieved from the cache, its
+ // selection is not preserved. Restore the selection if necessary.
+ if (savedSelectionAnchorIndex <= _text.length && savedSelectionActiveIndex <= _text.length)
+ stageText.selectRange(savedSelectionAnchorIndex, savedSelectionActiveIndex);
+ savedSelectionAnchorIndex = 0;
+ savedSelectionActiveIndex = 0;
+ }
}
if (stageText != null)
[02/10] git commit: [flex-sdk] [refs/heads/release4.12.0] - Added
support for FP 13 and AIR 13 release versions
Posted by ah...@apache.org.
Added support for FP 13 and AIR 13 release versions
Project: http://git-wip-us.apache.org/repos/asf/flex-sdk/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-sdk/commit/f415a893
Tree: http://git-wip-us.apache.org/repos/asf/flex-sdk/tree/f415a893
Diff: http://git-wip-us.apache.org/repos/asf/flex-sdk/diff/f415a893
Branch: refs/heads/release4.12.0
Commit: f415a893e9d52ce747fd3a1900c0f65c3d0df16b
Parents: 4b6c6ac
Author: Justin Mclean <jm...@apache.org>
Authored: Wed Apr 16 12:27:02 2014 +1000
Committer: Justin Mclean <jm...@apache.org>
Committed: Wed Apr 16 12:27:02 2014 +1000
----------------------------------------------------------------------
ide/addAIRtoSDK.sh | 19 +++++++++++++------
ide/checkAllPlayerGlobals.bat | 2 ++
ide/checkAllPlayerGlobals.sh | 4 ++--
ide/setFlashPlayerVersion.sh | 2 +-
4 files changed, 18 insertions(+), 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/f415a893/ide/addAIRtoSDK.sh
----------------------------------------------------------------------
diff --git a/ide/addAIRtoSDK.sh b/ide/addAIRtoSDK.sh
index ba9d645..e355fab 100755
--- a/ide/addAIRtoSDK.sh
+++ b/ide/addAIRtoSDK.sh
@@ -30,13 +30,13 @@
AIR_VERSION="$1"
OS=`uname`
-if [[ "${AIR_VERSION}" != "4.0" && "${AIR_VERSION}" != "3.9" && "${AIR_VERSION}" != "3.8"
- && "${AIR_VERSION}" != "3.7" && "${AIR_VERSION}" != "3.6" && "${AIR_VERSION}" != "3.5"
- && "${AIR_VERSION}" != "3.4" && "${AIR_VERSION}" != "3.3" && "${AIR_VERSION}" != "3.2"
- && "${AIR_VERSION}" != "3.1" && "${AIR_VERSION}" != "3.0" && "${AIR_VERSION}" != "2.7"
- && "${AIR_VERSION}" != "2.6" ]]
+if [[ "${AIR_VERSION}" != "13.0" &&"${AIR_VERSION}" != "4.0" && "${AIR_VERSION}" != "3.9"
+ && "${AIR_VERSION}" != "3.8" && "${AIR_VERSION}" != "3.7" && "${AIR_VERSION}" != "3.6"
+ && "${AIR_VERSION}" != "3.5" && "${AIR_VERSION}" != "3.4" && "${AIR_VERSION}" != "3.3"
+ && "${AIR_VERSION}" != "3.2" && "${AIR_VERSION}" != "3.1" && "${AIR_VERSION}" != "3.0"
+ && "${AIR_VERSION}" != "2.7" && "${AIR_VERSION}" != "2.6" ]]
then
- echo Unknown version ${AIR_VERISON} of AIR. Versions 2.6, 2.7, 3.0, 3.1, 3.2, 3.3, 3.4, 3.5, 3.6, 3.7, 3.8, 3.9 and 4.0 are supported.
+ echo Unknown version ${AIR_VERISON} of AIR. Versions 2.6, 2.7, 3.0, 3.1, 3.2, 3.3, 3.4, 3.5, 3.6, 3.7, 3.8, 3.9, 4.0 and 13.0 are supported.
exit 1;
fi
@@ -155,6 +155,13 @@ for configFile in "${configFiles[@]}"
do
echo Updating ${configFile}
+ # 13.0 needs FP 13 and swf version 24
+ if [ ${AIR_VERSION} = "13.0" ]
+ then
+ updatePlayerVersion 13.0 "${configFile}"
+ updateSWFVersion 24 "${configFile}"
+ fi
+
# 4.0 needs FP 12 and swf version 23
if [ ${AIR_VERSION} = "4.0" ]
then
http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/f415a893/ide/checkAllPlayerGlobals.bat
----------------------------------------------------------------------
diff --git a/ide/checkAllPlayerGlobals.bat b/ide/checkAllPlayerGlobals.bat
index d2b96bf..89fe787 100644
--- a/ide/checkAllPlayerGlobals.bat
+++ b/ide/checkAllPlayerGlobals.bat
@@ -125,6 +125,8 @@ call :downloadPlayerGlobal 11.6 1b841a0a26ada3e5da26eb70c32ab263 http://download
call :downloadPlayerGlobal 11.7 12656571c57b2ad641838e5695a00e27 http://download.macromedia.com/get/flashplayer/updaters/11/playerglobal11_7.swc
call :downloadPlayerGlobal 11.8 20ce9ae3b2ddd4a5ff3fe65c0a7f1139 http://download.macromedia.com/get/flashplayer/updaters/11/playerglobal11_8.swc
call :downloadPlayerGlobal 11.9 4cac2727e7b7e741075581f47c35f3af http://download.macromedia.com/get/flashplayer/updaters/11/playerglobal11_9.swc
+call :downloadPlayerGlobal 12.0 4db4e934f39f774ba68fcd9a79654971 http://download.macromedia.com/get/flashplayer/updaters/12/playerglobal12_0.swc
+call :downloadPlayerGlobal 13.0 7f9bfe038f00e97bc44abf52bb5b1260 http://download.macromedia.com/get/flashplayer/updaters/12/playerglobal13_0.swc
http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/f415a893/ide/checkAllPlayerGlobals.sh
----------------------------------------------------------------------
diff --git a/ide/checkAllPlayerGlobals.sh b/ide/checkAllPlayerGlobals.sh
index 6dc503f..8a5fc5f 100755
--- a/ide/checkAllPlayerGlobals.sh
+++ b/ide/checkAllPlayerGlobals.sh
@@ -120,6 +120,6 @@ downloadPlayerGlobal 11.6 1b841a0a26ada3e5da26eb70c32ab263 http://download.macro
downloadPlayerGlobal 11.7 12656571c57b2ad641838e5695a00e27 http://download.macromedia.com/get/flashplayer/updaters/11/playerglobal11_7.swc
downloadPlayerGlobal 11.8 35bc69eec5091f70e221b4e63b66b60f http://download.macromedia.com/get/flashplayer/updaters/11/playerglobal11_8.swc
downloadPlayerGlobal 11.9 d18244c3c00c61a41f2d4d791d09fedb http://download.macromedia.com/get/flashplayer/updaters/11/playerglobal11_9.swc
-downloadPlayerGlobal 12.0 4db4e934f39f774ba68fcd9a79654971 http://download.macromedia.com/get/flashplayer/updaters/12/playerglobal12_0.swc
-downloadPlayerGlobal 13.0 6a72a86fbe6f107be0094576fe184276 http://labsdownload.adobe.com/pub/labs/flashruntimes/flashplayer/flashplayer13_playerglobal.swc
+downloadPlayerGlobal 12.0 4db4e934f39f774ba68fcd9a79654971 http://download.macromedia.com/get/flashplayer/updaters/12/playerglobal12_0.swc
+downloadPlayerGlobal 13.0 7f9bfe038f00e97bc44abf52bb5b1260 http://download.macromedia.com/get/flashplayer/updaters/12/playerglobal13_0.swc
http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/f415a893/ide/setFlashPlayerVersion.sh
----------------------------------------------------------------------
diff --git a/ide/setFlashPlayerVersion.sh b/ide/setFlashPlayerVersion.sh
index 897214b..94e2353 100755
--- a/ide/setFlashPlayerVersion.sh
+++ b/ide/setFlashPlayerVersion.sh
@@ -220,7 +220,7 @@ do
if [ ${FLASH_VERSION} = "13.0" ]
then
- updateSWFVersion 23 "${configFile}"
+ updateSWFVersion 24 "${configFile}"
fi
if [ ${FLASH_VERSION} = "12.0" ]
[04/10] git commit: [flex-sdk] [refs/heads/release4.12.0] - Merge
branch 'release4.12.0' into develop
Posted by ah...@apache.org.
Merge branch 'release4.12.0' into develop
Project: http://git-wip-us.apache.org/repos/asf/flex-sdk/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-sdk/commit/e2141642
Tree: http://git-wip-us.apache.org/repos/asf/flex-sdk/tree/e2141642
Diff: http://git-wip-us.apache.org/repos/asf/flex-sdk/diff/e2141642
Branch: refs/heads/release4.12.0
Commit: e2141642619801ff44a87ceeab853fd16756d3e2
Parents: 378b859 9d586e6
Author: Alex Harui <ah...@apache.org>
Authored: Fri Apr 18 14:07:35 2014 -0700
Committer: Alex Harui <ah...@apache.org>
Committed: Fri Apr 18 14:07:35 2014 -0700
----------------------------------------------------------------------
.../src/spark/components/RichEditableText.as | 4 ++--
.../components/gridClasses/DataGridEditor.as | 22 ++++++++++++++++++--
2 files changed, 22 insertions(+), 4 deletions(-)
----------------------------------------------------------------------