javascript/NativeScript
1
0
Fork 0
mirror of https://github.com/NativeScript/NativeScript.git synced 2025-08-17 04:41:36 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #891 from NativeScript/ios9-fixes

Browse Source 
ios9 fixes
This commit is contained in:
Vladimir Enchev
2015-10-06 15:52:38 +03:00
parent 27e9118594 6a17651618
commit 1c7c4813c7
2 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
apps/tests/ui/list-view/list-view-tests.ts
View File

@ -686,10 +686,10 @@ function getTextFromNativeElementAt(listView: listViewModule.ListView, index: nu
return (<android.widget.TextView>nativeElement).getText() + ""; return (<android.widget.TextView>nativeElement).getText() + "";
} }
else if (listView.ios) { else if (listView.ios) {
if (utils.ios.MajorVersion <= 8) { if (types.isFunction(listView.ios.visibleCells)) {
return listView.ios.visibleCells()[index].contentView.subviews[0].text + ""; return listView.ios.visibleCells()[index].contentView.subviews[0].text + "";
} }
else if (utils.ios.MajorVersion > 8) { else {
return listView.ios.visibleCells[index].contentView.subviews[0].text + ""; return listView.ios.visibleCells[index].contentView.subviews[0].text + "";
} }
} }
@ -700,10 +700,10 @@ function getNativeViewCount(listView: listViewModule.ListView): number {
return listView.android.getChildCount(); return listView.android.getChildCount();
} }
else if (listView.ios) { else if (listView.ios) {
if (utils.ios.MajorVersion <= 8) { if (types.isFunction(listView.ios.visibleCells)) {
return listView.ios.visibleCells().count; return listView.ios.visibleCells().count;
} }
else if (utils.ios.MajorVersion > 8) { else {
return (<any>listView.ios.visibleCells).count; return (<any>listView.ios.visibleCells).count;
} }
} }

8
ui/tab-view/tab-view.ios.ts
View File

@ -82,10 +82,10 @@ export class TabViewItem extends common.TabViewItem {
var icon = this._parent._getIcon(this.iconSource); var icon = this._parent._getIcon(this.iconSource);
var tabBarItem = UITabBarItem.alloc().initWithTitleImageTag((this.title || ""), icon, this._parent.items.indexOf(this)); var tabBarItem = UITabBarItem.alloc().initWithTitleImageTag((this.title || ""), icon, this._parent.items.indexOf(this));
if (!icon) { if (!icon) {
if (utils.ios.MajorVersion <= 8) { if (types.isFunction(tabBarItem.setTitlePositionAdjustment)) {
tabBarItem.setTitlePositionAdjustment({ horizontal: 0, vertical: -20 }); tabBarItem.setTitlePositionAdjustment({ horizontal: 0, vertical: -20 });
} }
else if (utils.ios.MajorVersion > 8) { else {
(<any>tabBarItem).titlePositionAdjustment = { horizontal: 0, vertical: -20 }; (<any>tabBarItem).titlePositionAdjustment = { horizontal: 0, vertical: -20 };
} }
} }
@ -189,10 +189,10 @@ export class TabView extends common.TabView {
var tabBarItem = UITabBarItem.alloc().initWithTitleImageTag((item.title || ""), icon, i); var tabBarItem = UITabBarItem.alloc().initWithTitleImageTag((item.title || ""), icon, i);
if (!icon) { if (!icon) {
if (utils.ios.MajorVersion <= 8) { if (types.isFunction(tabBarItem.setTitlePositionAdjustment)) {
tabBarItem.setTitlePositionAdjustment({ horizontal: 0, vertical: -20 }); tabBarItem.setTitlePositionAdjustment({ horizontal: 0, vertical: -20 });
} }
else if (utils.ios.MajorVersion > 8) { else {
(<any>tabBarItem).titlePositionAdjustment = { horizontal: 0, vertical: -20 }; (<any>tabBarItem).titlePositionAdjustment = { horizontal: 0, vertical: -20 };
} }
} }