javascript/NativeScript
1
0
Fork 0
mirror of https://github.com/NativeScript/NativeScript.git synced 2025-08-16 03:31:45 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2459 from NativeScript/action-bar-title-fix

Browse Source 
fix: ActionBar's title not updating in OnLoaded event
This commit is contained in:
Maya Zhecheva
2016-07-18 09:46:53 +03:00
committed by GitHub
parent b07dd305ae 1d6310353d
commit 48ab2e455e
1 changed files with 4 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
tns-core-modules/ui/action-bar/action-bar.android.ts
View File

@ -1,5 +1,4 @@
import common = require("./action-bar-common"); import common = require("./action-bar-common");
import frame = require("ui/frame");
import types = require("utils/types"); import types = require("utils/types");
import enums = require("ui/enums"); import enums = require("ui/enums");
import application = require("application"); import application = require("application");
@ -50,7 +49,7 @@ export class ActionItem extends common.ActionItem {
private _itemId; private _itemId;
constructor() { constructor() {
super(); super();
this._itemId = generateItemId(); this._itemId = generateItemId();
} }
public get android(): dts.AndroidActionItemSettings { public get android(): dts.AndroidActionItemSettings {
@ -171,7 +170,7 @@ export class ActionBar extends common.ActionBar {
this.navigationButton._raiseTap(); this.navigationButton._raiseTap();
return true; return true;
} }
// Find item with the right ID; // Find item with the right ID;
var menuItem: dts.ActionItem = undefined; var menuItem: dts.ActionItem = undefined;
var items = this.actionItems.getItems(); var items = this.actionItems.getItems();
@ -301,15 +300,13 @@ export class ActionBar extends common.ActionBar {
} }
public _onTitlePropertyChanged() { public _onTitlePropertyChanged() {
var topFrame = frame.topmost(); if (this._toolbar) {
if (this._toolbar && topFrame && topFrame.currentPage === this.page) {
this._updateTitleAndTitleView(); this._updateTitleAndTitleView();
} }
} }
public _onIconPropertyChanged() { public _onIconPropertyChanged() {
var topFrame = frame.topmost(); if (this._toolbar) {
if (this._toolbar && topFrame && topFrame.currentPage === this.page) {
this._updateIcon(); this._updateIcon();
} }
} }