Skip to content

Commit

Permalink
fix(module:button): disable the link type button's wave animation
Browse files Browse the repository at this point in the history
  • Loading branch information
huabin.zhao committed Jun 6, 2019
1 parent 843c5f7 commit cb91c9a
Show file tree
Hide file tree
Showing 3 changed files with 22 additions and 0 deletions.
6 changes: 6 additions & 0 deletions components/button/nz-button.component.ts
Original file line number Diff line number Diff line change
Expand Up @@ -169,5 +169,11 @@ export class NzButtonComponent implements AfterContentInit, OnInit, OnDestroy, O
if (changes.nzLoading) {
this.updateIconDisplay(this.nzLoading);
}
if (this.nzType === 'link') {
this.nzWave.disable();
} else if (!this.waveConfig || (this.waveConfig && this.waveConfig.disabled !== true)) {
// while NZ_WAVE_GLOBAL_CONFIG not configured, the default means waveConfig disabled is false, it should enable angin
this.nzWave.enable();
}
}
}
8 changes: 8 additions & 0 deletions components/core/responsive/index.ts
Original file line number Diff line number Diff line change
@@ -1 +1,9 @@
/**
* @license
* Copyright Alibaba.com All Rights Reserved.
*
* Use of this source code is governed by an MIT-style license that can be
* found in the LICENSE file at https://github.com/NG-ZORRO/ng-zorro-antd/blob/master/LICENSE
*/

export * from './public-api';
8 changes: 8 additions & 0 deletions components/core/responsive/public-api.ts
Original file line number Diff line number Diff line change
@@ -1 +1,9 @@
/**
* @license
* Copyright Alibaba.com All Rights Reserved.
*
* Use of this source code is governed by an MIT-style license that can be
* found in the LICENSE file at https://github.com/NG-ZORRO/ng-zorro-antd/blob/master/LICENSE
*/

export * from './break-point';

0 comments on commit cb91c9a

Please sign in to comment.