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 #760 from NativeScript/nnikolov/iOS9ChangedAPIIsues

Browse Source 
Added some checks according to changed iOS9 API.
This commit is contained in:
Nedyalko Nikolov
2015-09-28 10:16:10 +03:00
parent ac671654c9 cfe19f1c17
commit 7ad18c559d
2 changed files with 24 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -675,7 +675,12 @@ 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) {
return listView.ios.visibleCells()[index].contentView.subviews[0].text + ""; if (utils.ios.MajorVersion <= 8) {
return listView.ios.visibleCells()[index].contentView.subviews[0].text + "";
}
else if (utils.ios.MajorVersion > 8) {
return listView.ios.visibleCells[index].contentView.subviews[0].text + "";
}
} }
} }
@ -684,7 +689,12 @@ function getNativeViewCount(listView: listViewModule.ListView): number {
return listView.android.getChildCount(); return listView.android.getChildCount();
} }
else if (listView.ios) { else if (listView.ios) {
return listView.ios.visibleCells().count; if (utils.ios.MajorVersion <= 8) {
return listView.ios.visibleCells().count;
}
else if (utils.ios.MajorVersion > 8) {
return (<any>listView.ios.visibleCells).count;
}
} }
else { else {
throw new Error("Cannot get native view count"); throw new Error("Cannot get native view count");

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

@ -82,7 +82,12 @@ 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) {
tabBarItem.setTitlePositionAdjustment({ horizontal: 0, vertical: -20 }); if (utils.ios.MajorVersion <= 8) {
tabBarItem.setTitlePositionAdjustment({ horizontal: 0, vertical: -20 });
}
else if (utils.ios.MajorVersion > 8) {
(<any>tabBarItem).titlePositionAdjustment = { horizontal: 0, vertical: -20 };
}
} }
this._controller.tabBarItem = tabBarItem; this._controller.tabBarItem = tabBarItem;
} }
@ -184,7 +189,12 @@ 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) {
tabBarItem.setTitlePositionAdjustment({ horizontal: 0, vertical: -20 }); if (utils.ios.MajorVersion <= 8) {
tabBarItem.setTitlePositionAdjustment({ horizontal: 0, vertical: -20 });
}
else if (utils.ios.MajorVersion > 8) {
(<any>tabBarItem).titlePositionAdjustment = { horizontal: 0, vertical: -20 };
}
} }
newController.tabBarItem = tabBarItem; newController.tabBarItem = tabBarItem;
newControllers.addObject(newController); newControllers.addObject(newController);