javascript/NativeScript
1
0
Fork 0
mirror of https://github.com/NativeScript/NativeScript.git synced 2025-11-05 13:26:48 +08:00
Code Issues Packages Projects Releases Wiki Activity

Replace knownEvents modules with static strings.

Browse Source
This commit is contained in:
Nedyalko Nikolov
2015-04-23 15:47:56 +03:00
parent 8023390692
commit 95ca8d9c8c
101 changed files with 520 additions and 471 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
apps/tests/ui/bindable-tests.ts
View File

@@ -190,7 +190,7 @@ export var test_WhenBindingIsSetToAnElement_AndElementIsRemoved_ShouldBeCollecte
var sourcePropertyName = "testProperty";
var targetPropertyName = "text";
page.on(viewModule.knownEvents.loaded, () => {
page.on(viewModule.View.loadedEvent, () => {
var model = new observable.Observable();
model.set(sourcePropertyName, expectedValue);

2
apps/tests/ui/button/button-tests.ts
View File

@@ -120,7 +120,7 @@ var _testOnClick = function (views: Array<viewModule.View>) {
// <snippet module="ui/button" title="button">
// ### Responding to the tap event
// ``` JavaScript
button.on(buttonModule.knownEvents.tap, function (args: observable.EventData) {
button.on(buttonModule.Button.tapEvent, function (args: observable.EventData) {
//// Do something
// <hide>
actualValue = true;

6
apps/tests/ui/dependency-observable-tests.ts
View File

@@ -31,7 +31,7 @@ function validateDOChangeData(obj: TestDO, property: dependencyObservableModule.
TKUnit.assert(currentChangeData.property === property, "metadata.onValueChanged method called with wrong property member");
TKUnit.assert(currentChangeData.newValue === newValue, "metadata.onValueChanged method called with wrong newValue member");
TKUnit.assert(currentChangeData.oldValue === oldValue, "metadata.onValueChanged method called with wrong oldValue member");
TKUnit.assert(currentChangeData.eventName === observableModule.knownEvents.propertyChange, "metadata.onValueChanged method called with wrong eventName member");
TKUnit.assert(currentChangeData.eventName === observableModule.Observable.propertyChangeEvent, "metadata.onValueChanged method called with wrong eventName member");
}
function validateChangeData(data: observableModule.PropertyChangeData, obj: observableModule.Observable, propertyName: string, newValue: any) {
@@ -39,7 +39,7 @@ function validateChangeData(data: observableModule.PropertyChangeData, obj: obse
TKUnit.assert(data.object === obj, "DependencyObservable.on called with wrong object member.");
TKUnit.assert(data.propertyName === propertyName, "DependencyObservable.on called with wrong propertyName member");
TKUnit.assert(data.value === newValue, "DependencyObservable.on called with wrong value member");
TKUnit.assert(data.eventName === observableModule.knownEvents.propertyChange, "DependencyObservable.on method called with wrong eventName member");
TKUnit.assert(data.eventName === observableModule.Observable.propertyChangeEvent, "DependencyObservable.on method called with wrong eventName member");
}
// <snippet module="ui/core/dependency-observable" title="dependency-observable">
@@ -342,7 +342,7 @@ export function test_Observable_on_propertyChange_IsRaised() {
var dO1 = new TestDO();
var changeData: observableModule.PropertyChangeData;
dO1.on(observableModule.knownEvents.propertyChange, function (data: observableModule.PropertyChangeData) {
dO1.on(observableModule.Observable.propertyChangeEvent, function (data: observableModule.PropertyChangeData) {
changeData = data;
});

34
apps/tests/ui/list-view/list-view-tests.ts
View File

@@ -105,7 +105,7 @@ export function test_set_items_to_array_loads_all_items() {
// ``` JavaScript
var colors = ["red", "green", "blue"];
listView.items = colors;
listView.on(listViewModule.knownEvents.itemLoading, function (args: listViewModule.ItemEventData) {
listView.on(listViewModule.ListView.itemLoadingEvent, function (args: listViewModule.ItemEventData) {
if (!args.view) {
//// Create label if it is not already created.
args.view = new labelModule.Label();
@@ -130,7 +130,7 @@ export function test_set_items_to_array_loads_all_items() {
export function test_set_items_to_array_creates_native_views() {
var listView = new listViewModule.ListView();
listView.on(listViewModule.knownEvents.itemLoading, loadViewWithItemNumber);
listView.on(listViewModule.ListView.itemLoadingEvent, loadViewWithItemNumber);
function testAction(views: Array<viewModule.View>) {
listView.items = FEW_ITEMS;
@@ -145,7 +145,7 @@ export function test_set_items_to_array_creates_native_views() {
export function test_refresh_after_adding_items_to_array_loads_new_items() {
var listView = new listViewModule.ListView();
listView.on(listViewModule.knownEvents.itemLoading, loadViewWithItemNumber);
listView.on(listViewModule.ListView.itemLoadingEvent, loadViewWithItemNumber);
function testAction(views: Array<viewModule.View>) {
var colors = ["red", "green", "blue"];
@@ -176,7 +176,7 @@ export function test_refresh_reloads_all_items() {
var indexes = {};
var testStarted = false;
listView.items = FEW_ITEMS;
listView.on(listViewModule.knownEvents.itemLoading, function (args: listViewModule.ItemEventData) {
listView.on(listViewModule.ListView.itemLoadingEvent, function (args: listViewModule.ItemEventData) {
if (!args.view) {
args.view = new labelModule.Label();
}
@@ -202,7 +202,7 @@ export function test_refresh_reloads_all_items() {
export function test_set_itmes_to_null_clears_native_items() {
var listView = new listViewModule.ListView();
listView.on(listViewModule.knownEvents.itemLoading, loadViewWithItemNumber);
listView.on(listViewModule.ListView.itemLoadingEvent, loadViewWithItemNumber);
function testAction(views: Array<viewModule.View>) {
listView.items = FEW_ITEMS;
@@ -219,7 +219,7 @@ export function test_set_itmes_to_null_clears_native_items() {
export function test_set_itmes_to_undefiend_clears_native_items() {
var listView = new listViewModule.ListView();
listView.on(listViewModule.knownEvents.itemLoading, loadViewWithItemNumber);
listView.on(listViewModule.ListView.itemLoadingEvent, loadViewWithItemNumber);
function testAction(views: Array<viewModule.View>) {
listView.items = FEW_ITEMS;
@@ -236,7 +236,7 @@ export function test_set_itmes_to_undefiend_clears_native_items() {
export function test_set_itmes_to_different_source_loads_new_items() {
var listView = new listViewModule.ListView();
listView.on(listViewModule.knownEvents.itemLoading, loadViewWithItemNumber);
listView.on(listViewModule.ListView.itemLoadingEvent, loadViewWithItemNumber);
function testAction(views: Array<viewModule.View>) {
listView.items = [1, 2, 3];
@@ -261,7 +261,7 @@ export function test_set_items_to_observable_array_loads_all_items() {
// ``` JavaScript
var colors = new observableArray.ObservableArray(["red", "green", "blue"]);
listView.items = colors;
listView.on(listViewModule.knownEvents.itemLoading, function (args: listViewModule.ItemEventData) {
listView.on(listViewModule.ListView.itemLoadingEvent, function (args: listViewModule.ItemEventData) {
if (!args.view) {
//// Create label if it is not already created.
args.view = new labelModule.Label();
@@ -284,7 +284,7 @@ export function test_set_items_to_observable_array_loads_all_items() {
export function test_add_to_observable_array_refreshes_the_listview() {
var listView = new listViewModule.ListView();
listView.on(listViewModule.knownEvents.itemLoading, loadViewWithItemNumber);
listView.on(listViewModule.ListView.itemLoadingEvent, loadViewWithItemNumber);
function testAction(views: Array<viewModule.View>) {
var colors = new observableArray.ObservableArray(["red", "green", "blue"]);
@@ -314,7 +314,7 @@ export function test_remove_from_observable_array_refreshes_the_listview() {
function testAction(views: Array<viewModule.View>) {
listView.items = data;
listView.on(listViewModule.knownEvents.itemLoading, loadViewWithItemNumber);
listView.on(listViewModule.ListView.itemLoadingEvent, loadViewWithItemNumber);
TKUnit.wait(ASYNC);
TKUnit.assertEqual(getNativeViewCount(listView), 3, "getNativeViewCount");
@@ -334,7 +334,7 @@ export function test_splice_observable_array_refreshes_the_listview() {
function testAction(views: Array<viewModule.View>) {
listView.items = data;
listView.on(listViewModule.knownEvents.itemLoading, loadViewWithItemNumber);
listView.on(listViewModule.ListView.itemLoadingEvent, loadViewWithItemNumber);
TKUnit.wait(ASYNC);
TKUnit.assertEqual(getNativeViewCount(listView), 3, "getNativeViewCount");
@@ -350,7 +350,7 @@ export function test_splice_observable_array_refreshes_the_listview() {
}
export function test_nativeTap_is_raised() {
var listView = new listViewModule.ListView();
listView.on(listViewModule.knownEvents.itemLoading, loadViewWithItemNumber);
listView.on(listViewModule.ListView.itemLoadingEvent, loadViewWithItemNumber);
listView.items = FEW_ITEMS;
function testAction(views: Array<viewModule.View>) {
@@ -362,7 +362,7 @@ export function test_nativeTap_is_raised() {
// ### ItemTap event
// The event will be raise when an item inside the ListView is tapped.
// ``` JavaScript
listView.on(listViewModule.knownEvents.itemTap, function (args: listViewModule.ItemEventData) {
listView.on(listViewModule.ListView.itemTapEvent, function (args: listViewModule.ItemEventData) {
var tappedItemIndex = args.index;
var tappedItemView = args.view;
//// Do someting
@@ -390,13 +390,13 @@ export function test_loadMoreItems_raised_when_showing_few_items() {
function testAction(views: Array<viewModule.View>) {
var loadMoreItemsCount = 0;
listView.items = FEW_ITEMS;
listView.on(listViewModule.knownEvents.itemLoading, loadViewWithItemNumber);
listView.on(listViewModule.ListView.itemLoadingEvent, loadViewWithItemNumber);
// <snippet module="ui/list-view" title="list-view">
// ### LoadMoreItems event
// The event will be raised when the ListView is scrolled so that the last item is visible.
// This even is intended to be used to add additional data in the ListView.
// ``` JavaScript
listView.on(listViewModule.knownEvents.loadMoreItems, function (data: observable.EventData) {
listView.on(listViewModule.ListView.loadMoreItemsEvent, function (data: observable.EventData) {
//// Do something.
//<hide>
loadMoreItemsCount++;
@@ -413,12 +413,12 @@ export function test_loadMoreItems_raised_when_showing_few_items() {
export function test_loadMoreItems_not_raised_when_showing_many_items() {
var listView = new listViewModule.ListView();
listView.on(listViewModule.knownEvents.itemLoading, loadViewWithItemNumber);
listView.on(listViewModule.ListView.itemLoadingEvent, loadViewWithItemNumber);
function testAction(views: Array<viewModule.View>) {
var loadMoreItemsCount = 0;
listView.items = MANY_ITEMS;
listView.on(listViewModule.knownEvents.loadMoreItems, function (data: observable.EventData) {
listView.on(listViewModule.ListView.loadMoreItemsEvent, function (data: observable.EventData) {
loadMoreItemsCount++;
});

54
apps/tests/ui/observable-tests.ts
View File

@@ -47,7 +47,7 @@ export var tests_DummyTestForCodeSnippet = function () {
person.set("Name", "John");
person.set("Age", 34);
person.set("Married", true);
person.addEventListener(observable.knownEvents.propertyChange, function (pcd: observable.PropertyChangeData) {
person.addEventListener(observable.Observable.propertyChangeEvent, function (pcd: observable.PropertyChangeData) {
//console.log(pcd.eventName.toString() + " " + pcd.propertyName.toString() + " " + pcd.value.toString());
});
person.set("Age", 35);
@@ -83,7 +83,7 @@ export var test_Observable_UpdateAnotherPropertyWithinChangedCallback = function
}
}
obj.addEventListener(observable.knownEvents.propertyChange, changedCallback);
obj.addEventListener(observable.Observable.propertyChangeEvent, changedCallback);
obj.set("name", "Initial name");
obj.set("test", "Initial test");
@@ -143,13 +143,13 @@ export var test_Observable_addEventListener_SingleEvent = function () {
var receivedCount = 0;
var callback = function (data: observable.PropertyChangeData) {
receivedCount++;
TKUnit.assert(data.eventName === observable.knownEvents.propertyChange, "Expected event name " + observable.knownEvents.propertyChange);
TKUnit.assert(data.eventName === observable.Observable.propertyChangeEvent, "Expected event name " + observable.Observable.propertyChangeEvent);
TKUnit.assert(data.object === obj, "PropertyChangeData.object value not valid.");
TKUnit.assert(data.propertyName === "testName", "PropertyChangeData.propertyName value not valid.");
TKUnit.assert(data.value === 1, "PropertyChangeData.value value not valid.");
}
obj.addEventListener(observable.knownEvents.propertyChange, callback);
obj.addEventListener(observable.Observable.propertyChangeEvent, callback);
obj.set("testName", 1);
TKUnit.assert(receivedCount === 1, "PropertyChanged event not raised properly.");
}
@@ -162,9 +162,9 @@ export var test_Observable_addEventListener_MultipleEvents = function () {
receivedCount++;
TKUnit.assert(data.object === obj, "EventData.object value not valid.");
if (data.eventName === observable.knownEvents.propertyChange) {
if (data.eventName === observable.Observable.propertyChangeEvent) {
var propertyData = <observable.PropertyChangeData>data;
TKUnit.assert(propertyData.eventName === observable.knownEvents.propertyChange, "Expected event name " + observable.knownEvents.propertyChange);
TKUnit.assert(propertyData.eventName === observable.Observable.propertyChangeEvent, "Expected event name " + observable.Observable.propertyChangeEvent);
TKUnit.assert(propertyData.propertyName === "testName", "PropertyChangeData.propertyName value not valid.");
TKUnit.assert(propertyData.value === 1, "PropertyChangeData.value value not valid.");
} else {
@@ -172,7 +172,7 @@ export var test_Observable_addEventListener_MultipleEvents = function () {
}
}
var events = observable.knownEvents.propertyChange + "," + TESTED_NAME;
var events = observable.Observable.propertyChangeEvent + "," + TESTED_NAME;
obj.addEventListener(events, callback);
obj.set("testName", 1);
obj.test();
@@ -187,9 +187,9 @@ export var test_Observable_addEventListener_MultipleEvents_ShouldTrim = function
receivedCount++;
}
var events = observable.knownEvents.propertyChange + " , " + TESTED_NAME;
var events = observable.Observable.propertyChangeEvent + " , " + TESTED_NAME;
obj.addEventListener(events, callback);
TKUnit.assert(obj.hasListeners(observable.knownEvents.propertyChange), "Observable.addEventListener for multiple events should trim each event name.");
TKUnit.assert(obj.hasListeners(observable.Observable.propertyChangeEvent), "Observable.addEventListener for multiple events should trim each event name.");
TKUnit.assert(obj.hasListeners(TESTED_NAME), "Observable.addEventListener for multiple events should trim each event name.");
obj.set("testName", 1);
@@ -210,8 +210,8 @@ export var test_Observable_addEventListener_MultipleCallbacks = function () {
receivedCount++;
}
obj.addEventListener(observable.knownEvents.propertyChange, callback1);
obj.addEventListener(observable.knownEvents.propertyChange, callback2);
obj.addEventListener(observable.Observable.propertyChangeEvent, callback1);
obj.addEventListener(observable.Observable.propertyChangeEvent, callback2);
obj.set("testName", 1);
TKUnit.assert(receivedCount === 2, "The propertyChanged notification should be raised twice.");
@@ -229,7 +229,7 @@ export var test_Observable_addEventListener_MultipleCallbacks_MultipleEvents = f
receivedCount++;
}
var events = observable.knownEvents.propertyChange + " , " + TESTED_NAME;
var events = observable.Observable.propertyChangeEvent + " , " + TESTED_NAME;
obj.addEventListener(events, callback1);
obj.addEventListener(events, callback2);
@@ -247,11 +247,11 @@ export var test_Observable_removeEventListener_SingleEvent_SingleCallback = func
receivedCount++;
}
obj.addEventListener(observable.knownEvents.propertyChange, callback);
obj.addEventListener(observable.Observable.propertyChangeEvent, callback);
obj.set("testName", 1);
obj.removeEventListener(observable.knownEvents.propertyChange, callback);
TKUnit.assert(!obj.hasListeners(observable.knownEvents.propertyChange), "Observable.removeEventListener not working properly.");
obj.removeEventListener(observable.Observable.propertyChangeEvent, callback);
TKUnit.assert(!obj.hasListeners(observable.Observable.propertyChangeEvent), "Observable.removeEventListener not working properly.");
obj.set("testName", 2);
TKUnit.assert(receivedCount === 1, "Observable.removeEventListener not working properly.");
@@ -269,18 +269,18 @@ export var test_Observable_removeEventListener_SingleEvent_MultipleCallbacks = f
receivedCount++;
}
obj.addEventListener(observable.knownEvents.propertyChange, callback1);
obj.addEventListener(observable.knownEvents.propertyChange, callback2);
obj.addEventListener(observable.Observable.propertyChangeEvent, callback1);
obj.addEventListener(observable.Observable.propertyChangeEvent, callback2);
obj.set("testName", 1);
obj.removeEventListener(observable.knownEvents.propertyChange, callback1);
TKUnit.assert(obj.hasListeners(observable.knownEvents.propertyChange), "Observable.removeEventListener not working properly with multiple listeners.");
obj.removeEventListener(observable.Observable.propertyChangeEvent, callback1);
TKUnit.assert(obj.hasListeners(observable.Observable.propertyChangeEvent), "Observable.removeEventListener not working properly with multiple listeners.");
obj.set("testName", 2);
TKUnit.assert(receivedCount === 3, "Observable.removeEventListener not working properly with multiple listeners.");
obj.removeEventListener(observable.knownEvents.propertyChange, callback2);
TKUnit.assert(!obj.hasListeners(observable.knownEvents.propertyChange), "Observable.removeEventListener not working properly with multiple listeners.");
obj.removeEventListener(observable.Observable.propertyChangeEvent, callback2);
TKUnit.assert(!obj.hasListeners(observable.Observable.propertyChangeEvent), "Observable.removeEventListener not working properly with multiple listeners.");
obj.set("testName", 3);
TKUnit.assert(receivedCount === 3, "Observable.removeEventListener not working properly with multiple listeners.");
@@ -294,7 +294,7 @@ export var test_Observable_removeEventListener_MutlipleEvents_SingleCallback = f
receivedCount++;
}
var events = observable.knownEvents.propertyChange + " , " + TESTED_NAME;
var events = observable.Observable.propertyChangeEvent + " , " + TESTED_NAME;
obj.addEventListener(events, callback);
obj.set("testName", 1);
@@ -302,7 +302,7 @@ export var test_Observable_removeEventListener_MutlipleEvents_SingleCallback = f
obj.removeEventListener(events, callback);
TKUnit.assert(!obj.hasListeners(observable.knownEvents.propertyChange), "Expected result for hasObservers is false");
TKUnit.assert(!obj.hasListeners(observable.Observable.propertyChangeEvent), "Expected result for hasObservers is false");
TKUnit.assert(!obj.hasListeners(TESTED_NAME), "Expected result for hasObservers is false.");
obj.set("testName", 2);
@@ -323,13 +323,13 @@ export var test_Observable_removeEventListener_SingleEvent_NoCallbackSpecified =
receivedCount++;
}
obj.addEventListener(observable.knownEvents.propertyChange, callback1);
obj.addEventListener(observable.knownEvents.propertyChange, callback2);
obj.addEventListener(observable.Observable.propertyChangeEvent, callback1);
obj.addEventListener(observable.Observable.propertyChangeEvent, callback2);
obj.set("testName", 1);
obj.removeEventListener(observable.knownEvents.propertyChange);
obj.removeEventListener(observable.Observable.propertyChangeEvent);
TKUnit.assert(!obj.hasListeners(observable.knownEvents.propertyChange), "Expected result for hasObservers is false.");
TKUnit.assert(!obj.hasListeners(observable.Observable.propertyChangeEvent), "Expected result for hasObservers is false.");
obj.set("testName", 2);
TKUnit.assert(receivedCount === 2, "Expected receive count is 2");

8
apps/tests/ui/page/page-tests-common.ts
View File

@@ -125,7 +125,7 @@ export function test_AfterPageLoaded_is_called_NativeInstance_is_created() {
var pageFactory = function (): PageModule.Page {
page = new PageModule.Page();
page.on(view.knownEvents.loaded, handler);
page.on(view.View.loadedEvent, handler);
label = new LabelModule.Label();
label.text = "Text";
@@ -139,7 +139,7 @@ export function test_AfterPageLoaded_is_called_NativeInstance_is_created() {
TKUnit.assert(nativeInstanceCreated, "Expected: true, Actual: " + nativeInstanceCreated);
}
finally {
page.off(view.knownEvents.loaded, handler);
page.off(view.View.loadedEvent, handler);
helper.goBack();
}
}
@@ -166,7 +166,7 @@ export function test_PageLoaded_is_called_once() {
var pageFactory2 = function (): PageModule.Page {
page2 = new PageModule.Page();
addLabelToPage(page2, "Page 2");
page2.on(view.knownEvents.loaded, handler);
page2.on(view.View.loadedEvent, handler);
return page2;
};
@@ -176,7 +176,7 @@ export function test_PageLoaded_is_called_once() {
TKUnit.assert(loaded === 1, "Expected: 1, Actual: " + loaded);
}
finally {
page2.off(view.knownEvents.loaded, handler);
page2.off(view.View.loadedEvent, handler);
helper.goBack();
helper.goBack();
}

6
apps/tests/ui/page/page-tests.ios.ts
View File

@@ -33,13 +33,13 @@ export function test_NavBar_isVisible_when_MenuItems_areSet() {
var navBarIsVisible = false;
var handler = function (data) {
page.off(view.knownEvents.loaded, handler);
page.off(view.View.loadedEvent, handler);
navBarIsVisible = (<any>page.frame.ios).showNavigationBar;
}
var pageFactory = function (): PageModule.Page {
page = new PageModule.Page();
page.on(view.knownEvents.loaded, handler);
page.on(view.View.loadedEvent, handler);
var mi = new PageModule.MenuItem();
mi.text = "B";
@@ -56,7 +56,7 @@ export function test_NavBar_isVisible_when_MenuItems_areSet() {
TKUnit.assert(navBarIsVisible, "Expected: true, Actual: " + navBarIsVisible);
}
finally {
page.off(view.knownEvents.loaded, handler);
page.off(view.View.loadedEvent, handler);
helper.goBack();
}
}

4
apps/tests/ui/progress/progress-tests.ts
View File

@@ -99,14 +99,14 @@ export function test_property_changed_event_when_setting_maxValue_with_adjust()
function testAction(views: Array<viewModule.View>) {
var changedProperties = {};
var allChanges = 0;
progress.on(observable.knownEvents.propertyChange, function (data: observable.EventData) {
progress.on(observable.Observable.propertyChangeEvent, function (data: observable.EventData) {
allChanges++;
changedProperties[(<observable.PropertyChangeData>data).propertyName] = true;
});
// Act
progress.maxValue = 40;
progress.off(observable.knownEvents.propertyChange);
progress.off(observable.Observable.propertyChangeEvent);
// Assert
TKUnit.assert(changedProperties["value"], "Property changed for 'value' not called.");

4
apps/tests/ui/search-bar/search-bar-tests.ts
View File

@@ -20,10 +20,10 @@ export function test_DummyTestForSnippetOnly() {
// ### Searching
// ``` JavaScript
var searchBar = new searchBarModule.SearchBar();
searchBar.on(searchBarModule.knownEvents.submit, function (args: observable.EventData) {
searchBar.on(searchBarModule.SearchBar.submitEvent, function (args: observable.EventData) {
console.log("Search for " + (<searchBarModule.SearchBar>args.object).text);
});
searchBar.on(searchBarModule.knownEvents.clear, function (args: observable.EventData) {
searchBar.on(searchBarModule.SearchBar.clearEvent, function (args: observable.EventData) {
console.log("Clear");
});
// ```

20
apps/tests/ui/slider/slider-tests.ts
View File

@@ -65,7 +65,7 @@ export function test_set_native_value_triggers_propertyChanged() {
function testAction(views: Array<viewModule.View>) {
var valueChanged = false;
var allChanges = 0;
slider.on(observable.knownEvents.propertyChange, function (data: observable.EventData) {
slider.on(observable.Observable.propertyChangeEvent, function (data: observable.EventData) {
allChanges++;
var propertyData = <observable.PropertyChangeData>data;
if (propertyData && propertyData.propertyName === "value" && propertyData.value === TEST_VALUE) {
@@ -75,7 +75,7 @@ export function test_set_native_value_triggers_propertyChanged() {
setNativeValue(slider, TEST_VALUE);
slider.off(observable.knownEvents.propertyChange);
slider.off(observable.Observable.propertyChangeEvent);
TKUnit.assert(valueChanged, "Property changed for value not called.");
TKUnit.assertEqual(allChanges, 1, "Property changed callbacks.");
@@ -206,14 +206,14 @@ export function test_property_changed_event_when_setting_minValue_no_adjust() {
function testAction(views: Array<viewModule.View>) {
var changedProperties = {};
var allChanges = 0;
slider.on(observable.knownEvents.propertyChange, function (data: observable.EventData) {
slider.on(observable.Observable.propertyChangeEvent, function (data: observable.EventData) {
allChanges++;
changedProperties[(<observable.PropertyChangeData>data).propertyName] = true;
});
// Act
slider.minValue = 10;
slider.off(observable.knownEvents.propertyChange);
slider.off(observable.Observable.propertyChangeEvent);
// Assert
TKUnit.assert(changedProperties["minValue"], "Property changed for minValue not called.");
@@ -232,14 +232,14 @@ export function test_property_changed_event_when_setting_minValue_with_adjust()
function testAction(views: Array<viewModule.View>) {
var changedProperties = {};
var allChanges = 0;
slider.on(observable.knownEvents.propertyChange, function (data: observable.EventData) {
slider.on(observable.Observable.propertyChangeEvent, function (data: observable.EventData) {
allChanges++;
changedProperties[(<observable.PropertyChangeData>data).propertyName] = true;
});
// Act
slider.minValue = 60;
slider.off(observable.knownEvents.propertyChange);
slider.off(observable.Observable.propertyChangeEvent);
// Assert
TKUnit.assert(changedProperties["value"], "Property changed for 'value' not called.");
@@ -259,14 +259,14 @@ export function test_property_changed_event_when_setting_maxValue_no_adjust() {
function testAction(views: Array<viewModule.View>) {
var changedProperties = {};
var allChanges = 0;
slider.on(observable.knownEvents.propertyChange, function (data: observable.EventData) {
slider.on(observable.Observable.propertyChangeEvent, function (data: observable.EventData) {
allChanges++;
changedProperties[(<observable.PropertyChangeData>data).propertyName] = true;
});
// Act
slider.maxValue = 200;
slider.off(observable.knownEvents.propertyChange);
slider.off(observable.Observable.propertyChangeEvent);
// Assert
TKUnit.assert(changedProperties["maxValue"], "Property changed for maxValue not called.");
@@ -285,14 +285,14 @@ export function test_property_changed_event_when_setting_maxValue_with_adjust()
function testAction(views: Array<viewModule.View>) {
var changedProperties = {};
var allChanges = 0;
slider.on(observable.knownEvents.propertyChange, function (data: observable.EventData) {
slider.on(observable.Observable.propertyChangeEvent, function (data: observable.EventData) {
allChanges++;
changedProperties[(<observable.PropertyChangeData>data).propertyName] = true;
});
// Act
slider.maxValue = 40;
slider.off(observable.knownEvents.propertyChange);
slider.off(observable.Observable.propertyChangeEvent);
// Assert
TKUnit.assert(changedProperties["value"], "Property changed for 'value' not called.");

8
apps/tests/ui/style/style-properties-tests.ts
View File

@@ -178,7 +178,7 @@ export function test_setting_same_color_does_not_trigger_property_change() {
testView.style.color = new color.Color("#FF0000");
var changed = false;
testView.style.on(observable.knownEvents.propertyChange, (data) => {
testView.style.on(observable.Observable.propertyChangeEvent, (data) => {
changed = true;
});
@@ -191,7 +191,7 @@ export function test_setting_different_color_triggers_property_change() {
testView.style.color = new color.Color("#FF0000");
var changed = false;
testView.style.on(observable.knownEvents.propertyChange, (data) => {
testView.style.on(observable.Observable.propertyChangeEvent, (data) => {
changed = true;
});
@@ -204,7 +204,7 @@ export function test_setting_same_backgroundColor_does_not_trigger_property_chan
testView.style.backgroundColor = new color.Color("#FF0000");
var changed = false;
testView.style.on(observable.knownEvents.propertyChange, (data) => {
testView.style.on(observable.Observable.propertyChangeEvent, (data) => {
changed = true;
});
@@ -217,7 +217,7 @@ export function test_setting_different_backgroundColor_triggers_property_change(
testView.style.backgroundColor = new color.Color("#FF0000");
var changed = false;
testView.style.on(observable.knownEvents.propertyChange, (data) => {
testView.style.on(observable.Observable.propertyChangeEvent, (data) => {
changed = true;
});

4
apps/tests/ui/switch/switch-tests.ts
View File

@@ -81,7 +81,7 @@ export function test_set_native_checked_triggers_propertyChanged() {
function testAction(views: Array<viewModule.View>) {
var checkedChanged = false;
var allChanges = 0;
mySwitch.on(observable.knownEvents.propertyChange, function (data: observable.EventData) {
mySwitch.on(observable.Observable.propertyChangeEvent, function (data: observable.EventData) {
allChanges++;
var propertyData = <observable.PropertyChangeData>data;
if (propertyData && propertyData.propertyName === "checked" && propertyData.value === true) {
@@ -91,7 +91,7 @@ export function test_set_native_checked_triggers_propertyChanged() {
setNativeValue(mySwitch, true);
mySwitch.off(observable.knownEvents.propertyChange);
mySwitch.off(observable.Observable.propertyChangeEvent);
TKUnit.assert(checkedChanged, "Property changed for checked not called.");
TKUnit.assertEqual(allChanges, 1, "Property changed callbacks.");

4
apps/tests/ui/tab-view/tab-view-tests.ts
View File

@@ -71,7 +71,7 @@ function _createListView(): listViewModule.ListView {
listView.id = "ListView";
var items = Array.apply(null, Array(10)).map(function (_, i) { return i; });
listView.on(listViewModule.knownEvents.itemLoading, function (args: listViewModule.ItemEventData) {
listView.on(listViewModule.ListView.itemLoadingEvent, function (args: listViewModule.ItemEventData) {
var button = <buttonModule.Button>args.view;
if (!button) {
button = new buttonModule.Button();
@@ -80,7 +80,7 @@ function _createListView(): listViewModule.ListView {
button.text = "Button" + args.index;
button.id = button.text;
button.on(buttonModule.knownEvents.tap, _clickHandlerFactory(args.index));
button.on(buttonModule.Button.tapEvent, _clickHandlerFactory(args.index));
});
listView.items = items;

6
apps/tests/ui/view/view-tests-common.ts
View File

@@ -123,18 +123,18 @@ export var test_event_LoadedUnloaded_IsRaised = function () {
var layoutUnloaded = false,
buttonUnloaded = false;
views[1].on(viewModule.knownEvents.unloaded, (data) => {
views[1].on(viewModule.View.unloadedEvent, (data) => {
layoutUnloaded = true;
});
views[2].on(viewModule.knownEvents.unloaded, (data) => {
views[2].on(viewModule.View.unloadedEvent, (data) => {
buttonUnloaded = true;
});
var newButton = new button.Button(),
buttonLoaded = false;
newButton.on(viewModule.knownEvents.loaded, (data) => {
newButton.on(viewModule.View.loadedEvent, (data) => {
buttonLoaded = true;
});

4
apps/tests/ui/web-view/web-view-tests.ts
View File

@@ -46,7 +46,7 @@ export var testLoadExistingUrl = function () {
// <snippet module="ui/web-view" title="WebView">
// ### Using WebView
// ``` JavaScript
webView.on(webViewModule.knownEvents.loadFinished, function (args: webViewModule.LoadEventData) {
webView.on(webViewModule.WebView.loadFinishedEvent, function (args: webViewModule.LoadEventData) {
// <hide>
actualUrl = args.url;
actualError = args.error;
@@ -89,7 +89,7 @@ export var testLoadInvalidUrl = function () {
var testFinished = false;
var actualError;
webView.on(webViewModule.knownEvents.loadFinished, function (args: webViewModule.LoadEventData) {
webView.on(webViewModule.WebView.loadFinishedEvent, function (args: webViewModule.LoadEventData) {
if (actualError) {
// Android call this twice -- the second time args.error is undefined.
return;