From 6a176516180326424fa00af5f0d79648977dadb2 Mon Sep 17 00:00:00 2001 From: Vladimir Enchev Date: Tue, 6 Oct 2015 15:41:37 +0300 Subject: [PATCH] ios9 fixes --- apps/tests/ui/list-view/list-view-tests.ts | 8 ++++---- ui/tab-view/tab-view.ios.ts | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/apps/tests/ui/list-view/list-view-tests.ts b/apps/tests/ui/list-view/list-view-tests.ts index 90290872c1..830661dd18 100644 --- a/apps/tests/ui/list-view/list-view-tests.ts +++ b/apps/tests/ui/list-view/list-view-tests.ts @@ -686,10 +686,10 @@ function getTextFromNativeElementAt(listView: listViewModule.ListView, index: nu return (nativeElement).getText() + ""; } else if (listView.ios) { - if (utils.ios.MajorVersion <= 8) { + if (types.isFunction(listView.ios.visibleCells)) { 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 + ""; } } @@ -700,10 +700,10 @@ function getNativeViewCount(listView: listViewModule.ListView): number { return listView.android.getChildCount(); } else if (listView.ios) { - if (utils.ios.MajorVersion <= 8) { + if (types.isFunction(listView.ios.visibleCells)) { return listView.ios.visibleCells().count; } - else if (utils.ios.MajorVersion > 8) { + else { return (listView.ios.visibleCells).count; } } diff --git a/ui/tab-view/tab-view.ios.ts b/ui/tab-view/tab-view.ios.ts index f56455e7b6..89d460851a 100644 --- a/ui/tab-view/tab-view.ios.ts +++ b/ui/tab-view/tab-view.ios.ts @@ -82,10 +82,10 @@ export class TabViewItem extends common.TabViewItem { var icon = this._parent._getIcon(this.iconSource); var tabBarItem = UITabBarItem.alloc().initWithTitleImageTag((this.title || ""), icon, this._parent.items.indexOf(this)); if (!icon) { - if (utils.ios.MajorVersion <= 8) { + if (types.isFunction(tabBarItem.setTitlePositionAdjustment)) { tabBarItem.setTitlePositionAdjustment({ horizontal: 0, vertical: -20 }); } - else if (utils.ios.MajorVersion > 8) { + else { (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); if (!icon) { - if (utils.ios.MajorVersion <= 8) { + if (types.isFunction(tabBarItem.setTitlePositionAdjustment)) { tabBarItem.setTitlePositionAdjustment({ horizontal: 0, vertical: -20 }); } - else if (utils.ios.MajorVersion > 8) { + else { (tabBarItem).titlePositionAdjustment = { horizontal: 0, vertical: -20 }; } }