You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flex.apache.org by qu...@apache.org on 2013/10/03 23:32:07 UTC
[1/3] git commit: [flex-sdk] [refs/heads/develop] - Fixes FLEX-33428
Updated Branches:
refs/heads/develop c3d5e628a -> a7534ce37
Fixes FLEX-33428
Project: http://git-wip-us.apache.org/repos/asf/flex-sdk/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-sdk/commit/f1c39855
Tree: http://git-wip-us.apache.org/repos/asf/flex-sdk/tree/f1c39855
Diff: http://git-wip-us.apache.org/repos/asf/flex-sdk/diff/f1c39855
Branch: refs/heads/develop
Commit: f1c398552e30dacbf9b63dec82666b436b86a7e6
Parents: c3d5e62
Author: quetwo <ni...@theflexgroup.org>
Authored: Thu Oct 3 16:50:50 2013 -0400
Committer: quetwo <ni...@theflexgroup.org>
Committed: Thu Oct 3 16:50:50 2013 -0400
----------------------------------------------------------------------
frameworks/projects/spark/src/mx/core/FTETextField.as | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/f1c39855/frameworks/projects/spark/src/mx/core/FTETextField.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/spark/src/mx/core/FTETextField.as b/frameworks/projects/spark/src/mx/core/FTETextField.as
index 89b0dc0..1374134 100644
--- a/frameworks/projects/spark/src/mx/core/FTETextField.as
+++ b/frameworks/projects/spark/src/mx/core/FTETextField.as
@@ -179,7 +179,7 @@ package mx.core
* which control what work validateNow() needs to do.
*/
private static const FLAG_TEXT_SET:uint = 1 << 6;
- private static const FLAG_HTML_TEXT_SET:uint = 1 << 7;
+ public static const FLAG_HTML_TEXT_SET:uint = 1 << 7;
private static const FLAG_TEXT_LINES_INVALID:uint = 1 << 8;
private static const FLAG_GRAPHICS_INVALID:uint = 1 << 9;
@@ -2437,7 +2437,7 @@ package mx.core
/**
* @private
*/
- private function clearFlag(mask:uint):void
+ public function clearFlag(mask:uint):void
{
flags &= ~mask;
}
@@ -3653,7 +3653,10 @@ internal class HTMLHelper
// and needs to be regenerated on demand,
// because with htmlText what-you-set-is-not-what-you-get.
if (!styleSheet)
+ {
htmlText = null;
+ textfield.clearFlag(FTETextField.FLAG_HTML_TEXT_SET);
+ }
if (!textFlow)
return;
[3/3] git commit: [flex-sdk] [refs/heads/develop] - Fixes FLEX-33428
-- Previous commit had a spelling mistake.
Posted by qu...@apache.org.
Fixes FLEX-33428 -- Previous commit had a spelling mistake.
Project: http://git-wip-us.apache.org/repos/asf/flex-sdk/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-sdk/commit/a7534ce3
Tree: http://git-wip-us.apache.org/repos/asf/flex-sdk/tree/a7534ce3
Diff: http://git-wip-us.apache.org/repos/asf/flex-sdk/diff/a7534ce3
Branch: refs/heads/develop
Commit: a7534ce37b44444834bda2b6f69cca003949770b
Parents: 80565a5
Author: quetwo <ni...@theflexgroup.org>
Authored: Thu Oct 3 17:27:17 2013 -0400
Committer: quetwo <ni...@theflexgroup.org>
Committed: Thu Oct 3 17:27:17 2013 -0400
----------------------------------------------------------------------
frameworks/projects/spark/src/mx/core/FTETextField.as | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/a7534ce3/frameworks/projects/spark/src/mx/core/FTETextField.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/spark/src/mx/core/FTETextField.as b/frameworks/projects/spark/src/mx/core/FTETextField.as
index 1374134..2843370 100644
--- a/frameworks/projects/spark/src/mx/core/FTETextField.as
+++ b/frameworks/projects/spark/src/mx/core/FTETextField.as
@@ -3655,7 +3655,7 @@ internal class HTMLHelper
if (!styleSheet)
{
htmlText = null;
- textfield.clearFlag(FTETextField.FLAG_HTML_TEXT_SET);
+ textField.clearFlag(FTETextField.FLAG_HTML_TEXT_SET);
}
if (!textFlow)
[2/3] git commit: [flex-sdk] [refs/heads/develop] - Fixes FLEX-32887
Posted by qu...@apache.org.
Fixes FLEX-32887
Project: http://git-wip-us.apache.org/repos/asf/flex-sdk/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-sdk/commit/80565a5e
Tree: http://git-wip-us.apache.org/repos/asf/flex-sdk/tree/80565a5e
Diff: http://git-wip-us.apache.org/repos/asf/flex-sdk/diff/80565a5e
Branch: refs/heads/develop
Commit: 80565a5ed24932627b70a77683a83415fe057f8b
Parents: f1c3985
Author: quetwo <ni...@theflexgroup.org>
Authored: Thu Oct 3 17:03:50 2013 -0400
Committer: quetwo <ni...@theflexgroup.org>
Committed: Thu Oct 3 17:03:50 2013 -0400
----------------------------------------------------------------------
.../charts/src/mx/charts/chartClasses/GraphicsUtilities.as | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/80565a5e/frameworks/projects/charts/src/mx/charts/chartClasses/GraphicsUtilities.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/charts/src/mx/charts/chartClasses/GraphicsUtilities.as b/frameworks/projects/charts/src/mx/charts/chartClasses/GraphicsUtilities.as
index 9b66b08..94bb8e6 100644
--- a/frameworks/projects/charts/src/mx/charts/chartClasses/GraphicsUtilities.as
+++ b/frameworks/projects/charts/src/mx/charts/chartClasses/GraphicsUtilities.as
@@ -330,7 +330,7 @@ public class GraphicsUtilities
// Check for coincident points at the head of the list.
// We'll skip over any of those
- while (start != end)
+ while (start != end && ((start + incr) != end))
{
if (pts[start + incr][hProp] != pts[start][hProp] ||
pts[start + incr][vProp] != pts[start][vProp])