Merge pull request NativeScript#1186 from NativeScript/cankov/frame-currentEntry-fix

PanayotCankov · PanayotCankov · commit fe209cdd02cc · 2015-12-01T09:48:26.000+02:00
Fix currentEntry to return NavigationEntry instead of BackstackEntry
diff --git a/apps/tests/frame-tests.ts b/apps/tests/frame-tests.ts
@@ -9,7 +9,9 @@ var topmost = frameModule.topmost();
 import labelModule = require("ui/label");
 import pagesModule = require("ui/page");
 
-export var test_DummyTestForSnippetOnly0 = function () {
+import TKUnit = require("./TKUnit");
+
+export var ignore_test_DummyTestForSnippetOnly0 = function () {
     // <snippet module="ui/frame" title="frame">
     // ### Navigating to a Module
     // ``` JavaScript
@@ -18,7 +20,7 @@ export var test_DummyTestForSnippetOnly0 = function () {
     // </snippet>
 }
 
-export var test_DummyTestForSnippetOnly1 = function () {
+export var ignore_test_DummyTestForSnippetOnly1 = function () {
     // <snippet module="ui/frame" title="frame">
     // ### Navigating with a Factory Function
     // ``` JavaScript
@@ -34,7 +36,7 @@ export var test_DummyTestForSnippetOnly1 = function () {
     // </snippet>
 }
 
-export var test_DummyTestForSnippetOnly2 = function () {
+export var ignore_test_DummyTestForSnippetOnly2 = function () {
     // <snippet module="ui/frame" title="frame">
     // ### Navigating with NavigationEntry
     // ``` JavaScript
@@ -48,11 +50,16 @@ export var test_DummyTestForSnippetOnly2 = function () {
     // </snippet>
 }
 
-export var test_DummyTestForSnippetOnly3 = function () {
+export var ignore_test_DummyTestForSnippetOnly3 = function () {
     // <snippet module="ui/frame" title="frame">
     // ### Navigating Back
     // ``` JavaScript
     topmost.goBack();
     // ```
     // </snippet>
 }
+
+export function test_currentEntry() {
+    var moduleName = frameModule.topmost().currentEntry.moduleName;
+    TKUnit.assert(moduleName === "tests/app/mainPage" || moduleName === "app/mainPage", "Expected frameModule.topmost().currentEntry.moduleName to return tests/app/mainPage or app/mainPage but instead returned " + moduleName);
+}
diff --git a/apps/tests/testRunner.ts b/apps/tests/testRunner.ts
@@ -40,6 +40,7 @@ allTests["FILE SYSTEM"] = require("./file-system-tests");
 allTests["HTTP"] = require("./http-tests");
 allTests["XHR"] = require("./xhr-tests");
 allTests["FETCH"] = require("./fetch-tests");
+allTests["FRAME"] = require("./frame-tests");
 allTests["APPLICATION SETTINGS"] = require("./application-settings-tests");
 allTests["IMAGE SOURCE"] = require("./image-source-tests");
 allTests["TIMER"] = require("./timer-tests");
diff --git a/ui/frame/frame-common.ts b/ui/frame/frame-common.ts
@@ -307,8 +307,8 @@ export class Frame extends view.CustomLayoutView implements definition.Frame {
         return null;
     }
 
-    get currentEntry(): definition.BackstackEntry {
-        return this._currentEntry;
+    get currentEntry(): definition.NavigationEntry {
+        return this._currentEntry.entry;
     }
 
     public _pushInFrameStack() {
diff --git a/ui/frame/frame.android.ts b/ui/frame/frame.android.ts
@@ -290,7 +290,7 @@ export class Frame extends frameCommon.Frame {
     public _onActivityCreated(isRestart: boolean) {
         this._onAttached(this._android.activity);
 
-        var backstackEntry = this.currentEntry || this._delayedNavigationEntry;
+        var backstackEntry = this._currentEntry || this._delayedNavigationEntry;
 
         if (isRestart) {
             this._onNavigatingTo(backstackEntry, false);
@@ -672,7 +672,7 @@ function findPageForFragment(fragment: android.app.Fragment, frame: Frame) {
     trace.write("Attached fragment with no page: " + fragmentTag, trace.categories.NativeLifecycle);
     if (frame.currentPage && frame.currentPage[TAG] === fragmentTag) {
         page = frame.currentPage;
-        entry = frame.currentEntry;
+        entry = frame._currentEntry;
         trace.write("Current page matches fragment: " + fragmentTag, trace.categories.NativeLifecycle);
     }
     else {

Original file line number	Diff line number	Diff line change
`@@ -307,8 +307,8 @@ export class Frame extends view.CustomLayoutView implements definition.Frame {`
`307`	`307`	`return null;`
`308`	`308`	`}`
`309`	`309`
`310`		`- get currentEntry(): definition.BackstackEntry {`
`311`		`- return this._currentEntry;`
	`310`	`+ get currentEntry(): definition.NavigationEntry {`
	`311`	`+ return this._currentEntry.entry;`
`312`	`312`	`}`
`313`	`313`
`314`	`314`	`public _pushInFrameStack() {`