flex-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jmcl...@apache.org
Subject git commit: [flex-sdk] [refs/heads/release4.11.0] - Revert change as test is failing - it's likely that change is OK and test is incorrect but this is holding up the release candidate
Date Thu, 10 Oct 2013 22:35:30 GMT
Updated Branches:
  refs/heads/release4.11.0 88ed63eb3 -> 8eddfd0fa


Revert change as test is failing - it's likely that change is OK and test is incorrect but
this is holding up the release candidate


Project: http://git-wip-us.apache.org/repos/asf/flex-sdk/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-sdk/commit/8eddfd0f
Tree: http://git-wip-us.apache.org/repos/asf/flex-sdk/tree/8eddfd0f
Diff: http://git-wip-us.apache.org/repos/asf/flex-sdk/diff/8eddfd0f

Branch: refs/heads/release4.11.0
Commit: 8eddfd0fa5bbe34e4621cd32aad8d49de0d562a0
Parents: 88ed63e
Author: Justin Mclean <jmclean@apache.org>
Authored: Fri Oct 11 09:35:06 2013 +1100
Committer: Justin Mclean <jmclean@apache.org>
Committed: Fri Oct 11 09:35:06 2013 +1100

----------------------------------------------------------------------
 frameworks/projects/spark/src/mx/core/FTETextField.as | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/8eddfd0f/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 2843370..89b0dc0 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;
-        public static const FLAG_HTML_TEXT_SET:uint = 1 << 7;
+        private 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
          */
-        public function clearFlag(mask:uint):void
+        private function clearFlag(mask:uint):void
         {
             flags &= ~mask;
         }
@@ -3653,10 +3653,7 @@ 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;


Mime
View raw message