Skip to content

Commit 02dd5ac

Browse files
authored
chore: refactor modaltest (NativeScript#8724)
1 parent fc37b95 commit 02dd5ac

3 files changed

Lines changed: 41 additions & 10 deletions

File tree

apps/app/modaltest/main-page.ts

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,7 @@
1-
import { View, EventData } from "tns-core-modules/ui/core/view";
1+
import {
2+
View,
3+
EventData
4+
} from "tns-core-modules/ui/core/view";
25

36
export function onNavigatingTo(args: EventData) {
47
const page = args.object;

apps/app/modaltest/modal-tab.ts

Lines changed: 23 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,7 @@
1-
import { View, EventData } from "tns-core-modules/ui/core/view";
1+
import {
2+
View,
3+
EventData
4+
} from "tns-core-modules/ui/core/view";
25

36
const colors = ["red", "orange", "magenta"];
47
let x = 0;
@@ -14,26 +17,40 @@ export function onLiveSync() {
1417
export function pageLoaded(args: EventData) {
1518
const view = args.object as View;
1619
const page = view.page;
17-
console.log("Page loaded: " + page + ", isLoaded: " + page.isLoaded);
18-
console.log("Frame: " + page.frame + ", currentPage: " + page.frame.currentPage);
20+
console.log(`Page loaded: ${page}, isLoaded: ${page.isLoaded}`);
21+
console.log(`Frame: ${page.frame}, currentPage: ${page.frame.currentPage}`);
1922
}
2023

2124
export function onTap(args) {
2225
const view = args.object as View;
2326
const page = view.page;
2427
let context = page.bindingContext || 0;
25-
page.frame.navigate({ moduleName: "modaltest/page.2", bindingContext: ++context, transition: { name: "fade", duration: 1000 } });
28+
page.frame.navigate({
29+
moduleName: "modaltest/page.2",
30+
bindingContext: ++context,
31+
transition: {
32+
name: "fade",
33+
duration: 1000
34+
}
35+
});
2636
}
2737

2838
export function tenGoBacks(args) {
2939
const view = args.object as View;
3040
const page = view.page;
3141
const frame = page.frame;
32-
42+
3343
let context = page.bindingContext || 0;
3444
let x = 4;
3545
while (x--) {
36-
frame.navigate({ moduleName: "modaltest/page.2", bindingContext: ++context, transition: { name: "fade", duration: 1000 } });
46+
frame.navigate({
47+
moduleName: "modaltest/page.2",
48+
bindingContext: ++context,
49+
transition: {
50+
name: "fade",
51+
duration: 1000
52+
}
53+
});
3754
}
3855

3956
x = 4;

apps/app/modaltest/page.2.ts

Lines changed: 14 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,8 @@
1-
import { View, EventData, ShownModallyData } from "tns-core-modules/ui/core/view";
1+
import {
2+
View,
3+
EventData,
4+
ShownModallyData
5+
} from "tns-core-modules/ui/core/view";
26

37
var x = 0;
48

@@ -17,7 +21,14 @@ export function onTap(args: EventData) {
1721
const view = args.object as View;
1822
const page = view.page;
1923
let context = page.bindingContext || 0;
20-
page.frame.navigate({ moduleName: "modaltest/page.2", bindingContext: ++context, transition: { name: "fade", duration: 1000 } });
24+
page.frame.navigate({
25+
moduleName: "modaltest/page.2",
26+
bindingContext: ++context,
27+
transition: {
28+
name: "fade",
29+
duration: 1000
30+
}
31+
});
2132
}
2233

2334
export function onBack(args: EventData) {
@@ -33,7 +44,7 @@ export function closeModal(args: EventData) {
3344
let modalContext = 0;
3445
export function showModal(args: EventData) {
3546
(args.object as View).showModal("modaltest/page.2", ++modalContext, function () {
36-
console.log("Closed Modal: " + (args.object as View).bindingContext);
47+
console.log(`Closed Modal: ${(args.object as View).bindingContext}`);
3748
});
3849
}
3950

0 commit comments

Comments
 (0)