File tree Expand file tree Collapse file tree 3 files changed +8
-2
lines changed Expand file tree Collapse file tree 3 files changed +8
-2
lines changed Original file line number Diff line number Diff line change @@ -70,7 +70,7 @@ export const TOGGLE_VALUE_ACCESSOR: any = {
70
70
'[attr.aria-checked]="_value" ' +
71
71
'[attr.aria-labelledby]="_labelId" ' +
72
72
'[attr.aria-disabled]="_disabled" ' +
73
- 'class="item-cover">' +
73
+ 'class="item-cover" disable-activated >' +
74
74
'</button>' ,
75
75
host : {
76
76
'[class.toggle-disabled]' : '_disabled'
Original file line number Diff line number Diff line change @@ -6,10 +6,12 @@ import { PointerCoordinates } from '../util/dom';
6
6
7
7
8
8
export class Activator implements ActivatorBase {
9
+
9
10
protected _queue : HTMLElement [ ] = [ ] ;
10
11
protected _active : HTMLElement [ ] = [ ] ;
11
12
protected _activeDefer : Function ;
12
13
protected _clearDefer : Function ;
14
+
13
15
_css : string ;
14
16
activatedDelay = ADD_ACTIVATED_DEFERS ;
15
17
clearDelay = CLEAR_STATE_DEFERS ;
@@ -19,6 +21,9 @@ export class Activator implements ActivatorBase {
19
21
}
20
22
21
23
clickAction ( ev : UIEvent , activatableEle : HTMLElement , startCoord : PointerCoordinates ) {
24
+ if ( isActivatedDisabled ( ev , activatableEle ) ) {
25
+ return ;
26
+ }
22
27
// a click happened, so immediately deactive all activated elements
23
28
this . _scheduleClear ( ) ;
24
29
Original file line number Diff line number Diff line change @@ -18,6 +18,7 @@ import { UIEventManager } from '../gestures/ui-event-manager';
18
18
*/
19
19
@Injectable ( )
20
20
export class TapClick {
21
+
21
22
private disableClick : number = 0 ;
22
23
private usePolyfill : boolean ;
23
24
private activator : ActivatorBase ;
@@ -236,7 +237,7 @@ function getActivatableTarget(ele: HTMLElement): any {
236
237
/**
237
238
* @hidden
238
239
*/
239
- export const isActivatable = function ( ele : HTMLElement ) {
240
+ export function isActivatable ( ele : HTMLElement ) {
240
241
if ( ACTIVATABLE_ELEMENTS . indexOf ( ele . tagName ) > - 1 ) {
241
242
return true ;
242
243
}
You can’t perform that action at this time.
0 commit comments