Skip to content

Commit e151c4d

Browse files
author
Hristo Hristov
authored
Fix TabView args.object for selectedIndexChangedEvent (#3800)
Add assert in existing test Code formatting
1 parent 7b5ef05 commit e151c4d

File tree

3 files changed

+5
-5
lines changed

3 files changed

+5
-5
lines changed

tests/app/ui/tab-view/tab-view-tests.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -271,6 +271,7 @@ export class TabViewTest extends testModule.UITest<tabViewModule.TabView> {
271271
tabView.on(tabViewModule.TabView.selectedIndexChangedEvent, (args: tabViewModule.SelectedIndexChangedEventData) => {
272272
actualOldIndex = args.oldIndex;
273273
actualNewIndex = args.newIndex;
274+
TKUnit.assertEqual(args.object, tabView, "args.object should be TabView")
274275
});
275276

276277
tabView.selectedIndex = expectedNewIndex;

tns-core-modules/ui/tab-view/tab-view-common.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -171,7 +171,7 @@ export class TabViewBase extends View implements TabViewDefinition, AddChildFrom
171171
export const selectedIndexProperty = new CoercibleProperty<TabViewBase, number>({
172172
name: "selectedIndex", defaultValue: -1, affectsLayout: isIOS,
173173
valueChanged: (target, oldValue, newValue) => {
174-
target.notify(<SelectedIndexChangedEventData>{ eventName: TabViewBase.selectedIndexChangedEvent, object: this, oldIndex: oldValue, newIndex: newValue });
174+
target.notify(<SelectedIndexChangedEventData>{ eventName: TabViewBase.selectedIndexChangedEvent, object: target, oldIndex: oldValue, newIndex: newValue });
175175
},
176176
coerceValue: (target, value) => {
177177
let items = target.items;

tns-core-modules/ui/time-picker/time-picker-common.ts

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -106,8 +106,7 @@ export var hourProperty = new Property<TimePickerBase, number>({
106106
// picker._setNativeTime();
107107
if (picker.time) {
108108
picker.time.setHours(picker.hour);
109-
}
110-
else {
109+
} else {
111110
picker.time = new Date(0, 0, 0, picker.hour, picker.minute);
112111
}
113112
} else {
@@ -136,6 +135,7 @@ export var maxHourProperty = new Property<TimePickerBase, number>({
136135
if (!isHourValid(newValue)) {
137136
throw new Error(getErrorMessage(picker, "maxHour", newValue));
138137
}
138+
139139
if (isValidTime(picker)) {
140140
// picker._setNativeMaxTime();
141141
} else {
@@ -155,8 +155,7 @@ export var minuteProperty = new Property<TimePickerBase, number>({
155155
// picker._setNativeTime();
156156
if (picker.time) {
157157
picker.time.setMinutes(picker.minute);
158-
}
159-
else {
158+
} else {
160159
picker.time = new Date(0, 0, 0, picker.hour, picker.minute);
161160
}
162161
} else {

0 commit comments

Comments
 (0)