From 8c1f2cc957def2e578ffe11ffa54bfa865053247 Mon Sep 17 00:00:00 2001 From: Denys Vuika Date: Tue, 1 Nov 2016 15:25:04 +0000 Subject: [PATCH] #960 fix event handling for FF - use cross browser `event.target` instead of IE-specific `event.srcElement` --- .../dynamic-table/editors/boolean/boolean.editor.spec.ts | 2 +- .../dynamic-table/editors/boolean/boolean.editor.ts | 2 +- .../editors/dropdown/dropdown.editor.spec.ts | 2 +- .../dynamic-table/editors/dropdown/dropdown.editor.ts | 2 +- .../dynamic-table/editors/text/text.editor.spec.ts | 2 +- .../widgets/dynamic-table/editors/text/text.editor.ts | 2 +- .../src/components/datatable/datatable.component.spec.ts | 8 ++++---- .../src/components/datatable/datatable.component.ts | 2 +- 8 files changed, 11 insertions(+), 11 deletions(-) diff --git a/ng2-components/ng2-activiti-form/src/components/widgets/dynamic-table/editors/boolean/boolean.editor.spec.ts b/ng2-components/ng2-activiti-form/src/components/widgets/dynamic-table/editors/boolean/boolean.editor.spec.ts index 5899693d6c..052b64914d 100644 --- a/ng2-components/ng2-activiti-form/src/components/widgets/dynamic-table/editors/boolean/boolean.editor.spec.ts +++ b/ng2-components/ng2-activiti-form/src/components/widgets/dynamic-table/editors/boolean/boolean.editor.spec.ts @@ -29,7 +29,7 @@ describe('BooleanEditorComponent', () => { it('should update row value on change', () => { let row = { value: {} }; let column = { id: 'key' }; - let event = { srcElement: { checked: true } }; + let event = { target: { checked: true } }; component.onValueChanged(row, column, event); expect(row.value[column.id]).toBeTruthy(); diff --git a/ng2-components/ng2-activiti-form/src/components/widgets/dynamic-table/editors/boolean/boolean.editor.ts b/ng2-components/ng2-activiti-form/src/components/widgets/dynamic-table/editors/boolean/boolean.editor.ts index d13846dbea..eb65f03598 100644 --- a/ng2-components/ng2-activiti-form/src/components/widgets/dynamic-table/editors/boolean/boolean.editor.ts +++ b/ng2-components/ng2-activiti-form/src/components/widgets/dynamic-table/editors/boolean/boolean.editor.ts @@ -28,7 +28,7 @@ import { DynamicTableRow, DynamicTableColumn } from './../../../core/index'; export class BooleanEditorComponent extends CellEditorComponent { onValueChanged(row: DynamicTableRow, column: DynamicTableColumn, event: any) { - let value: boolean = (event.srcElement).checked; + let value: boolean = (event.target).checked; row.value[column.id] = value; } diff --git a/ng2-components/ng2-activiti-form/src/components/widgets/dynamic-table/editors/dropdown/dropdown.editor.spec.ts b/ng2-components/ng2-activiti-form/src/components/widgets/dynamic-table/editors/dropdown/dropdown.editor.spec.ts index f2c5d7e89d..71e0335523 100644 --- a/ng2-components/ng2-activiti-form/src/components/widgets/dynamic-table/editors/dropdown/dropdown.editor.spec.ts +++ b/ng2-components/ng2-activiti-form/src/components/widgets/dynamic-table/editors/dropdown/dropdown.editor.spec.ts @@ -146,7 +146,7 @@ describe('DropdownEditorComponent', () => { }); it('should update row on value change', () => { - let event = { srcElement: { value: 'two' } }; + let event = { target: { value: 'two' } }; component.onValueChanged(row, column, event); expect(row.value[column.id]).toBe(column.options[1]); }); diff --git a/ng2-components/ng2-activiti-form/src/components/widgets/dynamic-table/editors/dropdown/dropdown.editor.ts b/ng2-components/ng2-activiti-form/src/components/widgets/dynamic-table/editors/dropdown/dropdown.editor.ts index 88e86bada5..dcf1ac28b9 100644 --- a/ng2-components/ng2-activiti-form/src/components/widgets/dynamic-table/editors/dropdown/dropdown.editor.ts +++ b/ng2-components/ng2-activiti-form/src/components/widgets/dynamic-table/editors/dropdown/dropdown.editor.ts @@ -61,7 +61,7 @@ export class DropdownEditorComponent extends CellEditorComponent implements OnIn } onValueChanged(row: DynamicTableRow, column: DynamicTableColumn, event: any) { - let value: any = (event.srcElement).value; + let value: any = (event.target).value; value = column.options.find(opt => opt.name === value); row.value[column.id] = value; } diff --git a/ng2-components/ng2-activiti-form/src/components/widgets/dynamic-table/editors/text/text.editor.spec.ts b/ng2-components/ng2-activiti-form/src/components/widgets/dynamic-table/editors/text/text.editor.spec.ts index cad08cc0ab..7bfdfaf374 100644 --- a/ng2-components/ng2-activiti-form/src/components/widgets/dynamic-table/editors/text/text.editor.spec.ts +++ b/ng2-components/ng2-activiti-form/src/components/widgets/dynamic-table/editors/text/text.editor.spec.ts @@ -31,7 +31,7 @@ describe('TextEditorComponent', () => { let column = { id: 'key' }; const value = ''; - let event = { srcElement: { value } }; + let event = { target: { value } }; editor.onValueChanged(row, column, event); expect(row.value[column.id]).toBe(value); diff --git a/ng2-components/ng2-activiti-form/src/components/widgets/dynamic-table/editors/text/text.editor.ts b/ng2-components/ng2-activiti-form/src/components/widgets/dynamic-table/editors/text/text.editor.ts index dc76cf90fd..6435fb0fe5 100644 --- a/ng2-components/ng2-activiti-form/src/components/widgets/dynamic-table/editors/text/text.editor.ts +++ b/ng2-components/ng2-activiti-form/src/components/widgets/dynamic-table/editors/text/text.editor.ts @@ -28,7 +28,7 @@ import { DynamicTableRow, DynamicTableColumn } from './../../../core/index'; export class TextEditorComponent extends CellEditorComponent { onValueChanged(row: DynamicTableRow, column: DynamicTableColumn, event: any) { - let value: any = (event.srcElement).value; + let value: any = (event.target).value; row.value[column.id] = value; } diff --git a/ng2-components/ng2-alfresco-datatable/src/components/datatable/datatable.component.spec.ts b/ng2-components/ng2-alfresco-datatable/src/components/datatable/datatable.component.spec.ts index 18e214be4c..42d22be13e 100644 --- a/ng2-components/ng2-alfresco-datatable/src/components/datatable/datatable.component.spec.ts +++ b/ng2-components/ng2-alfresco-datatable/src/components/datatable/datatable.component.spec.ts @@ -314,26 +314,26 @@ describe('DataTable', () => { it('should replace image source with fallback thumbnail on error', () => { let event = { - srcElement: { + target: { src: 'missing-image' } }; dataTable.fallbackThumbnail = ''; dataTable.onImageLoadingError(event); - expect(event.srcElement.src).toBe(dataTable.fallbackThumbnail); + expect(event.target.src).toBe(dataTable.fallbackThumbnail); }); it('should replace image source only when fallback available', () => { const originalSrc = 'missing-image'; let event = { - srcElement: { + target: { src: originalSrc } }; dataTable.fallbackThumbnail = null; dataTable.onImageLoadingError(event); - expect(event.srcElement.src).toBe(originalSrc); + expect(event.target.src).toBe(originalSrc); }); }); diff --git a/ng2-components/ng2-alfresco-datatable/src/components/datatable/datatable.component.ts b/ng2-components/ng2-alfresco-datatable/src/components/datatable/datatable.component.ts index 9760b4da69..573ba6967a 100644 --- a/ng2-components/ng2-alfresco-datatable/src/components/datatable/datatable.component.ts +++ b/ng2-components/ng2-alfresco-datatable/src/components/datatable/datatable.component.ts @@ -146,7 +146,7 @@ export class DataTableComponent implements OnInit, AfterViewChecked { onImageLoadingError(event: Event) { if (event && this.fallbackThumbnail) { - let element = event.srcElement; + let element = event.target; element.src = this.fallbackThumbnail; } }