Skip to content

Commit

Permalink
fix(tabset): rename change event to avoid conflicts with native ones
Browse files Browse the repository at this point in the history
BREAKING CHANGE: the `change` event on the tabset level was renamed to `tabChange`.
Before:

`<ngb-tabset (change)="...">`

after:

`<ngb-tabset (tabChange)="...">`

Fixes #741
Closes #747
  • Loading branch information
pkozlowski-opensource committed Sep 16, 2016
1 parent 4f5867c commit 9d2754f
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 6 deletions.
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<ngb-tabset (change)="beforeChange($event)">
<ngb-tabset (tabChange)="beforeChange($event)">
<ngb-tab title="Simple" id="foo">
<template ngbTabContent>
<p>Raw denim you probably haven't heard of them jean shorts Austin. Nesciunt tofu stumptown aliqua, retro synth
Expand Down
6 changes: 3 additions & 3 deletions src/tabset/tabset.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -272,7 +272,7 @@ describe('ngb-tabset', () => {

it('should emit tab change event when switching tabs', () => {
const fixture = createTestComponent(`
<ngb-tabset #myTabSet="ngbTabset" (change)="changeCallback($event)">
<ngb-tabset #myTabSet="ngbTabset" (tabChange)="changeCallback($event)">
<ngb-tab id="first" title="first"><template ngbTabContent>First</template></ngb-tab>
<ngb-tab id="second" title="second"><template ngbTabContent>Second</template></ngb-tab>
</ngb-tabset>
Expand All @@ -299,7 +299,7 @@ describe('ngb-tabset', () => {

it('should not emit tab change event when selecting currently active and disabled tabs', () => {
const fixture = createTestComponent(`
<ngb-tabset #myTabSet="ngbTabset" (change)="changeCallback($event)">
<ngb-tabset #myTabSet="ngbTabset" (tabChange)="changeCallback($event)">
<ngb-tab id="first" title="first"><template ngbTabContent>First</template></ngb-tab>
<ngb-tab id="second" title="second" [disabled]="true"><template ngbTabContent>Second</template></ngb-tab>
</ngb-tabset>
Expand All @@ -324,7 +324,7 @@ describe('ngb-tabset', () => {

it('should cancel tab change when preventDefault() is called', () => {
const fixture = createTestComponent(`
<ngb-tabset #myTabSet="ngbTabset" (change)="changeCallback($event)">
<ngb-tabset #myTabSet="ngbTabset" (tabChange)="changeCallback($event)">
<ngb-tab id="first" title="first"><template ngbTabContent>First</template></ngb-tab>
<ngb-tab id="second" title="second"><template ngbTabContent>Second</template></ngb-tab>
</ngb-tabset>
Expand Down
4 changes: 2 additions & 2 deletions src/tabset/tabset.ts
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,7 @@ export class NgbTabset implements AfterContentChecked {
/**
* A tab change event fired right before the tab selection happens. See NgbTabChangeEvent for payload details
*/
@Output() change = new EventEmitter<NgbTabChangeEvent>();
@Output() tabChange = new EventEmitter<NgbTabChangeEvent>();

constructor(config: NgbTabsetConfig) { this.type = config.type; }

Expand All @@ -125,7 +125,7 @@ export class NgbTabset implements AfterContentChecked {
if (selectedTab && !selectedTab.disabled && this.activeId !== selectedTab.id) {
let defaultPrevented = false;

this.change.emit(
this.tabChange.emit(
{activeId: this.activeId, nextId: selectedTab.id, preventDefault: () => { defaultPrevented = true; }});

if (!defaultPrevented) {
Expand Down

0 comments on commit 9d2754f

Please sign in to comment.