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

zh-m · web-flow · commit 48ab2e455eb5 · 2016-07-18T09:46:53.000+03:00
fix: ActionBar's title not updating in OnLoaded event
diff --git a/tns-core-modules/ui/action-bar/action-bar.android.ts b/tns-core-modules/ui/action-bar/action-bar.android.ts
@@ -1,5 +1,4 @@
 ﻿import common = require("./action-bar-common");
-import frame = require("ui/frame");
 import types = require("utils/types");
 import enums = require("ui/enums");
 import application = require("application");
@@ -50,7 +49,7 @@ export class ActionItem extends common.ActionItem {
     private _itemId;
     constructor() {
         super();
-        this._itemId = generateItemId(); 
+        this._itemId = generateItemId();
     }
 
     public get android(): dts.AndroidActionItemSettings {
@@ -171,7 +170,7 @@ export class ActionBar extends common.ActionBar {
             this.navigationButton._raiseTap();
             return true;
         }
-        
+
         // Find item with the right ID;
         var menuItem: dts.ActionItem = undefined;
         var items = this.actionItems.getItems();
@@ -301,15 +300,13 @@ export class ActionBar extends common.ActionBar {
     }
 
     public _onTitlePropertyChanged() {
-        var topFrame = frame.topmost();
-        if (this._toolbar && topFrame && topFrame.currentPage === this.page) {
+        if (this._toolbar) {
             this._updateTitleAndTitleView();
         }
     }
 
     public _onIconPropertyChanged() {
-        var topFrame = frame.topmost();
-        if (this._toolbar && topFrame && topFrame.currentPage === this.page) {
+        if (this._toolbar) {
             this._updateIcon();
         }
     }

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,4 @@`
`1`	`1`	`import common = require("./action-bar-common");`
`2`		`-import frame = require("ui/frame");`
`3`	`2`	`import types = require("utils/types");`
`4`	`3`	`import enums = require("ui/enums");`
`5`	`4`	`import application = require("application");`
`@@ -50,7 +49,7 @@ export class ActionItem extends common.ActionItem {`
`50`	`49`	`private _itemId;`
`51`	`50`	`constructor() {`
`52`	`51`	`super();`
`53`		`- this._itemId = generateItemId();`
	`52`	`+ this._itemId = generateItemId();`
`54`	`53`	`}`
`55`	`54`
`56`	`55`	`public get android(): dts.AndroidActionItemSettings {`
`@@ -171,7 +170,7 @@ export class ActionBar extends common.ActionBar {`
`171`	`170`	`this.navigationButton._raiseTap();`
`172`	`171`	`return true;`
`173`	`172`	`}`
`174`		`-`
	`173`	`+`
`175`	`174`	`// Find item with the right ID;`
`176`	`175`	`var menuItem: dts.ActionItem = undefined;`
`177`	`176`	`var items = this.actionItems.getItems();`
`@@ -301,15 +300,13 @@ export class ActionBar extends common.ActionBar {`
`301`	`300`	`}`
`302`	`301`
`303`	`302`	`public _onTitlePropertyChanged() {`
`304`		`- var topFrame = frame.topmost();`
`305`		`- if (this._toolbar && topFrame && topFrame.currentPage === this.page) {`
	`303`	`+ if (this._toolbar) {`
`306`	`304`	`this._updateTitleAndTitleView();`
`307`	`305`	`}`
`308`	`306`	`}`
`309`	`307`
`310`	`308`	`public _onIconPropertyChanged() {`
`311`		`- var topFrame = frame.topmost();`
`312`		`- if (this._toolbar && topFrame && topFrame.currentPage === this.page) {`
	`309`	`+ if (this._toolbar) {`
`313`	`310`	`this._updateIcon();`
`314`	`311`	`}`
`315`	`312`	`}`