Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

timob-12176: fix various issues #4042

Merged
merged 1 commit into from
Mar 27, 2013
Merged

timob-12176: fix various issues #4042

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
1 change: 1 addition & 0 deletions android/modules/ui/src/java/ti/modules/titanium/ui/widget/TiUILabel.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);

Expand Down
2 changes: 1 addition & 1 deletion android/modules/ui/src/java/ti/modules/titanium/ui/widget/listview/ListSectionProxy.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
2 changes: 1 addition & 1 deletion android/modules/ui/src/java/ti/modules/titanium/ui/widget/listview/ViewItem.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}
}

Expand Down