javascript/NativeScript
1
0
Fork 0
mirror of https://github.com/NativeScript/NativeScript.git synced 2025-08-16 03:31:45 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3392 from NativeScript/issue-3210

Browse Source 
Fix: SegmentedBar crash using a number as title
This commit is contained in:
Rossen Hristov
2017-01-03 12:03:41 +02:00
committed by GitHub
parent 9fdb49eae8 299cac42bf
commit 726a37cb09
3 changed files with 15 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
tests/app/ui/segmented-bar/segmented-bar-tests.ts
View File

@ -270,3 +270,14 @@ export var testSelectedIndexChangedIsRaisedCorrectlyIfItemsNotBound = function (
TKUnit.assertEqual(newSelectedIndex, 1); 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");
});
}

5
tns-core-modules/ui/segmented-bar/segmented-bar-common.ts
View File

@ -17,8 +17,9 @@ export abstract class SegmentedBarItemBase extends ViewBase implements Segmented
return this._title; return this._title;
} }
set title(value: string) { set title(value: string) {
if (this._title !== value) { let strValue = (value !== null && value !== undefined) ? value.toString() : "";
this._title = value; if (this._title !== strValue) {
this._title = strValue;
this._update(); this._update();
} }
} }

2
tns-core-modules/ui/segmented-bar/segmented-bar.android.ts
View File

@ -211,7 +211,7 @@ export class SegmentedBar extends SegmentedBarBase {
private insertTab(tabItem: SegmentedBarItem, index: number): void { private insertTab(tabItem: SegmentedBarItem, index: number): void {
const tab = this.android.newTabSpec(index + ""); const tab = this.android.newTabSpec(index + "");
tab.setIndicator(tabItem.title); tab.setIndicator(tabItem.title + "");
tab.setContent(this.tabContentFactory); tab.setContent(this.tabContentFactory);
let tabHost = this.android; let tabHost = this.android;