Merge remote-tracking branch 'origin/latest' into latest

ceolter · ceolter · commit 4f04c34d5f88 · 2019-03-08T13:48:27.000Z
diff --git a/packages/ag-grid-community/src/ts/filter/baseFilter.ts b/packages/ag-grid-community/src/ts/filter/baseFilter.ts
@@ -381,8 +381,10 @@ export abstract class  BaseFilter<T, P extends IFilterParams, M> extends Compone
     }
 
     public getDebounceMs(filterParams: ITextFilterParams | INumberFilterParams): number {
-        if (filterParams.applyButton && filterParams.debounceMs) {
-            console.warn('ag-Grid: debounceMs is ignored when applyButton = true');
+        if (this.applyActive) {
+            if (filterParams.debounceMs != null) {
+                console.warn('ag-Grid: debounceMs is ignored when applyButton = true');
+            }
             return 0;
         }
         return filterParams.debounceMs != null ? filterParams.debounceMs : 500;

Original file line number	Diff line number	Diff line change
`@@ -381,8 +381,10 @@ export abstract class BaseFilter<T, P extends IFilterParams, M> extends Compone`
`381`	`381`	`}`
`382`	`382`
`383`	`383`	`public getDebounceMs(filterParams: ITextFilterParams \| INumberFilterParams): number {`
`384`		`- if (filterParams.applyButton && filterParams.debounceMs) {`
`385`		`- console.warn('ag-Grid: debounceMs is ignored when applyButton = true');`
	`384`	`+ if (this.applyActive) {`
	`385`	`+ if (filterParams.debounceMs != null) {`
	`386`	`+ console.warn('ag-Grid: debounceMs is ignored when applyButton = true');`
	`387`	`+ }`
`386`	`388`	`return 0;`
`387`	`389`	`}`
`388`	`390`	`return filterParams.debounceMs != null ? filterParams.debounceMs : 500;`