fix(): move resize logic to viewCtrl

mhartington · mhartington · commit ebdf22d2d3cd · 2017-10-20T16:09:43.000-04:00
diff --git a/src/components/content/content.ts b/src/components/content/content.ts
@@ -1,4 +1,4 @@
-import { AfterViewInit, ChangeDetectionStrategy, Component, ElementRef, EventEmitter, HostListener, Input, NgZone, OnDestroy, Optional, Output, Renderer, ViewChild, ViewEncapsulation } from '@angular/core';
+import { AfterViewInit, ChangeDetectionStrategy, Component, ElementRef, EventEmitter, Input, NgZone, OnDestroy, Optional, Output, Renderer, ViewChild, ViewEncapsulation } from '@angular/core';
 
 import { App } from '../app/app';
 import { Config } from '../../config/config';
@@ -227,6 +227,8 @@ export class Content extends Ion implements OnDestroy, AfterViewInit, IContent {
   /** @internal */
   _scrollDownOnLoad: boolean = false;
 
+  _viewCtrl: any;
+
   private _imgReqBfr: number;
   private _imgRndBfr: number;
   private _imgVelMax: number;
@@ -410,6 +412,8 @@ export class Content extends Ion implements OnDestroy, AfterViewInit, IContent {
     }
 
     if (viewCtrl) {
+      this._viewCtrl = viewCtrl;
+
       // content has a view controller
       viewCtrl._setIONContent(this);
       viewCtrl._setIONContentRef(elementRef);
@@ -670,7 +674,6 @@ export class Content extends Ion implements OnDestroy, AfterViewInit, IContent {
    * Tell the content to recalculate its dimensions. This should be called
    * after dynamically adding/removing headers, footers, or tabs.
    */
-  @HostListener('window:orientationchange')
   resize() {
     this._dom.read(this._readDimensions.bind(this));
     this._dom.write(this._writeDimensions.bind(this));
diff --git a/src/navigation/view-controller.ts b/src/navigation/view-controller.ts
@@ -113,6 +113,13 @@ export class ViewController {
 
     this._cssClass = rootCssClass;
     this._ts = Date.now();
+    window.addEventListener('orientationchange', this.handleOrientationChange.bind(this));
+  }
+
+  handleOrientationChange() {
+    if (this.getNav().isActive(this)) {
+      this.getContent().resize();
+    }
   }
 
   /**
@@ -533,6 +540,7 @@ export class ViewController {
         renderer.setElementAttribute(cmpEle, 'style', null);
       }
 
+      window.removeEventListener('orienationchagne', this.handleOrientationChange.bind(this));
       // completely destroy this component. boom.
       this._cmp.destroy();
     }

Original file line number	Diff line number	Diff line change
`@@ -113,6 +113,13 @@ export class ViewController {`
`113`	`113`
`114`	`114`	`this._cssClass = rootCssClass;`
`115`	`115`	`this._ts = Date.now();`
	`116`	`+ window.addEventListener('orientationchange', this.handleOrientationChange.bind(this));`
	`117`	`+ }`
	`118`	`+`
	`119`	`+ handleOrientationChange() {`
	`120`	`+ if (this.getNav().isActive(this)) {`
	`121`	`+ this.getContent().resize();`
	`122`	`+ }`
`116`	`123`	`}`
`117`	`124`
`118`	`125`	`/**`
`@@ -533,6 +540,7 @@ export class ViewController {`
`533`	`540`	`renderer.setElementAttribute(cmpEle, 'style', null);`
`534`	`541`	`}`
`535`	`542`
	`543`	`+ window.removeEventListener('orienationchagne', this.handleOrientationChange.bind(this));`
`536`	`544`	`// completely destroy this component. boom.`
`537`	`545`	`this._cmp.destroy();`
`538`	`546`	`}`