From 6f04b101107ed899d672e47156ef1dddf943ebae Mon Sep 17 00:00:00 2001 From: vakrilov Date: Wed, 25 Mar 2015 13:39:35 +0200 Subject: [PATCH] Segment-bar safety fix --- apps/TelerikNEXT/TelerikUI/side-bar/side-bar.android.ts | 2 +- ui/segmented-bar/segmented-bar.android.ts | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/apps/TelerikNEXT/TelerikUI/side-bar/side-bar.android.ts b/apps/TelerikNEXT/TelerikUI/side-bar/side-bar.android.ts index fad88e29d..c37ddff4a 100644 --- a/apps/TelerikNEXT/TelerikUI/side-bar/side-bar.android.ts +++ b/apps/TelerikNEXT/TelerikUI/side-bar/side-bar.android.ts @@ -37,7 +37,7 @@ function onSlideContentWidthPropertyChanged(data: dependencyObservable.PropertyC export class SideBar extends common.SideBar { public _createUI() { - this._android = new com.telerik.android.primitives.widget.sidedrawer.SideDrawer(this._context); + this._android = new com.telerik.android.primitives.widget.sidedrawer.RadSideDrawer(this._context); this._android.setDrawerSize(utils.layout.getDisplayDensity() * 280); if (this.mainContent instanceof view.View) { diff --git a/ui/segmented-bar/segmented-bar.android.ts b/ui/segmented-bar/segmented-bar.android.ts index 367e66211..6aaa79d54 100644 --- a/ui/segmented-bar/segmented-bar.android.ts +++ b/ui/segmented-bar/segmented-bar.android.ts @@ -57,7 +57,7 @@ function onItemsPropertyChanged(data: dependencyObservable.PropertyChangeData) { view.android.addTab(tab); } - if (view.android.getCurrentTab() !== view.selectedIndex) { + if (types.isNumber(view.selectedIndex) && view.android.getCurrentTab() !== view.selectedIndex) { view.android.setCurrentTab(view.selectedIndex); } @@ -107,7 +107,7 @@ export class SegmentedBar extends common.SegmentedBar { public _createUI() { this._android = new OurTabHost(this._context, null); - if (this._android.getCurrentTab() !== this.selectedIndex) { + if (types.isNumber(this.selectedIndex) && this._android.getCurrentTab() !== this.selectedIndex) { this._android.setCurrentTab(this.selectedIndex); }