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

Merge pull request #1032 from NativeScript/loaded-twice

Browse Source 
Resolved issues #789, #1021, #1031.
This commit is contained in:
Rossen Hristov
2015-11-04 09:27:09 +02:00
parent aecfe8de77 e7c4209112
commit 253c25e466
12 changed files with 179 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
apps/modal-views-demo/app.ts
View File

@@ -3,7 +3,8 @@ application.mainModule = "main-page";
import trace = require("trace");
trace.enable();
trace.setCategories(trace.categories.concat(
trace.categories.Layout,
"LayoutRootView.iOS"
trace.categories.Navigation
//trace.categories.Layout,
//"LayoutRootView.iOS"
));
application.start();

35
apps/modal-views-demo/login-page.ts
View File

@@ -3,7 +3,6 @@ import pages = require("ui/page");
import textField = require("ui/text-field");
import frame = require("ui/frame");
var context: any;
var closeCallback: Function;
var page: pages.Page;
@@ -11,8 +10,8 @@ var usernameTextField: textField.TextField;
var passwordTextField: textField.TextField;
export function onShownModally(args: pages.ShownModallyData) {
console.log("login-page.onShownModally, context: " + args.context);
context = args.context;
console.log(">>> login-page.onShownModally, context: " + args.context);
closeCallback = args.closeCallback;
var modalPage = <pages.Page>args.object;
@@ -21,18 +20,40 @@ export function onShownModally(args: pages.ShownModallyData) {
}
}
export function onNavigatingTo(args: observable.EventData) {
console.log(">>> login-page.onNavigatingTo");
}
export function onLoaded(args: observable.EventData) {
console.log("login-page.onLoaded");
console.log(">>> login-page.onLoaded");
page = <pages.Page>args.object;
usernameTextField = page.getViewById<textField.TextField>("username");
passwordTextField = page.getViewById<textField.TextField>("password");
}
export function onNavigatedTo(args: pages.NavigatedData) {
console.log(">>> login-page.onNavigatedTo, context: " + args.context);
}
export function onNavigatingFrom(args: observable.EventData) {
console.log(">>> login-page.onNavigatingFrom");
}
export function onNavigatedFrom(args: observable.EventData) {
console.log(">>> login-page.onNavigatedFrom");
}
export function onUnloaded() {
console.log("login-page.onUnloaded");
console.log(">>> login-page.onUnloaded");
}
export function onLoginButtonTap() {
console.log("login-page.onLoginButtonTap");
closeCallback(usernameTextField.text, passwordTextField.text);
console.log(">>> login-page.onLoginButtonTap");
if (closeCallback) {
closeCallback(usernameTextField.text, passwordTextField.text);
}
else {
frame.topmost().goBack();
}
}

10
apps/modal-views-demo/login-page.xml
View File

@@ -1,4 +1,12 @@
<Page xmlns="http://www.nativescript.org/tns.xsd" shownModally="onShownModally" loaded="onLoaded" unloaded="onUnloaded" backgroundColor="Red">
<Page xmlns="http://www.nativescript.org/tns.xsd"
shownModally="onShownModally"
navigatingTo="onNavigatingTo"
loaded="onLoaded"
navigatedTo="onNavigatedTo"
navigatingFrom="onNavigatingFrom"
navigatedFrom="onNavigatedFrom"
unloaded="onUnloaded"
backgroundColor="Red">
<StackLayout backgroundColor="PaleGreen">
<TextField hint="username" id="username" text="username"/>
<TextField hint="password" id="password" text="password" secure="true"/>

40
apps/modal-views-demo/main-page.ts
View File

@@ -6,8 +6,14 @@ import frame = require("ui/frame");
var page: pages.Page;
var label: labelModule.Label;
export function onNavigatingTo(args: observable.EventData) {
console.log(">>> main-page.onNavigatingTo");
//console.trace();
}
export function onLoaded(args: observable.EventData) {
console.log("main-page.onLoaded");
console.log(">>> main-page.onLoaded");
//console.trace();
if (args.object !== frame.topmost().currentPage) {
throw new Error("args.object must equal frame.topmost().currentPage on page.loaded");
}
@@ -19,12 +25,38 @@ export function onLoaded(args: observable.EventData) {
}
export function onNavigatedTo(args: observable.EventData) {
console.log("main-page.onNavigatedTo");
console.log(">>> main-page.onNavigatedTo");
//console.trace();
}
export function onNavigatingFrom(args: observable.EventData) {
console.log(">>> main-page.onNavigatingFrom");
}
export function onNavigatedFrom(args: observable.EventData) {
console.log(">>> main-page.onNavigatedFrom");
}
export function onUnloaded(args: observable.EventData) {
console.log(">>> main-page.onUnloaded");
}
export function onTap(args: observable.EventData) {
var fullscreen = (<any>args.object).text.indexOf("(full-screen)") !== -1;
page.showModal("./modal-views-demo/login-page", "some custom context", function (username: string, password: string) {
if ((<any>args.object).text.indexOf("(navigate)") !== -1) {
var entry: frame.NavigationEntry = {
moduleName: "./login-page",
context: "Context from navigate"
};
frame.topmost().navigate(entry);
}
else {
var fullscreen = (<any>args.object).text.indexOf("(full-screen)") !== -1;
showModal(fullscreen);
}
}
function showModal(fullscreen?: boolean) {
page.showModal("./modal-views-demo/login-page", "Context from showModal", function (username: string, password: string) {
console.log(username + "/" + password);
label.text = username + "/" + password;
}, fullscreen);

9
apps/modal-views-demo/main-page.xml
View File

@@ -1,7 +1,14 @@
<Page xmlns="http://www.nativescript.org/tns.xsd" loaded="onLoaded" navigatedTo="onNavigatedTo" id="_mainPage" backgroundColor="Red">
<Page xmlns="http://www.nativescript.org/tns.xsd" id="_mainPage" backgroundColor="Red"
navigatingTo="onNavigatingTo"
loaded="onLoaded"
navigatedTo="onNavigatedTo"
navigatingFrom="onNavigatingFrom"
navigatedFrom="onNavigatedFrom"
unloaded="onUnloaded">
<StackLayout backgroundColor="PaleGreen">
<Button text="Login (small)" tap="onTap" />
<Button text="Login (full-screen)" tap="onTap" />
<Button text="Login (navigate)" tap="onTap" />
<Label id="label" text="Anonymous"/>
<Button text="Close Modal" tap="onCloseModal" />
</StackLayout>

4
apps/tests/ui/page/modal-page.ts
View File

@@ -6,7 +6,9 @@ import page = require("ui/page");
export function onShownModally(args: ShownModallyData) {
TKUnit.wait(0.100);
var modalPage = <page.Page>args.object;
args.context.shownModally = true;
if (args.context) {
args.context.shownModally = true;
}
TKUnit.assert(frame.topmost().currentPage.modal = modalPage, "frame.topmost().currentPage.modal should be equal to the page instance on page.shownModally event handler.");
args.closeCallback("return value");
}

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

@@ -156,23 +156,31 @@ export function test_PageNavigation_EventSequence() {
addLabelToPage(testPage);
testPage.on(PageModule.Page.navigatingToEvent, function (data: PageModule.NavigatedData) {
eventSequence.push("onNavigatingTo");
TKUnit.assertEqual(data.context, context, "onNavigatingTo: navigationContext");
eventSequence.push("navigatingTo");
TKUnit.assertEqual(data.context, context, "navigatingTo: navigationContext");
});
testPage.on(PageModule.Page.loadedEvent, function (data) {
eventSequence.push("loaded");
});
testPage.on(PageModule.Page.navigatedToEvent, function (data: PageModule.NavigatedData) {
eventSequence.push("onNavigatedTo");
TKUnit.assertEqual(data.context, context, "onNavigatedTo : navigationContext");
eventSequence.push("navigatedTo");
TKUnit.assertEqual(data.context, context, "navigatedTo : navigationContext");
});
testPage.on(PageModule.Page.navigatingFromEvent, function (data: PageModule.NavigatedData) {
eventSequence.push("onNavigatingFrom");
TKUnit.assertEqual(data.context, context, "onNavigatingFrom: navigationContext");
eventSequence.push("navigatingFrom");
TKUnit.assertEqual(data.context, context, "navigatingFrom: navigationContext");
});
testPage.on(PageModule.Page.navigatedFromEvent, function (data: PageModule.NavigatedData) {
eventSequence.push("onNavigatedFrom");
TKUnit.assertEqual(data.context, context, "onNavigatedFrom: navigationContext");
eventSequence.push("navigatedFrom");
TKUnit.assertEqual(data.context, context, "navigatedFrom: navigationContext");
});
testPage.on(PageModule.Page.unloadedEvent, function (data) {
eventSequence.push("unloaded");
});
return testPage;
@@ -181,8 +189,8 @@ export function test_PageNavigation_EventSequence() {
helper.navigate(pageFactory, context);
helper.goBack();
var expectedEventSequence = ["onNavigatingTo", "onNavigatedTo", "onNavigatingFrom", "onNavigatedFrom"];
TKUnit.arrayAssert(eventSequence, expectedEventSequence, "Actual event sequence is not equal to expected.");
var expectedEventSequence = ["navigatingTo", "loaded", "navigatedTo", "navigatingFrom", "navigatedFrom", "unloaded"];
TKUnit.arrayAssert(eventSequence, expectedEventSequence, "Actual event sequence is not equal to expected. Actual: " + eventSequence + "; Expected: " + expectedEventSequence);
}
export function test_NavigateTo_WithContext() {

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

@@ -65,4 +65,45 @@ export function test_WhenPageIsLoadedItCanShowAnotherPageAsModal() {
finally {
helper.goBack();
}
}
export function test_WhenShowingModalPageUnloadedIsNotFiredForTheMasterPage() {
var masterPage;
var masterPageUnloaded = false;
var modalClosed = false;
var modalCloseCallback = function (returnValue: any) {
TKUnit.wait(0.100);
modalClosed = true;
}
var loadedEventHandler = function (args) {
var basePath = "ui/page/";
args.object.showModal(basePath + "modal-page", null, modalCloseCallback, false);
};
var unloadedEventHandler = function (args) {
masterPageUnloaded = true;
};
var masterPageFactory = function (): PageModule.Page {
masterPage = new PageModule.Page();
masterPage.id = "master-page";
masterPage.on(view.View.loadedEvent, loadedEventHandler);
masterPage.on(view.View.unloadedEvent, unloadedEventHandler);
var label = new LabelModule.Label();
label.text = "Modal Page";
masterPage.content = label;
return masterPage;
};
try {
helper.navigate(masterPageFactory);
TKUnit.waitUntilReady(() => { return modalClosed; });
TKUnit.assert(!masterPageUnloaded, "Master page should not raise 'unloaded' when showing modal!");
masterPage.off(view.View.loadedEvent, loadedEventHandler);
masterPage.off(view.View.unloadedEvent, loadedEventHandler);
}
finally {
helper.goBack();
}
}