Merge pull request #4042 from hieupham007/timob-12176

timob-12176: fix various issues
tidev · Mar 27, 2013 · a7510fd · a7510fd
2 parents 50d89ee + 48fb5ea
commit a7510fd
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 2 deletions.
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
@@ -67,6 +67,7 @@ protected void onLayout(boolean changed, int left, int top, int right, int botto
 		tv.setKeyListener(null);
 		tv.setFocusable(false);
 		tv.setSingleLine(false);
+		TiUIHelper.styleText(tv, null);
 		defaultColor = tv.getCurrentTextColor();
 		setNativeView(tv);
 

diff --git a/android/modules/ui/src/java/ti/modules/titanium/ui/widget/listview/ListSectionProxy.java b/android/modules/ui/src/java/ti/modules/titanium/ui/widget/listview/ListSectionProxy.java
@@ -604,7 +604,7 @@ public void appendExtraEventData(TiUIView view, int itemIndex, int sectionIndex,
 		existingData.put(TiC.PROPERTY_SECTION_INDEX, sectionIndex);
 		existingData.put(TiC.PROPERTY_ITEM_INDEX, itemIndex);
 
-		if (!bindId.startsWith(TiListViewTemplate.GENERATED_BINDING)) {
+		if (!bindId.startsWith(TiListViewTemplate.GENERATED_BINDING) && !bindId.equals(TiC.PROPERTY_PROPERTIES)) {
 			existingData.put(TiC.PROPERTY_BIND_ID, bindId);
 		} else if (existingData.containsKey(TiC.PROPERTY_BIND_ID)){
 			existingData.remove(TiC.PROPERTY_BIND_ID);

diff --git a/android/modules/ui/src/java/ti/modules/titanium/ui/widget/listview/ViewItem.java b/android/modules/ui/src/java/ti/modules/titanium/ui/widget/listview/ViewItem.java
@@ -38,7 +38,7 @@ public KrollDict generateDiffProperties(KrollDict properties) {
 
 		for (String appliedProp : this.properties.keySet()) {
 			if (!properties.containsKey(appliedProp)) {
-				diffProperties.put(appliedProp, null);
+				applyProperty(appliedProp, null);
 			}
 		}