incubator-flex-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From aha...@apache.org
Subject svn commit: r1422033 - in /incubator/flex/sdk/branches/develop: ./ frameworks/projects/framework/src/mx/core/UITextField.as
Date Fri, 14 Dec 2012 18:40:56 GMT
Author: aharui
Date: Fri Dec 14 18:40:54 2012
New Revision: 1422033

URL: http://svn.apache.org/viewvc?rev=1422033&view=rev
Log:
merge rev 1421998 to develop branch

Modified:
    incubator/flex/sdk/branches/develop/   (props changed)
    incubator/flex/sdk/branches/develop/frameworks/projects/framework/src/mx/core/UITextField.as
  (contents, props changed)

Propchange: incubator/flex/sdk/branches/develop/
------------------------------------------------------------------------------
  Merged /incubator/flex/sdk/branches/release4.9:r1421998

Modified: incubator/flex/sdk/branches/develop/frameworks/projects/framework/src/mx/core/UITextField.as
URL: http://svn.apache.org/viewvc/incubator/flex/sdk/branches/develop/frameworks/projects/framework/src/mx/core/UITextField.as?rev=1422033&r1=1422032&r2=1422033&view=diff
==============================================================================
--- incubator/flex/sdk/branches/develop/frameworks/projects/framework/src/mx/core/UITextField.as
(original)
+++ incubator/flex/sdk/branches/develop/frameworks/projects/framework/src/mx/core/UITextField.as
Fri Dec 14 18:40:54 2012
@@ -2450,6 +2450,20 @@ public class UITextField extends FlexTex
                 super.text = s + truncationIndicator;
             }
             
+			var otl:int = originalText.length;
+			var t:String = s;
+			while (t.length < otl)
+			{
+				t = originalText.slice(0, t.length + 1);
+				super.text = t + truncationIndicator;
+				if (textWidth + TEXT_WIDTH_PADDING <= w)
+					s = t;
+				else
+					break;
+			} 
+			if (s.length > 0)
+				super.text = s + truncationIndicator;
+			
             return true;
         }
 

Propchange: incubator/flex/sdk/branches/develop/frameworks/projects/framework/src/mx/core/UITextField.as
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Fri Dec 14 18:40:54 2012
@@ -0,0 +1,2 @@
+/incubator/flex/sdk/branches/develop/frameworks/projects/framework/src/mx/core/UITextField.as:1421998
+/incubator/flex/sdk/branches/release4.9/frameworks/projects/framework/src/mx/core/UITextField.as:1417241-1421328,1421400,1421998



Mime
View raw message