feat(collapse): upgrade collapse to v4-alpha.6

refs #1178 Closes #1183
ng-bootstrap · Jan 9, 2017 · 6cda8b3 · 6cda8b3
1 parent 7ab022b
commit 6cda8b3
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 8 deletions.
diff --git a/src/collapse/collapse.spec.ts b/src/collapse/collapse.spec.ts
@@ -26,7 +26,7 @@ describe('ngb-collapse', () => {
 
     const collapseEl = getCollapsibleContent(fixture.nativeElement);
 
-    expect(collapseEl).toHaveCssClass('in');
+    expect(collapseEl).toHaveCssClass('show');
     expect(collapseEl.getAttribute('aria-expanded')).toBe('true');
   });
 
@@ -38,7 +38,7 @@ describe('ngb-collapse', () => {
 
     const collapseEl = getCollapsibleContent(fixture.nativeElement);
 
-    expect(collapseEl).not.toHaveCssClass('in');
+    expect(collapseEl).not.toHaveCssClass('show');
     expect(collapseEl.getAttribute('aria-expanded')).toBe('false');
   });
 
@@ -48,15 +48,15 @@ describe('ngb-collapse', () => {
 
     const tc = fixture.componentInstance;
     const collapseEl = getCollapsibleContent(fixture.nativeElement);
-    expect(collapseEl).toHaveCssClass('in');
+    expect(collapseEl).toHaveCssClass('show');
 
     tc.collapsed = true;
     fixture.detectChanges();
-    expect(collapseEl).not.toHaveCssClass('in');
+    expect(collapseEl).not.toHaveCssClass('show');
 
     tc.collapsed = false;
     fixture.detectChanges();
-    expect(collapseEl).toHaveCssClass('in');
+    expect(collapseEl).toHaveCssClass('show');
   });
 
   it('should allow toggling collapse from outside', () => {
@@ -72,11 +72,11 @@ describe('ngb-collapse', () => {
 
     buttonEl.click();
     fixture.detectChanges();
-    expect(collapseEl).not.toHaveCssClass('in');
+    expect(collapseEl).not.toHaveCssClass('show');
 
     buttonEl.click();
     fixture.detectChanges();
-    expect(collapseEl).toHaveCssClass('in');
+    expect(collapseEl).toHaveCssClass('show');
   });
 });
 

diff --git a/src/collapse/collapse.ts b/src/collapse/collapse.ts
@@ -6,7 +6,7 @@ import {Directive, Input} from '@angular/core';
 @Directive({
   selector: '[ngbCollapse]',
   exportAs: 'ngbCollapse',
-  host: {'[class.collapse]': 'true', '[class.in]': '!collapsed', '[attr.aria-expanded]': '!collapsed'}
+  host: {'[class.collapse]': 'true', '[class.show]': '!collapsed', '[attr.aria-expanded]': '!collapsed'}
 })
 export class NgbCollapse {
   /**