javascript/NativeScript
1
0
Fork 0
mirror of https://github.com/NativeScript/NativeScript.git synced 2025-08-17 21:01:34 +08:00
Code Issues Packages Projects Releases Wiki Activity

Trying to fix build failures

Browse Source
This commit is contained in:
Rossen Hristov
2016-05-25 09:48:07 +03:00
parent 9e36329e9d
commit 17b89a80a3
2 changed files with 14 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
ui/frame/frame.android.ts
View File

@ -512,6 +512,13 @@ class AndroidFrame extends Observable implements definition.AndroidFrame {
}
function findPageForFragment(fragment: android.app.Fragment, frame: Frame) {
if (!fragment) {
if (trace.enabled) {
trace.write(`Can't find page for a null fragment.`, trace.categories.NativeLifecycle);
}
return;
}
var fragmentTag = fragment.getTag();
var page: pages.Page;
var entry: definition.BackstackEntry;
@ -698,15 +705,12 @@ class FragmentClass extends android.app.Fragment {
super.onDestroy();
this.entry.fragmentTag = undefined;
this.entry = undefined;
this.frame = undefined;
this.clearHistory = undefined;
transitionModule._clearBackwardTransitions(this);
transitionModule._clearForwardTransitions(this);
}
public toString(): string {
return `${this.getTag()}<${(this.entry && this.entry.resolvedPage) ? this.entry.resolvedPage : ""}>`;
return `${this ? this.getTag() : ""}<${(this.entry && this.entry.resolvedPage) ? this.entry.resolvedPage : ""}>`;
}
}

6
ui/transition/transition.android.ts
View File

@ -35,6 +35,9 @@ export module AndroidTransitionType {
}
export function _clearBackwardTransitions(fragment: any): void {
if (!fragment) {
return;
}
var expandedFragment = <ExpandedFragment>fragment;
if (expandedFragment.enterPopExitTransition) {
if (trace.enabled) {
@ -62,6 +65,9 @@ export function _clearBackwardTransitions(fragment: any): void {
}
export function _clearForwardTransitions(fragment: any): void {
if (!fragment) {
return;
}
var expandedFragment = <ExpandedFragment>fragment;
if (expandedFragment.exitPopEnterTransition) {
if (trace.enabled) {