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

Re-factored page navigation transitions. Resolves Issue #811.

Browse Source
This commit is contained in:
Rossen Hristov
2016-02-10 14:55:27 +02:00
parent 114fb806da
commit 5ad082d783
10 changed files with 97 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
apps/perf-tests/nav-page.ts
View File

@@ -171,12 +171,12 @@ export class NavPage extends Page implements definition.ControlsPage {
var customTransitionModule = require("./custom-transition");
var customTransition = new customTransitionModule.CustomTransition(duration, curve);
navigationTransition = {
transition: customTransition
instance: customTransition
};
}
else {
navigationTransition = {
transition: transitionName,
name: transitionName,
duration: duration,
curve: curve
};
@@ -188,7 +188,7 @@ export class NavPage extends Page implements definition.ControlsPage {
backstackVisible: addToBackStackSwitch.checked,
clearHistory: clearHistorySwitch.checked,
animated: animatedSwitch.checked,
navigationTransition: navigationTransition,
transition: navigationTransition,
});
});
stackLayout.addChild(forwardButton);

6
apps/tests/navigation/navigation-tests.ts
View File

@@ -25,7 +25,7 @@ function _testTransition(navigationTransition: NavigationTransition) {
return page;
},
animated: true,
navigationTransition: navigationTransition
transition: navigationTransition
}
helper.navigateWithEntry(navigationEntry);
@@ -65,7 +65,7 @@ export var test_Transitions = function () {
for (d = 0; d < dlen; d++) {
for (c = 0; c < clen; c++) {
_testTransition({
transition: transitions[t],
name: transitions[t],
duration: durations[d],
curve: curves[c]
});
@@ -76,7 +76,7 @@ export var test_Transitions = function () {
// Custom transition
var customTransitionModule = require("./custom-transition");
var customTransition = new customTransitionModule.CustomTransition();
_testTransition({transition: customTransition});
_testTransition({ instance: customTransition });
helper.goBack();
}

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

@@ -191,14 +191,14 @@ function _test_PageNavigation_EventSequence(withTransition: boolean) {
if (withTransition) {
var navigationTransition: FrameModule.NavigationTransition = {
transition: "slide",
name: "slide",
duration: 1000,
};
var navigationEntry: FrameModule.NavigationEntry = {
create: pageFactory,
context: context,
animated: true,
navigationTransition: navigationTransition
transition: navigationTransition
}
helper.navigateWithEntry(navigationEntry);
}