From cd6e723c30f0db5677ecdb422483c14c12945598 Mon Sep 17 00:00:00 2001 From: Nedyalko Nikolov Date: Mon, 20 Apr 2015 16:32:06 +0300 Subject: [PATCH] Changed gestures enums like other enums. --- apps/perf-tests/NavigationTest/master-page.ts | 2 +- apps/tests/app/testRunnerPage.ts | 2 +- apps/tests/gestures-tests.ts | 16 ++-- apps/tests/observable-array-tests.ts | 34 ++++---- apps/tests/ui/bindable-tests.ts | 2 +- apps/tests/ui/list-view/list-view-tests.ts | 32 ++++---- apps/ui-tests-app/pages/gestures.ts | 14 ++-- ui/gestures/gestures-common.ts | 78 +++++++++---------- ui/gestures/gestures.android.ts | 32 ++++---- ui/gestures/gestures.d.ts | 22 +++--- ui/gestures/gestures.ios.ts | 50 ++++++------ ui/list-view/Readme.md | 2 +- ui/slide-out/slide-out.ios.ts | 14 ++-- 13 files changed, 151 insertions(+), 149 deletions(-) diff --git a/apps/perf-tests/NavigationTest/master-page.ts b/apps/perf-tests/NavigationTest/master-page.ts index 01ddea042..d0c7b6789 100644 --- a/apps/perf-tests/NavigationTest/master-page.ts +++ b/apps/perf-tests/NavigationTest/master-page.ts @@ -14,7 +14,7 @@ export function createPage() { listView.height = 200; var itemsSource = [1, 2, 3]; - listView.on("itemLoading", (args: listViewModule.ItemEventData) => { + listView.on(listViewModule.knownEvents.itemLoading, (args: listViewModule.ItemEventData) => { var label = args.view; if (!label) { label = new labelModule.Label(); diff --git a/apps/tests/app/testRunnerPage.ts b/apps/tests/app/testRunnerPage.ts index 6984cddb0..9e571f4eb 100644 --- a/apps/tests/app/testRunnerPage.ts +++ b/apps/tests/app/testRunnerPage.ts @@ -14,7 +14,7 @@ export function createPage() { var listView = new listViewDef.ListView(); - listView.on("itemLoading", (args: listViewDef.ItemEventData) => { + listView.on(listViewDef.knownEvents.itemLoading, (args: listViewDef.ItemEventData) => { var btn = args.view; if (btn) { btn.off(bm.knownEvents.tap); diff --git a/apps/tests/gestures-tests.ts b/apps/tests/gestures-tests.ts index 6d2963e55..a4e594924 100644 --- a/apps/tests/gestures-tests.ts +++ b/apps/tests/gestures-tests.ts @@ -13,7 +13,7 @@ export var test_DummyTestForSnippetOnly0 = function () { // ### Double Tap // ``` JavaScript var label = new labelModule.Label(); - var observer = label.observe(gestures.GestureTypes.DoubleTap, function (args: gestures.GestureEventData) { + var observer = label.observe(gestures.GestureTypes.doubleTap, function (args: gestures.GestureEventData) { console.log("Double Tap"); }); // ``` @@ -25,7 +25,7 @@ export var test_DummyTestForSnippetOnly1 = function () { // ### Long Press // ``` JavaScript var label = new labelModule.Label(); - var observer = label.observe(gestures.GestureTypes.LongPress, function (args: gestures.GestureEventData) { + var observer = label.observe(gestures.GestureTypes.longPress, function (args: gestures.GestureEventData) { console.log("Long Press"); }); // ``` @@ -37,7 +37,7 @@ export var test_DummyTestForSnippetOnly2 = function () { // ### Pan // ``` JavaScript var label = new labelModule.Label(); - var observer = label.observe(gestures.GestureTypes.Pan, function (args: gestures.PanGestureEventData) { + var observer = label.observe(gestures.GestureTypes.pan, function (args: gestures.PanGestureEventData) { console.log("Pan deltaX:" + args.deltaX + "; deltaY:" + args.deltaY + ";"); }); // ``` @@ -49,7 +49,7 @@ export var test_DummyTestForSnippetOnly3 = function () { // ### Pinch // ``` JavaScript var label = new labelModule.Label(); - var observer = label.observe(gestures.GestureTypes.Pinch, function (args: gestures.PinchGestureEventData) { + var observer = label.observe(gestures.GestureTypes.pinch, function (args: gestures.PinchGestureEventData) { console.log("Pinch scale: " + args.scale); }); // ``` @@ -61,7 +61,7 @@ export var test_DummyTestForSnippetOnly4 = function () { // ### Rotation // ``` JavaScript var label = new labelModule.Label(); - var observer = label.observe(gestures.GestureTypes.Rotation, function (args: gestures.RotationGestureEventData) { + var observer = label.observe(gestures.GestureTypes.rotation, function (args: gestures.RotationGestureEventData) { console.log("Rotation: " + args.rotation); }); // ``` @@ -73,7 +73,7 @@ export var test_DummyTestForSnippetOnly5 = function () { // ### Swipe // ``` JavaScript var label = new labelModule.Label(); - var observer = label.observe(gestures.GestureTypes.Swipe, function (args: gestures.SwipeGestureEventData) { + var observer = label.observe(gestures.GestureTypes.swipe, function (args: gestures.SwipeGestureEventData) { console.log("Swipe direction: " + args.direction); }); // ``` @@ -85,7 +85,7 @@ export var test_DummyTestForSnippetOnly6 = function () { // ### Tap // ``` JavaScript var label = new labelModule.Label(); - var observer = label.observe(gestures.GestureTypes.Tap, function (args: gestures.GestureEventData) { + var observer = label.observe(gestures.GestureTypes.tap, function (args: gestures.GestureEventData) { console.log("Tap"); }); // ``` @@ -97,7 +97,7 @@ export var test_DummyTestForSnippetOnly7 = function () { // ### Stop observing // ``` JavaScript var label = new labelModule.Label(); - var observer = label.observe(gestures.GestureTypes.Tap, function (args: gestures.GestureEventData) { + var observer = label.observe(gestures.GestureTypes.tap, function (args: gestures.GestureEventData) { console.log("Tap"); }); observer.disconnect(); diff --git a/apps/tests/observable-array-tests.ts b/apps/tests/observable-array-tests.ts index 8d7029546..2a647e542 100644 --- a/apps/tests/observable-array-tests.ts +++ b/apps/tests/observable-array-tests.ts @@ -127,9 +127,11 @@ export var test_ObservableArray_popShouldRemoveTheLastElementAndRaiseChangeEvent // ### Handle "change" event to know more info about the change after calling pop() method. // ``` JavaScript var array = new observableArrayModule.ObservableArray([1, 2, 3]); + // var index = array.length - 1; + // - array.on("change", (args: observableArrayModule.ChangedData) => { + array.on(observableArrayModule.knownEvents.change, (args: observableArrayModule.ChangedData) => { //// Argument (args) is ChangedData. //// args.eventName is "change". //// args.action is "delete". @@ -146,7 +148,7 @@ export var test_ObservableArray_popShouldRemoveTheLastElementAndRaiseChangeEvent // ``` // - TKUnit.assert(result.eventName === "change" && result.action === observableArrayModule.ChangeType.Delete && + TKUnit.assert(result.eventName === observableArrayModule.knownEvents.change && result.action === observableArrayModule.ChangeType.Delete && result.removed.length === 1 && result.index === index && result.addedCount === 0, "ObservableArray pop() should raise 'change' event with correct args!"); }; @@ -174,7 +176,7 @@ export var test_ObservableArray_pushShouldAppendNewElementAndRaiseChangeEventWit // ### Handle "change" event to know more info about the change after calling push() method with single element. // ``` JavaScript var array = new observableArrayModule.ObservableArray([1, 2, 3]); - array.on("change", (args: observableArrayModule.ChangedData) => { + array.on(observableArrayModule.knownEvents.change, (args: observableArrayModule.ChangedData) => { //// Argument (args) is ChangedData. //// args.eventName is "change". //// args.action is "add". @@ -191,7 +193,7 @@ export var test_ObservableArray_pushShouldAppendNewElementAndRaiseChangeEventWit // ``` // - TKUnit.assert(result.eventName === "change" && result.action === observableArrayModule.ChangeType.Add && + TKUnit.assert(result.eventName === observableArrayModule.knownEvents.change && result.action === observableArrayModule.ChangeType.Add && result.removed.length === 0 && result.index === 3 && result.addedCount === 1, "ObservableArray push() should raise 'change' event with correct args!"); }; @@ -219,7 +221,7 @@ export var test_ObservableArray_pushShouldAppendNewElementsAndRaiseChangeEventWi // ### Handle "change" event to know more info about the change after calling push() method with multiple elements. // ``` JavaScript var array = new observableArrayModule.ObservableArray([1, 2, 3]); - array.on("change", (args: observableArrayModule.ChangedData) => { + array.on(observableArrayModule.knownEvents.change, (args: observableArrayModule.ChangedData) => { //// Argument (args) is ChangedData. //// args.eventName is "change". //// args.action is "add". @@ -236,7 +238,7 @@ export var test_ObservableArray_pushShouldAppendNewElementsAndRaiseChangeEventWi // ``` // - TKUnit.assert(result.eventName === "change" && result.action === observableArrayModule.ChangeType.Add && + TKUnit.assert(result.eventName === observableArrayModule.knownEvents.change && result.action === observableArrayModule.ChangeType.Add && result.removed.length === 0 && result.index === 3 && result.addedCount === 3, "ObservableArray push() should raise 'change' event with correct args!"); }; @@ -264,7 +266,7 @@ export var test_ObservableArray_pushShouldAppendNewElementsFromSourceArrayAndRai // ### Handle "change" event to know more info about the change after calling push() method with multiple elements from source array. // ``` JavaScript var array = new observableArrayModule.ObservableArray([1, 2, 3]); - array.on("change", (args: observableArrayModule.ChangedData) => { + array.on(observableArrayModule.knownEvents.change, (args: observableArrayModule.ChangedData) => { //// Argument (args) is ChangedData. //// args.eventName is "change". //// args.action is "add". @@ -281,7 +283,7 @@ export var test_ObservableArray_pushShouldAppendNewElementsFromSourceArrayAndRai // ``` // - TKUnit.assert(result.eventName === "change" && result.action === observableArrayModule.ChangeType.Add && + TKUnit.assert(result.eventName === observableArrayModule.knownEvents.change && result.action === observableArrayModule.ChangeType.Add && result.removed.length === 0 && result.index === 3 && result.addedCount === 3, "ObservableArray push() should raise 'change' event with correct args!"); }; @@ -321,7 +323,7 @@ export var test_ObservableArray_shiftShouldRemoveTheFirstElementAndRaiseChangeEv // ``` JavaScript var array = new observableArrayModule.ObservableArray([1, 2, 3]); - array.on("change", (args: observableArrayModule.ChangedData) => { + array.on(observableArrayModule.knownEvents.change, (args: observableArrayModule.ChangedData) => { //// Argument (args) is ChangedData. //// args.eventName is "change". //// args.action is "delete". @@ -338,7 +340,7 @@ export var test_ObservableArray_shiftShouldRemoveTheFirstElementAndRaiseChangeEv // ``` // - TKUnit.assert(result.eventName === "change" && result.action === observableArrayModule.ChangeType.Delete && + TKUnit.assert(result.eventName === observableArrayModule.knownEvents.change && result.action === observableArrayModule.ChangeType.Delete && result.removed.length === 1 && result.index === 0 && result.addedCount === 0, "ObservableArray shift() should raise 'change' event with correct args!"); }; @@ -412,7 +414,7 @@ export var test_ObservableArray_spliceShouldRemoveSpecifiedNumberOfElementsStart // ``` JavaScript var array = new observableArrayModule.ObservableArray([1, 2, 3]); - array.on("change", (args: observableArrayModule.ChangedData) => { + array.on(observableArrayModule.knownEvents.change, (args: observableArrayModule.ChangedData) => { //// Argument (args) is ChangedData. //// args.eventName is "change". //// args.action is "splice". @@ -429,7 +431,7 @@ export var test_ObservableArray_spliceShouldRemoveSpecifiedNumberOfElementsStart // ``` // - TKUnit.assert(result.eventName === "change" && result.action === observableArrayModule.ChangeType.Splice && + TKUnit.assert(result.eventName === observableArrayModule.knownEvents.change && result.action === observableArrayModule.ChangeType.Splice && result.removed.length === 2 && result.index === 1 && result.addedCount === 0, "ObservableArray splice() should raise 'change' event with correct args!"); }; @@ -453,7 +455,7 @@ export var test_ObservableArray_spliceShouldRemoveAndInertSpecifiedNumberOfEleme // ``` JavaScript var array = new observableArrayModule.ObservableArray(["one", "two", "three"]); - array.on("change", (args: observableArrayModule.ChangedData) => { + array.on(observableArrayModule.knownEvents.change, (args: observableArrayModule.ChangedData) => { //// Argument (args) is ChangedData. //// args.eventName is "change". //// args.action is "splice". @@ -470,7 +472,7 @@ export var test_ObservableArray_spliceShouldRemoveAndInertSpecifiedNumberOfEleme // ``` // - TKUnit.assert(result.eventName === "change" && result.action === observableArrayModule.ChangeType.Splice && + TKUnit.assert(result.eventName === observableArrayModule.knownEvents.change && result.action === observableArrayModule.ChangeType.Splice && result.removed.length === 2 && result.index === 1 && result.addedCount === 1, "ObservableArray splice() should raise 'change' event with correct args!"); }; @@ -499,7 +501,7 @@ export var test_ObservableArray_unshiftShouldInsertNewElementsFromTheStartAndRai // ### Handle "change" event to know more info about the change after calling unshift(item1, item2... itemN) method. // ``` JavaScript var array = new observableArrayModule.ObservableArray([1, 2, 3]); - array.on("change", (args: observableArrayModule.ChangedData) => { + array.on(observableArrayModule.knownEvents.change, (args: observableArrayModule.ChangedData) => { //// Argument (args) is ChangedData. //// args.eventName is "change". //// args.action is "add". @@ -516,7 +518,7 @@ export var test_ObservableArray_unshiftShouldInsertNewElementsFromTheStartAndRai // ``` // - TKUnit.assert(result.eventName === "change" && result.action === observableArrayModule.ChangeType.Add && + TKUnit.assert(result.eventName === observableArrayModule.knownEvents.change && result.action === observableArrayModule.ChangeType.Add && result.removed.length === 0 && result.index === 0 && result.addedCount === 2, "ObservableArray unshift() should raise 'change' event with correct args!"); }; diff --git a/apps/tests/ui/bindable-tests.ts b/apps/tests/ui/bindable-tests.ts index e02cfe016..8081cc365 100644 --- a/apps/tests/ui/bindable-tests.ts +++ b/apps/tests/ui/bindable-tests.ts @@ -190,7 +190,7 @@ export var test_WhenBindingIsSetToAnElement_AndElementIsRemoved_ShouldBeCollecte var sourcePropertyName = "testProperty"; var targetPropertyName = "text"; - page.on("loaded", () => { + page.on(viewModule.knownEvents.loaded, () => { var model = new observable.Observable(); model.set(sourcePropertyName, expectedValue); diff --git a/apps/tests/ui/list-view/list-view-tests.ts b/apps/tests/ui/list-view/list-view-tests.ts index 830465525..09cbc8cb2 100644 --- a/apps/tests/ui/list-view/list-view-tests.ts +++ b/apps/tests/ui/list-view/list-view-tests.ts @@ -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("itemLoading", function (args: listViewModule.ItemEventData) { + listView.on(listViewModule.knownEvents.itemLoading, 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("itemLoading", loadViewWithItemNumber); + listView.on(listViewModule.knownEvents.itemLoading, loadViewWithItemNumber); function testAction(views: Array) { 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("itemLoading", loadViewWithItemNumber); + listView.on(listViewModule.knownEvents.itemLoading, loadViewWithItemNumber); function testAction(views: Array) { 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("itemLoading", function (args: listViewModule.ItemEventData) { + listView.on(listViewModule.knownEvents.itemLoading, 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("itemLoading", loadViewWithItemNumber); + listView.on(listViewModule.knownEvents.itemLoading, loadViewWithItemNumber); function testAction(views: Array) { 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("itemLoading", loadViewWithItemNumber); + listView.on(listViewModule.knownEvents.itemLoading, loadViewWithItemNumber); function testAction(views: Array) { 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("itemLoading", loadViewWithItemNumber); + listView.on(listViewModule.knownEvents.itemLoading, loadViewWithItemNumber); function testAction(views: Array) { 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("itemLoading", function (args: listViewModule.ItemEventData) { + listView.on(listViewModule.knownEvents.itemLoading, 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("itemLoading", loadViewWithItemNumber); + listView.on(listViewModule.knownEvents.itemLoading, loadViewWithItemNumber); function testAction(views: Array) { 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) { listView.items = data; - listView.on("itemLoading", loadViewWithItemNumber); + listView.on(listViewModule.knownEvents.itemLoading, 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) { listView.items = data; - listView.on("itemLoading", loadViewWithItemNumber); + listView.on(listViewModule.knownEvents.itemLoading, 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("itemLoading", loadViewWithItemNumber); + listView.on(listViewModule.knownEvents.itemLoading, loadViewWithItemNumber); listView.items = FEW_ITEMS; function testAction(views: Array) { @@ -390,13 +390,13 @@ export function test_loadMoreItems_raised_when_showing_few_items() { function testAction(views: Array) { var loadMoreItemsCount = 0; listView.items = FEW_ITEMS; - listView.on("itemLoading", loadViewWithItemNumber); + listView.on(listViewModule.knownEvents.itemLoading, loadViewWithItemNumber); // // ### 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("loadMoreItems", function (data: observable.EventData) { + listView.on(listViewModule.knownEvents.loadMoreItems, function (data: observable.EventData) { //// Do something. // 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("itemLoading", loadViewWithItemNumber); + listView.on(listViewModule.knownEvents.itemLoading, loadViewWithItemNumber); function testAction(views: Array) { var loadMoreItemsCount = 0; listView.items = MANY_ITEMS; - listView.on("loadMoreItems", function (data: observable.EventData) { + listView.on(listViewModule.knownEvents.loadMoreItems, function (data: observable.EventData) { loadMoreItemsCount++; }); diff --git a/apps/ui-tests-app/pages/gestures.ts b/apps/ui-tests-app/pages/gestures.ts index ccf86af41..47c1cb334 100644 --- a/apps/ui-tests-app/pages/gestures.ts +++ b/apps/ui-tests-app/pages/gestures.ts @@ -62,31 +62,31 @@ export function createPage() { rotaionLabel.text = "Gestures detection disabled"; }); - var observer1 = tapLabel.observe(gestures.GestureTypes.Tap, function (args: gestures.GestureEventData) { + var observer1 = tapLabel.observe(gestures.GestureTypes.tap, function (args: gestures.GestureEventData) { tapLabel.text = "Tap gesture detected"; }); - var observer2 = doubletapLabel.observe(gestures.GestureTypes.DoubleTap, function (args: gestures.GestureEventData) { + var observer2 = doubletapLabel.observe(gestures.GestureTypes.doubleTap, function (args: gestures.GestureEventData) { doubletapLabel.text = "Double Tap gesture detected"; }); - var observer3 = longpressLabel.observe(gestures.GestureTypes.LongPress, function (args: gestures.GestureEventData) { + var observer3 = longpressLabel.observe(gestures.GestureTypes.longPress, function (args: gestures.GestureEventData) { longpressLabel.text = "Long Press gesture detected"; }); - var observer4 = swipeLabel.observe(gestures.GestureTypes.Swipe, function (args: gestures.SwipeGestureEventData) { + var observer4 = swipeLabel.observe(gestures.GestureTypes.swipe, function (args: gestures.SwipeGestureEventData) { swipeLabel.text = "Swipe Direction: " + args.direction; }); - var observer5 = panLabel.observe(gestures.GestureTypes.Pan, function (args: gestures.PanGestureEventData) { + var observer5 = panLabel.observe(gestures.GestureTypes.pan, function (args: gestures.PanGestureEventData) { panLabel.text = "Pan deltaX:" + args.deltaX + "; deltaY:" + args.deltaY + ";"; }); - var observer6 = pinchLabel.observe(gestures.GestureTypes.Pinch, function (args: gestures.PinchGestureEventData) { + var observer6 = pinchLabel.observe(gestures.GestureTypes.pinch, function (args: gestures.PinchGestureEventData) { pinchLabel.text = "Pinch Scale: " + args.scale; }); - var observer7 = rotaionLabel.observe(gestures.GestureTypes.Rotation, function (args: gestures.RotationGestureEventData) { + var observer7 = rotaionLabel.observe(gestures.GestureTypes.rotation, function (args: gestures.RotationGestureEventData) { rotaionLabel.text = "Rotation: " + args.rotation; }); diff --git a/ui/gestures/gestures-common.ts b/ui/gestures/gestures-common.ts index 11f124eb3..62eec6113 100644 --- a/ui/gestures/gestures-common.ts +++ b/ui/gestures/gestures-common.ts @@ -2,30 +2,30 @@ import view = require("ui/core/view"); export enum GestureTypes { - Tap = 1 << 0, - DoubleTap = 1 << 1, - Pinch = 1 << 2, - Pan = 1 << 3, - Swipe = 1 << 4, - Rotation = 1 << 5, - LongPress = 1 << 6 + tap = 1 << 0, + doubleTap = 1 << 1, + pinch = 1 << 2, + pan = 1 << 3, + swipe = 1 << 4, + rotation = 1 << 5, + longPress = 1 << 6 } export enum GestureStateTypes { - Possible = 1 << 0, - Recognized = 1 << 1, - Failed = 1 << 2, - Cancelled = 1 << 3, - Began = 1 << 4, - Changed = 1 << 5, - Ended = 1 << 6 + possible = 1 << 0, + recognized = 1 << 1, + failed = 1 << 2, + cancelled = 1 << 3, + began = 1 << 4, + changed = 1 << 5, + ended = 1 << 6 } export enum SwipeDirection { - Right = 1 << 0, - Left = 1 << 1, - Up = 1 << 2, - Down = 1 << 3 + right = 1 << 0, + left = 1 << 1, + up = 1 << 2, + down = 1 << 3 } export function observe(target: view.View, type: number, callback: (args: definition.GestureEventData) => void): definition.GesturesObserver { @@ -37,32 +37,32 @@ export function observe(target: view.View, type: number, callback: (args: defini export function toString(type: GestureTypes, separator?: string): string { var types = new Array(); - if (type & definition.GestureTypes.Tap) { - types.push("Tap"); + if (type & definition.GestureTypes.tap) { + types.push("tap"); } - if (type & definition.GestureTypes.DoubleTap) { - types.push("DoubleTap"); + if (type & definition.GestureTypes.doubleTap) { + types.push("doubleTap"); } - if (type & definition.GestureTypes.Pinch) { - types.push("Pinch"); + if (type & definition.GestureTypes.pinch) { + types.push("pinch"); } - if (type & definition.GestureTypes.Pan) { - types.push("Pan"); + if (type & definition.GestureTypes.pan) { + types.push("pan"); } - if (type & definition.GestureTypes.Swipe) { - types.push("Swipe"); + if (type & definition.GestureTypes.swipe) { + types.push("swipe"); } - if (type & definition.GestureTypes.Rotation) { - types.push("Rotation"); + if (type & definition.GestureTypes.rotation) { + types.push("rotation"); } - if (type & definition.GestureTypes.LongPress) { - types.push("LongPress"); + if (type & definition.GestureTypes.longPress) { + types.push("longPress"); } return types.join(separator); @@ -72,19 +72,19 @@ export function fromString(type: string): definition.GestureTypes { var t = type.trim().toLowerCase(); if (t === "tap") { - return definition.GestureTypes.Tap; + return definition.GestureTypes.tap; } else if (t === "doubletap") { - return definition.GestureTypes.DoubleTap; + return definition.GestureTypes.doubleTap; } else if (t === "pinch") { - return definition.GestureTypes.Pinch; + return definition.GestureTypes.pinch; } else if (t === "pan") { - return definition.GestureTypes.Pan; + return definition.GestureTypes.pan; } else if (t === "swipe") { - return definition.GestureTypes.Swipe; + return definition.GestureTypes.swipe; } else if (t === "rotation") { - return definition.GestureTypes.Rotation; + return definition.GestureTypes.rotation; } else if (t === "longpress") { - return definition.GestureTypes.LongPress; + return definition.GestureTypes.longPress; } return undefined; diff --git a/ui/gestures/gestures.android.ts b/ui/gestures/gestures.android.ts index 5b1b42aa7..3d2fdc28c 100644 --- a/ui/gestures/gestures.android.ts +++ b/ui/gestures/gestures.android.ts @@ -83,19 +83,19 @@ export class GesturesObserver implements definition.GesturesObserver { trace.write(this._target + "._attach() android:" + this._target.android, "gestures"); this._dettach(); - if (type & definition.GestureTypes.Tap || type & definition.GestureTypes.DoubleTap || type & definition.GestureTypes.LongPress) { + if (type & definition.GestureTypes.tap || type & definition.GestureTypes.doubleTap || type & definition.GestureTypes.longPress) { this._simpleGestureDetector = new android.support.v4.view.GestureDetectorCompat(target._context, new TapAndDoubleTapGestureListener(this, this._target)); } - if (type & definition.GestureTypes.Pinch) { + if (type & definition.GestureTypes.pinch) { this._scaleGestureDetector = new android.view.ScaleGestureDetector(target._context, new PinchGestureListener(this, this._target)); } - if (type & definition.GestureTypes.Swipe) { + if (type & definition.GestureTypes.swipe) { this._swipeGestureDetector = new android.support.v4.view.GestureDetectorCompat(target._context, new SwipeGestureListener(this, this._target)); } - if (type & definition.GestureTypes.Pan) { + if (type & definition.GestureTypes.pan) { this._panGestureDetector = new android.support.v4.view.GestureDetectorCompat(target._context, new PanGestureListener(this, this._target)); } @@ -124,7 +124,7 @@ export class GesturesObserver implements definition.GesturesObserver { owner._panGestureDetector.onTouchEvent(motionEvent); } - if (type & definition.GestureTypes.Rotation && motionEvent.getPointerCount() === 2) { + if (type & definition.GestureTypes.rotation && motionEvent.getPointerCount() === 2) { var deltaX = motionEvent.getX(0) - motionEvent.getX(1); var deltaY = motionEvent.getY(0) - motionEvent.getY(1); @@ -132,7 +132,7 @@ export class GesturesObserver implements definition.GesturesObserver { var degrees = radians * (180 / Math.PI); var args = { - type: definition.GestureTypes.Rotation, + type: definition.GestureTypes.rotation, view: owner._target, android: motionEvent, rotation: degrees, @@ -164,7 +164,7 @@ function _getArgs(type: definition.GestureTypes, view: view.View, e: android.vie function _getSwipeArgs(direction: definition.SwipeDirection, view: view.View, initialEvent: android.view.MotionEvent, currentEvent: android.view.MotionEvent): definition.SwipeGestureEventData { return { - type: definition.GestureTypes.Swipe, + type: definition.GestureTypes.swipe, view: view, android: { initial: initialEvent, current: currentEvent }, direction: direction @@ -174,7 +174,7 @@ function _getSwipeArgs(direction: definition.SwipeDirection, view: view.View, function _getPanArgs(deltaX: number, deltaY: number, view: view.View, initialEvent: android.view.MotionEvent, currentEvent: android.view.MotionEvent): definition.PanGestureEventData { return { - type: definition.GestureTypes.Pan, + type: definition.GestureTypes.pan, view: view, android: { initial: initialEvent, current: currentEvent }, deltaX: deltaX, @@ -201,13 +201,13 @@ class TapAndDoubleTapGestureListener extends android.view.GestureDetector.Simple } public onSingleTapConfirmed(motionEvent: android.view.MotionEvent): boolean { - var args = _getArgs(definition.GestureTypes.Tap, this._target, motionEvent); + var args = _getArgs(definition.GestureTypes.tap, this._target, motionEvent); _executeCallback(this._observer, args); return true; } public onDoubleTap(motionEvent: android.view.MotionEvent): boolean { - var args = _getArgs(definition.GestureTypes.DoubleTap, this._target, motionEvent); + var args = _getArgs(definition.GestureTypes.doubleTap, this._target, motionEvent); _executeCallback(this._observer, args); return true; } @@ -217,7 +217,7 @@ class TapAndDoubleTapGestureListener extends android.view.GestureDetector.Simple } public onLongPress(motionEvent: android.view.MotionEvent): boolean { - var args = _getArgs(definition.GestureTypes.LongPress, this._target, motionEvent); + var args = _getArgs(definition.GestureTypes.longPress, this._target, motionEvent); _executeCallback(this._observer, args); return true; } @@ -238,7 +238,7 @@ class PinchGestureListener extends android.view.ScaleGestureDetector.SimpleOnSca public onScale(detector: android.view.ScaleGestureDetector): boolean { var args = { - type: definition.GestureTypes.Pinch, + type: definition.GestureTypes.pinch, view: this._target, android: detector, scale: detector.getScaleFactor() @@ -280,13 +280,13 @@ class SwipeGestureListener extends android.view.GestureDetector.SimpleOnGestureL if (deltaX > 0) { - args = _getSwipeArgs(definition.SwipeDirection.Right, this._target, initialEvent, currentEvent); + args = _getSwipeArgs(definition.SwipeDirection.right, this._target, initialEvent, currentEvent); _executeCallback(this._observer, args); result = true; } else { - args = _getSwipeArgs(definition.SwipeDirection.Left, this._target, initialEvent, currentEvent); + args = _getSwipeArgs(definition.SwipeDirection.left, this._target, initialEvent, currentEvent); _executeCallback(this._observer, args); result = true; @@ -300,13 +300,13 @@ class SwipeGestureListener extends android.view.GestureDetector.SimpleOnGestureL if (deltaY > 0) { - args = _getSwipeArgs(definition.SwipeDirection.Down, this._target, initialEvent, currentEvent); + args = _getSwipeArgs(definition.SwipeDirection.down, this._target, initialEvent, currentEvent); _executeCallback(this._observer, args); result = true; } else { - args = _getSwipeArgs(definition.SwipeDirection.Up, this._target, initialEvent, currentEvent); + args = _getSwipeArgs(definition.SwipeDirection.up, this._target, initialEvent, currentEvent); _executeCallback(this._observer, args); result = true; diff --git a/ui/gestures/gestures.d.ts b/ui/gestures/gestures.d.ts index bf56b982b..ea50afb8b 100644 --- a/ui/gestures/gestures.d.ts +++ b/ui/gestures/gestures.d.ts @@ -11,31 +11,31 @@ declare module "ui/gestures" { /** * Denotes tap (click) gesture. */ - Tap, + tap, /** * Denotes double tap gesture. */ - DoubleTap, + doubleTap, /** * Denotes pinch gesture. */ - Pinch, + pinch, /** * Denotes pan gesture. */ - Pan, + pan, /** * Denotes swipe gesture. */ - Swipe, + swipe, /** * Denotes rotation gesture. */ - Rotation, + rotation, /** * Denotes long press gesture. */ - LongPress + longPress } /** @@ -45,19 +45,19 @@ declare module "ui/gestures" { /** * Denotes right direction for swipe gesture. */ - Right, + right, /** * Denotes left direction for swipe gesture. */ - Left, + left, /** * Denotes up direction for swipe gesture. */ - Up, + up, /** * Denotes down direction for swipe gesture. */ - Down + down } /** diff --git a/ui/gestures/gestures.ios.ts b/ui/gestures/gestures.ios.ts index 28fd770c2..e265486a0 100644 --- a/ui/gestures/gestures.ios.ts +++ b/ui/gestures/gestures.ios.ts @@ -70,43 +70,43 @@ export class GesturesObserver implements definition.GesturesObserver { if (this._target && this._target.ios && this._target.ios.addGestureRecognizer) { var nativeView = this._target.ios; - if (type & definition.GestureTypes.Tap) { - nativeView.addGestureRecognizer(this._createRecognizer(definition.GestureTypes.Tap)); + if (type & definition.GestureTypes.tap) { + nativeView.addGestureRecognizer(this._createRecognizer(definition.GestureTypes.tap)); } - if (type & definition.GestureTypes.DoubleTap) { - var r = this._createRecognizer(definition.GestureTypes.DoubleTap); + if (type & definition.GestureTypes.doubleTap) { + var r = this._createRecognizer(definition.GestureTypes.doubleTap); r.numberOfTapsRequired = 2; nativeView.addGestureRecognizer(r); } - if (type & definition.GestureTypes.Pinch) { - nativeView.addGestureRecognizer(this._createRecognizer(definition.GestureTypes.Pinch, args => { + if (type & definition.GestureTypes.pinch) { + nativeView.addGestureRecognizer(this._createRecognizer(definition.GestureTypes.pinch, args => { this._executeCallback(_getPinchData(args)); })); } - if (type & definition.GestureTypes.Pan) { - nativeView.addGestureRecognizer(this._createRecognizer(definition.GestureTypes.Pan, args => { + if (type & definition.GestureTypes.pan) { + nativeView.addGestureRecognizer(this._createRecognizer(definition.GestureTypes.pan, args => { this._executeCallback(_getPanData(args, this._target.ios)); })); } - if (type & definition.GestureTypes.Swipe) { - nativeView.addGestureRecognizer(this._createRecognizer(definition.GestureTypes.Swipe, args => { + if (type & definition.GestureTypes.swipe) { + nativeView.addGestureRecognizer(this._createRecognizer(definition.GestureTypes.swipe, args => { this._executeCallback(_getSwipeData(args)); })); } - if (type & definition.GestureTypes.Rotation) { - nativeView.addGestureRecognizer(this._createRecognizer(definition.GestureTypes.Rotation, args => { + if (type & definition.GestureTypes.rotation) { + nativeView.addGestureRecognizer(this._createRecognizer(definition.GestureTypes.rotation, args => { this._executeCallback(_getRotationData(args)); })); } - if (type & definition.GestureTypes.LongPress) { - nativeView.addGestureRecognizer(this._createRecognizer(definition.GestureTypes.LongPress)); + if (type & definition.GestureTypes.longPress) { + nativeView.addGestureRecognizer(this._createRecognizer(definition.GestureTypes.longPress)); } } } @@ -165,19 +165,19 @@ interface RecognizerCache { function _getUIGestureRecognizerType(type: definition.GestureTypes): any { var nativeType = null; - if (type === definition.GestureTypes.Tap) { + if (type === definition.GestureTypes.tap) { nativeType = UITapGestureRecognizer; - } else if (type === definition.GestureTypes.DoubleTap) { + } else if (type === definition.GestureTypes.doubleTap) { nativeType = UITapGestureRecognizer; - } else if (type === definition.GestureTypes.Pinch) { + } else if (type === definition.GestureTypes.pinch) { nativeType = UIPinchGestureRecognizer; - } else if (type === definition.GestureTypes.Pan) { + } else if (type === definition.GestureTypes.pan) { nativeType = UIPanGestureRecognizer; - } else if (type === definition.GestureTypes.Swipe) { + } else if (type === definition.GestureTypes.swipe) { nativeType = UISwipeGestureRecognizer; - } else if (type === definition.GestureTypes.Rotation) { + } else if (type === definition.GestureTypes.rotation) { nativeType = UIRotationGestureRecognizer; - } else if (type === definition.GestureTypes.LongPress) { + } else if (type === definition.GestureTypes.longPress) { nativeType = UILongPressGestureRecognizer; } @@ -186,13 +186,13 @@ function _getUIGestureRecognizerType(type: definition.GestureTypes): any { function _getSwipeDirection(direction: UISwipeGestureRecognizerDirection): definition.SwipeDirection { if (direction === UISwipeGestureRecognizerDirection.UISwipeGestureRecognizerDirectionDown) { - return definition.SwipeDirection.Down; + return definition.SwipeDirection.down; } else if (direction === UISwipeGestureRecognizerDirection.UISwipeGestureRecognizerDirectionLeft) { - return definition.SwipeDirection.Left; + return definition.SwipeDirection.left; } else if (direction === UISwipeGestureRecognizerDirection.UISwipeGestureRecognizerDirectionRight) { - return definition.SwipeDirection.Right; + return definition.SwipeDirection.right; } else if (direction === UISwipeGestureRecognizerDirection.UISwipeGestureRecognizerDirectionUp) { - return definition.SwipeDirection.Up; + return definition.SwipeDirection.up; } } diff --git a/ui/list-view/Readme.md b/ui/list-view/Readme.md index 288c7c7c8..e9568a7a8 100644 --- a/ui/list-view/Readme.md +++ b/ui/list-view/Readme.md @@ -10,7 +10,7 @@ var lv = new lvm.ListView(); lv.items = data; - lv.on("itemLoading", function(args){ + lv.on(lvm.knownEvents.itemLoading, function(args){ var label = args.view; if(!label) { label = new lm.Label(); diff --git a/ui/slide-out/slide-out.ios.ts b/ui/slide-out/slide-out.ios.ts index e46c41246..e824c9232 100644 --- a/ui/slide-out/slide-out.ios.ts +++ b/ui/slide-out/slide-out.ios.ts @@ -9,11 +9,11 @@ export class SlideOutControl extends common.SlideOutControl { this._ios = new UIView(); - this.observe(gestures.GestureTypes.Swipe, (args) => { + this.observe(gestures.GestureTypes.swipe, (args) => { var swipeArgs = args; - if (swipeArgs.direction === gestures.SwipeDirection.Left) { + if (swipeArgs.direction === gestures.SwipeDirection.left) { this._toggleSlideContentVisibility(false); - } else if (swipeArgs.direction === gestures.SwipeDirection.Right) { + } else if (swipeArgs.direction === gestures.SwipeDirection.right) { this._toggleSlideContentVisibility(true); } }); @@ -59,14 +59,14 @@ export class SlideOutControl extends common.SlideOutControl { if (view === this.slideContent) { view.ios.hidden = true; - view.observe(gestures.GestureTypes.Tap | gestures.GestureTypes.Swipe, (args) => { - if (args.type & gestures.GestureTypes.Tap) { + view.observe(gestures.GestureTypes.tap | gestures.GestureTypes.swipe, (args) => { + if (args.type & gestures.GestureTypes.tap) { this._toggleSlideContentVisibility(false); } - if (args.type & gestures.GestureTypes.Swipe) { + if (args.type & gestures.GestureTypes.swipe) { var swipeArgs = args; - if (swipeArgs.direction === gestures.SwipeDirection.Left) { + if (swipeArgs.direction === gestures.SwipeDirection.left) { this._toggleSlideContentVisibility(false); } }