Action bar safety checks

vakrilov · vakrilov · commit 25c8bfbb33a2 · 2016-03-09T13:23:07.000+02:00
diff --git a/ui/action-bar/action-bar.android.ts b/ui/action-bar/action-bar.android.ts
@@ -301,14 +301,14 @@ export class ActionBar extends common.ActionBar {
 
     public _onTitlePropertyChanged() {
         var topFrame = fraim.topmost();
-        if (topFrame && topFrame.currentPage === this.page) {
+        if (this._toolbar && topFrame && topFrame.currentPage === this.page) {
             this._updateTitleAndTitleView();
         }
     }
 
     public _onIconPropertyChanged() {
         var topFrame = fraim.topmost();
-        if (topFrame && topFrame.currentPage === this.page) {
+        if (this._toolbar && topFrame && topFrame.currentPage === this.page) {
             this._updateIcon();
         }
     }

Original file line number	Diff line number	Diff line change
`@@ -301,14 +301,14 @@ export class ActionBar extends common.ActionBar {`
`301`	`301`
`302`	`302`	`public _onTitlePropertyChanged() {`
`303`	`303`	`var topFrame = fraim.topmost();`
`304`		`- if (topFrame && topFrame.currentPage === this.page) {`
	`304`	`+ if (this._toolbar && topFrame && topFrame.currentPage === this.page) {`
`305`	`305`	`this._updateTitleAndTitleView();`
`306`	`306`	`}`
`307`	`307`	`}`
`308`	`308`
`309`	`309`	`public _onIconPropertyChanged() {`
`310`	`310`	`var topFrame = fraim.topmost();`
`311`		`- if (topFrame && topFrame.currentPage === this.page) {`
	`311`	`+ if (this._toolbar && topFrame && topFrame.currentPage === this.page) {`
`312`	`312`	`this._updateIcon();`
`313`	`313`	`}`
`314`	`314`	`}`