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

fix: cleanup modaltest paths (#5300)

Browse Source
This commit is contained in:
Alexander Vakrilov
2018-01-19 16:21:09 +02:00
committed by GitHub
parent 87703ce3ea
commit 8d59cc4de6
9 changed files with 22 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
apps/app/modaltest/app.ts
View File

@ -1,11 +1,11 @@
import * as application from "tns-core-modules/application";
// trace.addCategories(trace.categories.All);
// application.run({ moduleName: "page.1" });
// application.run({ moduleName: "main-page" });
// application.run({ moduleName: "modaltest/page.1" });
// application.run({ moduleName: "modaltest/main-page" });
application.run({ moduleName: "modal-tab" });
// application.run({ moduleName: "textview" });
application.run({ moduleName: "modaltest/modal-tab" });
// application.run({ moduleName: "modaltest/textview" });
// application.start({ moduleName: "modal-tab.33" });
// application.run({ moduleName: "modal-frame" });
// application.start({ moduleName: "page.2" });
// application.start({ moduleName: "modaltest/modal-tab.33" });
// application.run({ moduleName: modaltest/modal-frame" });
// application.start({ moduleName: "modaltest/page.2" });

6
apps/app/modaltest/main-page.ts
View File

@ -7,17 +7,17 @@ export function onNavigatingTo(args: EventData) {
export function navigate(args: EventData) {
console.log("navigate");
(args.object as View).page.frame.navigate("page.1");
(args.object as View).page.frame.navigate("modaltest/page.1");
}
export function onModalTab(args: EventData) {
const view = args.object as View;
view.showModal("modal-tab", "context", closeModal, false);
view.showModal("modaltest/modal-tab", "context", closeModal, false);
}
export function onModalFrame(args: EventData) {
const view = args.object as View;
view.showModal("modal-frame", "context", closeModal, false);
view.showModal("modaltest/modal-frame", "context", closeModal, false);
}
export function onTap3(args: EventData) {

2
apps/app/modaltest/modal-frame.1.xml
View File

@ -1,4 +1,4 @@
<Page backgroundColor="pink" codeFile='~/page.2' actionBarHidden="true">
<Page backgroundColor="pink" codeFile='~/modaltest/page.2' actionBarHidden="true">
<Frame>
<Page backgroundColor="purple">
<ActionBar title=" AAA ">

2
apps/app/modaltest/modal-frame.xml
View File

@ -1,4 +1,4 @@
<Frame codeFile='~/page.2'>
<Frame codeFile='~/modaltest/page.2'>
<Page backgroundColor="pink">
<ActionBar title="{{ $value, 'Page ' + $value }} ">
<ActionItem text="close" tap="closeModal" ios.position='right' />

2
apps/app/modaltest/modal-tab.33.xml
View File

@ -1,5 +1,5 @@
<Page backgroundColor="blue" actionBarHidden="true" loaded="pageLoaded"
codeFile='~/modal-tab'>
codeFile='~/modaltest/modal-tab'>
<ActionBar title="Frame in Modal Page">
<ActionItem text="close" tap="closeModal" />
</ActionBar>

10
apps/app/modaltest/modal-tab.ts
View File

@ -22,7 +22,7 @@ export function onTap(args) {
const view = args.object as View;
const page = view.page;
let context = page.bindingContext || 0;
page.frame.navigate({ moduleName: "page.2", bindingContext: ++context, transition: { name: "fade", duration: 1000 } });
page.frame.navigate({ moduleName: "modaltest/page.2", bindingContext: ++context, transition: { name: "fade", duration: 1000 } });
}
export function tenGoBacks(args) {
@ -33,7 +33,7 @@ export function tenGoBacks(args) {
let context = page.bindingContext || 0;
let x = 4;
while (x--) {
frame.navigate({ moduleName: "page.2", bindingContext: ++context, transition: { name: "fade", duration: 1000 } });
frame.navigate({ moduleName: "modaltest/page.2", bindingContext: ++context, transition: { name: "fade", duration: 1000 } });
}
x = 4;
@ -50,17 +50,17 @@ export function navigateToFrame(args: EventData) {
const view = args.object as View;
const page = view.page;
const frame = page.frame;
frame.navigate("modal-frame");
frame.navigate("modaltest/modal-frame");
}
export function navigateToPageWithFrame(args: EventData) {
const view = args.object as View;
const page = view.page;
const frame = page.frame;
frame.navigate("modal-frame.1");
frame.navigate("modaltest/modal-frame.1");
}
export function onModalFrame(args: EventData) {
const view = args.object as View;
view.showModal("modal-frame", "some context", closeModal, false);
view.showModal("modaltest/modal-frame", "some context", undefined, false);
}

4
apps/app/modaltest/page.2.ts
View File

@ -17,7 +17,7 @@ export function onTap(args: EventData) {
const view = args.object as View;
const page = view.page;
let context = page.bindingContext || 0;
page.frame.navigate({ moduleName: "page.2", bindingContext: ++context, transition: { name: "fade", duration: 1000 } });
page.frame.navigate({ moduleName: "modaltest/page.2", bindingContext: ++context, transition: { name: "fade", duration: 1000 } });
}
export function onBack(args: EventData) {
@ -32,7 +32,7 @@ export function closeModal(args: EventData) {
let modalContext = 0;
export function showModal(args: EventData) {
(args.object as View).showModal("page.2", ++modalContext, function () {
(args.object as View).showModal("modaltest/page.2", ++modalContext, function () {
console.log("Closed Modal: " + (args.object as View).bindingContext);
});
}

2
apps/app/modaltest/page.2.xml
View File

@ -1,5 +1,5 @@
<Page backgroundColor="pink" showingModally="showingModally">
<ActionBar title="{{ $value }} ">
<ActionBar title="{{ $value + ' page' }} ">
<ActionItem text="close" tap="closeModal" ios.position='right' />
</ActionBar>
<StackLayout backgroundColor="orange">

2
apps/app/package.json
View File

@ -1,4 +1,4 @@
{
"name": "tns-samples-apps",
"main": "ui-tests-app/app.js"
"main": "modaltest/app.js"
}