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

more code + tests updates

Browse Source
This commit is contained in:
Vladimir Enchev
2015-11-10 15:20:21 +02:00
parent cea78d679f
commit f1abec42b5
2 changed files with 56 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

52
apps/tests/ui/scroll-view/scroll-view-tests.ts
View File

@@ -285,7 +285,7 @@ class ScrollLayoutTest extends testModule.UITest<scrollViewModule.ScrollView> {
this.testView.scrollToVerticalOffset(100, false); this.testView.scrollToVerticalOffset(100, false);
TKUnit.waitUntilReady(function () { return scrollY > 0; }); TKUnit.waitUntilReady(function () { return scrollY > 0; });
TKUnit.assertEqual(this.testView.verticalOffset, scrollY); TKUnit.assertEqual(scrollY, this.testView.verticalOffset);
} }
public test_scrollView_horizontal_raised_scroll_event() { public test_scrollView_horizontal_raised_scroll_event() {
@@ -307,7 +307,55 @@ class ScrollLayoutTest extends testModule.UITest<scrollViewModule.ScrollView> {
this.testView.scrollToHorizontalOffset(100, false); this.testView.scrollToHorizontalOffset(100, false);
TKUnit.waitUntilReady(function () { return scrollX > 0; }); TKUnit.waitUntilReady(function () { return scrollX > 0; });
TKUnit.assertEqual(this.testView.horizontalOffset, scrollX); TKUnit.assertEqual(scrollX, this.testView.horizontalOffset);
}
public test_scrollView_vertical_raised_scroll_event_after_loaded() {
this.testView.orientation = enums.Orientation.vertical;
this.waitUntilTestElementIsLoaded();
var scrollY: number;
this.testView.on(scrollViewModule.ScrollView.scrollEvent, (args: scrollViewModule.ScrollEventData) => {
scrollY = args.scrollY;
});
this.testView.width = 200;
this.testView.height = 300;
var btn = new button.Button();
btn.text = "test";
btn.height = 500;
this.testView.content = btn;
this.waitUntilTestElementLayoutIsValid();
this.testView.scrollToVerticalOffset(100, false);
TKUnit.waitUntilReady(function () { return scrollY > 0; });
TKUnit.assertEqual(scrollY, this.testView.verticalOffset);
}
public test_scrollView_horizontal_raised_scroll_event_after_loaded() {
this.testView.orientation = enums.Orientation.horizontal;
this.waitUntilTestElementIsLoaded();
var scrollX: number;
this.testView.on(scrollViewModule.ScrollView.scrollEvent, (args: scrollViewModule.ScrollEventData) => {
scrollX = args.scrollX;
});
this.testView.width = 200;
this.testView.height = 300;
var btn = new button.Button();
btn.text = "test";
btn.width = 500;
this.testView.content = btn;
this.waitUntilTestElementLayoutIsValid();
this.testView.scrollToHorizontalOffset(100, false);
TKUnit.waitUntilReady(function () { return scrollX > 0; });
TKUnit.assertEqual(scrollX, this.testView.horizontalOffset);
} }
} }

14
ui/scroll-view/scroll-view-common.ts
View File

@@ -18,7 +18,7 @@ export var orientationProperty = new dependencyObservable.Property(
); );
export class ScrollView extends contentView.ContentView implements definition.ScrollView { export class ScrollView extends contentView.ContentView implements definition.ScrollView {
private _scrollEventAttached: boolean; private _scrollChangeCount: number = 0;
public static scrollEvent = "scroll"; public static scrollEvent = "scroll";
get orientation(): string { get orientation(): string {
@@ -32,6 +32,7 @@ export class ScrollView extends contentView.ContentView implements definition.Sc
super.addEventListener(arg, callback, thisArg); super.addEventListener(arg, callback, thisArg);
if (arg === definition.ScrollView.scrollEvent) { if (arg === definition.ScrollView.scrollEvent) {
this._scrollChangeCount++;
this.attach(); this.attach();
} }
} }
@@ -40,6 +41,7 @@ export class ScrollView extends contentView.ContentView implements definition.Sc
super.addEventListener(arg, callback, thisArg); super.addEventListener(arg, callback, thisArg);
if (arg === definition.ScrollView.scrollEvent) { if (arg === definition.ScrollView.scrollEvent) {
this._scrollChangeCount--;
this.dettach(); this.dettach();
} }
} }
@@ -57,23 +59,19 @@ export class ScrollView extends contentView.ContentView implements definition.Sc
} }
private attach() { private attach() {
if (!this._scrollEventAttached && this.isLoaded) { if (this._scrollChangeCount > 0 && this.isLoaded) {
this._scrollEventAttached = true;
this.attachNative(); this.attachNative();
} }
} }
private dettach() { private dettach() {
if (this._scrollEventAttached && this.isLoaded) { if (this._scrollChangeCount === 0 && this.isLoaded) {
this._scrollEventAttached = false;
this.dettachNative(); this.dettachNative();
} }
} }
protected attachNative() { protected attachNative() {
// //
} }
protected dettachNative() { protected dettachNative() {