FazBrowse GitHub Viewer | Trending |
URL:
| Home
Tools: [Download Repo ZIP]   [Original HTTPS Page]

Frame.goBack can now accept an entry to navigate back to by PanayotCankov · Pull Request #1357 · NativeScript/NativeScript · GitHub

/ NativeScript Public

Frame.goBack can now accept an entry to navigate back to #1357

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
PanayotCankov merged 1 commit into from
Jan 12, 2016
Conversation 3 Commits 1 Checks 0 Files changed
Merged

Frame.goBack can now accept an entry to navigate back to #1357

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension .ts  (3) All 1 file type selected
Viewed files
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Unified
Split
Hide whitespace
Diff view
Unified
Split
Hide whitespace
41 changes: 41 additions & 0 deletions apps/tests/navigation-tests.ts
Show comments
View file
Open in desktop
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters. Learn more about bidirectional Unicode characters
Show hidden characters
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
import TKUnit = require("./TKUnit");
import pageModule = require("ui/page");
import frame = require("ui/frame");
import { Page } from "ui/page";

export var test_backstackVisible = function() {
var pageFactory = function(): pageModule.Page {
Expand Down Expand Up @@ -31,6 +32,46 @@ export var test_backstackVisible = function() {
TKUnit.waitUntilReady(() => { return frame.topmost().currentPage === mainTestPage; });
}

export var test_backToEntry = function() {
let page = (tag) => () => {
var p = new Page();
p["tag"] = tag;
return p;
}
let topmost = frame.topmost();
let wait = tag => TKUnit.waitUntilReady(() => topmost.currentPage["tag"] === tag, 1);
let navigate = tag => {
topmost.navigate({ create: page(tag) });
wait(tag)
}
let back = pages => {
topmost.goBack(topmost.backStack[topmost.backStack.length - pages]);
}
let currentPageMustBe = tag => {
wait(tag); // TODO: Add a timeout...
TKUnit.assert(topmost.currentPage["tag"] === tag, "Expected current page to be " + tag + " it was " + topmost.currentPage["tag"] + " instead.");
}

navigate("page1");
navigate("page2");
navigate("page3");
navigate("page4");

currentPageMustBe("page4");
back(2);
currentPageMustBe("page2");
back(1);
currentPageMustBe("page1");
navigate("page1.1");
navigate("page1.2");
currentPageMustBe("page1.2");
back(1);
currentPageMustBe("page1.1");
back(1);
currentPageMustBe("page1");
back(1);
}

// Clearing the history messes up the tests app.
export var test_ClearHistory = function () {
var pageFactory = function(): pageModule.Page {
Expand Down
17 changes: 15 additions & 2 deletions ui/frame/frame-common.ts
Show comments
View file
Open in desktop
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters. Learn more about bidirectional Unicode characters
Show hidden characters
Original file line number Diff line number Diff line change
Expand Up @@ -152,14 +152,27 @@ export class Frame extends CustomLayoutView implements definition.Frame {
return this._backStack.length > 0;
}

public goBack() {
/**
* Navigates to the previous entry (if any) in the back stack.
* @param to The backstack entry to navigate back to.
*/
public goBack(backstackEntry?: definition.BackstackEntry) {
trace.write(this._getTraceId() + ".goBack();", trace.categories.Navigation);
if (!this.canGoBack()) {
// TODO: Do we need to throw an error?
return;
}

var backstackEntry = this._backStack.pop();
if (!backstackEntry) {
backstackEntry = this._backStack.pop();
} else {
let backIndex = this._backStack.indexOf(backstackEntry);
if (backIndex < 0) {
return;
}
this._backStack.splice(backIndex);
}

var navigationContext: NavigationContext = {
entry: backstackEntry,
isBackNavigation: true
Expand Down
3 changes: 2 additions & 1 deletion ui/frame/frame.d.ts
Show comments
View file
Open in desktop
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters. Learn more about bidirectional Unicode characters
Show hidden characters
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,9 @@ declare module "ui/frame" {

/**
* Navigates to the previous entry (if any) in the back stack.
* @param to The backstack entry to navigate back to.
*/
goBack();
goBack(to?: BackstackEntry);

/**
* Checks whether the goBack operation is available.
Expand Down
Back | FazBrowse Home | New Git URL