Merge pull request NativeScript#3266 from NativeScript/issue-3210

hamorphis · web-flow · commit 876752257dda · 2017-01-03T10:24:34.000+02:00
Fix: SegmentedBar crash using a number as title
diff --git a/tests/app/ui/segmented-bar/segmented-bar-tests.ts b/tests/app/ui/segmented-bar/segmented-bar-tests.ts
@@ -270,3 +270,14 @@ export var testSelectedIndexChangedIsRaisedCorrectlyIfItemsNotBound = function (
         TKUnit.assertEqual(newSelectedIndex, 1);
     });
 }
+
+export function test_SettingNumberAsTitleFromXML_DoesNotThrow() {
+    let segmentedBar = new segmentedBarModule.SegmentedBar();
+    let item = new segmentedBarModule.SegmentedBarItem();
+    (<any>item).title = 1;
+    segmentedBar.items = [item];
+    
+    buildUIAndRunTest(segmentedBar, function (views: Array<View>) {
+        TKUnit.assertEqual(item.title, "1");
+    });
+}
diff --git a/tns-core-modules/ui/segmented-bar/segmented-bar-common.ts b/tns-core-modules/ui/segmented-bar/segmented-bar-common.ts
@@ -28,8 +28,9 @@ export class SegmentedBarItem extends bindable.Bindable implements definition.Se
     }
 
     set title(value: string) {
-        if (this._title !== value) {
-            this._title = value;
+        let strValue = (value !== null && value !== undefined) ? value.toString() : "";
+        if (this._title !== strValue) {
+            this._title = strValue;
             this._update();
         }
     }
diff --git a/tns-core-modules/ui/segmented-bar/segmented-bar.android.ts b/tns-core-modules/ui/segmented-bar/segmented-bar.android.ts
@@ -110,7 +110,7 @@ export class SegmentedBarItem extends common.SegmentedBarItem {
             var tabIndex = this._parent.items.indexOf(this);
             var titleTextViewId = 16908310; // http://developer.android.com/reference/android/R.id.html#title
             var titleTextView = <android.widget.TextView>this._parent.android.getTabWidget().getChildAt(tabIndex).findViewById(titleTextViewId);
-            titleTextView.setText(this.title || "");
+            titleTextView.setText(this.title + "");
         }
     }
 }
@@ -162,7 +162,7 @@ export class SegmentedBar extends common.SegmentedBar {
         tabItem._parent = this;
 
         var tab = this.android.newTabSpec(this.getValidIndex(index) + "");
-        tab.setIndicator(tabItem.title || "");
+        tab.setIndicator(tabItem.title + "");
         let that = this;
         tab.setContent(new android.widget.TabHost.TabContentFactory({
             createTabContent: function (tag: string): android.view.View {

Original file line number	Diff line number	Diff line change
`@@ -28,8 +28,9 @@ export class SegmentedBarItem extends bindable.Bindable implements definition.Se`
`28`	`28`	`}`
`29`	`29`
`30`	`30`	`set title(value: string) {`
`31`		`- if (this._title !== value) {`
`32`		`- this._title = value;`
	`31`	`+ let strValue = (value !== null && value !== undefined) ? value.toString() : "";`
	`32`	`+ if (this._title !== strValue) {`
	`33`	`+ this._title = strValue;`
`33`	`34`	`this._update();`
`34`	`35`	`}`
`35`	`36`	`}`
Original file line number	Diff line number	Diff line change
`@@ -110,7 +110,7 @@ export class SegmentedBarItem extends common.SegmentedBarItem {`
`110`	`110`	`var tabIndex = this._parent.items.indexOf(this);`
`111`	`111`	`var titleTextViewId = 16908310; // http://developer.android.com/reference/android/R.id.html#title`
`112`	`112`	`var titleTextView = <android.widget.TextView>this._parent.android.getTabWidget().getChildAt(tabIndex).findViewById(titleTextViewId);`
`113`		`- titleTextView.setText(this.title \|\| "");`
	`113`	`+ titleTextView.setText(this.title + "");`
`114`	`114`	`}`
`115`	`115`	`}`
`116`	`116`	`}`
`@@ -162,7 +162,7 @@ export class SegmentedBar extends common.SegmentedBar {`
`162`	`162`	`tabItem._parent = this;`
`163`	`163`
`164`	`164`	`var tab = this.android.newTabSpec(this.getValidIndex(index) + "");`
`165`		`- tab.setIndicator(tabItem.title \|\| "");`
	`165`	`+ tab.setIndicator(tabItem.title + "");`
`166`	`166`	`let that = this;`
`167`	`167`	`tab.setContent(new android.widget.TabHost.TabContentFactory({`
`168`	`168`	`createTabContent: function (tag: string): android.view.View {`