Commit 1d63103
| 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 | } | |
0 commit comments