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

Merge pull request #3953 from NativeScript/ios-nav-title

Browse Source 
Ensure navigation title view is removed if undefined
This commit is contained in:
Alexander Vakrilov
2017-04-07 14:43:48 +03:00
committed by GitHub
parent 7b33e9c896 a598e2c90a
commit e5018c72f4
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
tns-core-modules/ui/action-bar/action-bar.ios.ts
View File

@ -93,6 +93,8 @@ export class ActionBar extends ActionBarBase {
if (this.titleView && this.titleView.ios) { if (this.titleView && this.titleView.ios) {
navigationItem.titleView = this.titleView.ios; navigationItem.titleView = this.titleView.ios;
} else {
navigationItem.titleView = null;
} }
// Find previous ViewController in the navigation stack // Find previous ViewController in the navigation stack
@ -119,7 +121,7 @@ export class ActionBar extends ActionBarBase {
img = fromFileOrResource(this.navigationButton.icon); img = fromFileOrResource(this.navigationButton.icon);
} }
// TODO: This could cause issue when canceling BackEdge gesture - we will change the backIndicator to // TODO: This could cause issue when canceling BackEdge gesture - we will change the backIndicator to
// show the one from the old page but the new page will still be visible (because we canceled EdgeBackSwipe gesutre) // show the one from the old page but the new page will still be visible (because we canceled EdgeBackSwipe gesutre)
// Consider moving this to new method and call it from - navigationControllerDidShowViewControllerAnimated. // Consider moving this to new method and call it from - navigationControllerDidShowViewControllerAnimated.
if (img && img.ios) { if (img && img.ios) {
@ -132,7 +134,7 @@ export class ActionBar extends ActionBarBase {
navigationBar.backIndicatorTransitionMaskImage = null; navigationBar.backIndicatorTransitionMaskImage = null;
} }
// Set back button visibility // Set back button visibility
if (this.navigationButton) { if (this.navigationButton) {
navigationItem.setHidesBackButtonAnimated(!isVisible(this.navigationButton), true); navigationItem.setHidesBackButtonAnimated(!isVisible(this.navigationButton), true);
} }