[TIMOB-23501]: Cherry-Pick Android and Fix If

tidev · Jun 29, 2016 · 18d8c00 · 18d8c00
1 parent 2bb7df5
commit 18d8c00
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 4 deletions.
diff --git a/android/modules/ui/src/java/ti/modules/titanium/ui/LabelProxy.java b/android/modules/ui/src/java/ti/modules/titanium/ui/LabelProxy.java
@@ -46,6 +46,7 @@ public class LabelProxy extends TiViewProxy
 	public LabelProxy()
 	{
 		defaultValues.put(TiC.PROPERTY_TEXT, "");
+		defaultValues.put(TiC.PROPERTY_ELLIPSIZE, UIModule.TEXT_ELLIPSIZE_TRUNCATE_END);
 	}
 
 	public LabelProxy(TiContext tiContext)

diff --git a/android/modules/ui/src/java/ti/modules/titanium/ui/UIModule.java b/android/modules/ui/src/java/ti/modules/titanium/ui/UIModule.java
@@ -143,6 +143,7 @@ public class UIModule extends KrollModule implements Handler.Callback
 	@Kroll.constant public static final int TEXT_ELLIPSIZE_TRUNCATE_MIDDLE = 1;
 	@Kroll.constant public static final int TEXT_ELLIPSIZE_TRUNCATE_END = 2;
 	@Kroll.constant public static final int TEXT_ELLIPSIZE_TRUNCATE_MARQUEE = 3;
+	@Kroll.constant public static final int TEXT_ELLIPSIZE_TRUNCATE_NONE = 4;
 
 	@Kroll.constant public static final String SIZE = TiC.LAYOUT_SIZE;
 	@Kroll.constant public static final String FILL = TiC.LAYOUT_FILL;

diff --git a/android/modules/ui/src/java/ti/modules/titanium/ui/widget/TiUILabel.java b/android/modules/ui/src/java/ti/modules/titanium/ui/widget/TiUILabel.java
@@ -44,7 +44,7 @@ public class TiUILabel extends TiUIView
 
 	private int defaultColor;
 	private boolean wordWrap = true;
-	private TruncateAt ellipsize;
+	private TruncateAt ellipsize = TruncateAt.END;
 	private float shadowRadius = DEFAULT_SHADOW_RADIUS;
 	private float shadowX = 0f;
 	private float shadowY = 0f;
@@ -135,6 +135,7 @@ public boolean onTouchEvent(MotionEvent event) {
 		tv.setKeyListener(null);
 		tv.setFocusable(false);
 		tv.setSingleLine(false);
+		tv.setEllipsize(ellipsize);
 		TiUIHelper.styleText(tv, null);
 		defaultColor =  tv.getCurrentTextColor();
 		setNativeView(tv);
@@ -217,7 +218,6 @@ public void processProperties(KrollDict d)
 		if (d.containsKey(TiC.PROPERTY_ELLIPSIZE)) {
 
 			Object value = d.get(TiC.PROPERTY_ELLIPSIZE);
-
 			if (value instanceof Boolean){
 				ellipsize = (Boolean) value ? TruncateAt.END : null;
 			}

diff --git a/apidoc/Titanium/UI/UI.yml b/apidoc/Titanium/UI/UI.yml
@@ -1303,6 +1303,15 @@ properties:
     platforms: [android]
     since: "4.1.0"
 
+  - name: TEXT_ELLIPSIZE_TRUNCATE_NONE
+    summary: Disables ellipsizing of the label. The text will be cut off if it is too long.
+    description: |
+        One of the group of constants for the <Titanium.UI.Label.ellipsize> property.
+    type: Number
+    permission: read-only
+    platforms: [android]
+    since: "6.0.0"
+
   - name: EXTEND_EDGE_TOP
     summary: Specifies that the top edge of the window can extend.
     description: |

diff --git a/iphone/Classes/TiUILabel.m b/iphone/Classes/TiUILabel.m
@@ -436,8 +436,8 @@ -(void)setColor_:(id)color
 -(void)setEllipsize_:(id)value
 {
 	ENSURE_SINGLE_ARG(value, NSNumber);
-	if ([TiUtils intValue:value] == 1) {
-		[[self label] setLineBreakMode:NSLineBreakByCharWrapping];
+	if ([[TiUtils stringValue:value] isEqualToString:@"true"]) {
+		[[self label] setLineBreakMode:NSLineBreakByTruncatingTail];
 		return;
 	}
 	[[self label] setLineBreakMode:[TiUtils intValue:value]];