chore(nit): address PR feedback

Author: amcdnl

src/lib/tabs/tab-group.spec.ts

@@ -322,23 +322,26 @@ describe('MdTabGroup', () => {
           fixture.debugElement.query(By.directive(MdTabGroup)).componentInstance as MdTabGroup;
     });
 
-    it('should support a tab-group with the simple api', () => {
-      expect(getSelectedLabel(fixture).textContent).toMatch('Junk food');
-      expect(getSelectedContent(fixture).textContent).toMatch('Pizza, fries');
+    it('should support a tab-group with the simple api', async(() => {
+      fixture.whenStable().then(() => {
+        fixture.detectChanges();
+        expect(getSelectedLabel(fixture).textContent).toMatch('Junk food');
+        expect(getSelectedContent(fixture).textContent).toMatch('Pizza, fries');
 
-      tabGroup.selectedIndex = 2;
-      fixture.detectChanges();
+        tabGroup.selectedIndex = 2;
+        fixture.detectChanges();
 
-      expect(getSelectedLabel(fixture).textContent).toMatch('Fruit');
-      expect(getSelectedContent(fixture).textContent).toMatch('Apples, grapes');
+        expect(getSelectedLabel(fixture).textContent).toMatch('Fruit');
+        expect(getSelectedContent(fixture).textContent).toMatch('Apples, grapes');
 
-      fixture.componentInstance.otherLabel = 'Chips';
-      fixture.componentInstance.otherContent = 'Salt, vinegar';
-      fixture.detectChanges();
+        fixture.componentInstance.otherLabel = 'Chips';
+        fixture.componentInstance.otherContent = 'Salt, vinegar';
+        fixture.detectChanges();
 
-      expect(getSelectedLabel(fixture).textContent).toMatch('Chips');
-      expect(getSelectedContent(fixture).textContent).toMatch('Salt, vinegar');
-    });
+        expect(getSelectedLabel(fixture).textContent).toMatch('Chips');
+        expect(getSelectedContent(fixture).textContent).toMatch('Salt, vinegar');
+      });
+    }));
 
     it('should support @ViewChild in the tab content', () => {
       expect(fixture.componentInstance.legumes).toBeTruthy();

src/lib/tabs/tab-group.ts

@@ -192,7 +192,7 @@ export class MdTabGroup extends _MdTabGroupMixinBase implements AfterContentInit
     }
   }
 
-  ngAfterContentInit() {
+  ngAfterContentInit(): void {
     this._subscribeToTabLabels();
 
     // Subscribe to changes in the amount of tabs, in order to be
@@ -203,7 +203,7 @@ export class MdTabGroup extends _MdTabGroupMixinBase implements AfterContentInit
     });
   }
 
-  ngOnDestroy() {
+  ngOnDestroy(): void {
     this._tabsSubscription.unsubscribe();
     this._tabLabelSubscription.unsubscribe();
   }
@@ -216,7 +216,7 @@ export class MdTabGroup extends _MdTabGroupMixinBase implements AfterContentInit
     this._isInitialized = true;
   }
 
-  _focusChanged(index: number) {
+  _focusChanged(index: number): void {
     this.focusChange.emit(this._createChangeEvent(index));
   }
 

src/lib/tabs/tab.html

@@ -1,9 +1,4 @@
 <!-- Create a template for the content of the <mat-tab> so that we can grab a reference to this
     TemplateRef and use it in a Portal to render the tab content in the appropriate place in the
     tab-group. -->
-<ng-template #bodyTemplate>
-  <ng-content></ng-content>
-  <ng-template *ngIf="templateBody && templateBody.template" 
-               [ngTemplateOutlet]="templateBody.template">
-  </ng-template>
-</ng-template>
+<ng-template><ng-content></ng-content></ng-template>

src/lib/tabs/tab.ts

@@ -45,10 +45,12 @@ export const _MdTabMixinBase = mixinDisabled(MdTabBase);
 export class MdTab extends _MdTabMixinBase implements OnInit, CanDisable, OnChanges, OnDestroy {
   /** Content for the tab label given by <ng-template md-tab-label>. */
   @ContentChild(MdTabLabel) templateLabel: MdTabLabel;
-  @ContentChild(MdTabContent) templateBody: MdTabContent;
+
+  /** User provided template that we are going to use instead of implicitContent template */
+  @ContentChild(MdTabContent, {read: TemplateRef}) _explicitContent: TemplateRef<any>;
 
   /** Template inside the MdTab view that contains an <ng-content>. */
-  @ViewChild('bodyTemplate') _content: TemplateRef<any>;
+  @ViewChild(TemplateRef) _implicitContent: TemplateRef<any>;
 
   /** The plain text label for the tab, used when there is no template label. */
   @Input('label') textLabel: string = '';
@@ -84,6 +86,11 @@ export class MdTab extends _MdTabMixinBase implements OnInit, CanDisable, OnChan
     super();
   }
 
+  ngOnInit(): void {
+    this._contentPortal = new TemplatePortal(
+        this._explicitContent || this._implicitContent, this._viewContainerRef);
+  }
+
   ngOnChanges(changes: SimpleChanges): void {
     if (changes.hasOwnProperty('textLabel')) {
       this._labelChange.next();
@@ -95,11 +102,6 @@ export class MdTab extends _MdTabMixinBase implements OnInit, CanDisable, OnChan
   }
 
   ngOnDestroy(): void {
-    this._disableChange.complete();
     this._labelChange.complete();
   }
-
-  ngOnInit(): void {
-    this._contentPortal = new TemplatePortal(this._content, this._viewContainerRef);
-  }
 }