Skip to content

Commit

Permalink
Merge pull request #391 from yagajs/fix-dblclick
Browse files Browse the repository at this point in the history
Fix double-click event
  • Loading branch information
OpenSteveMap committed May 5, 2018
2 parents 0219155 + 773dbfa commit e79fb6b
Show file tree
Hide file tree
Showing 29 changed files with 138 additions and 139 deletions.
4 changes: 2 additions & 2 deletions examples/geojson-directive/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ const template: string = `
(tooltipopen)="handleEvent('tooltipopen', $event);"
(tooltipclose)="handleEvent('tooltipclose', $event);"
(click)="handleEvent('click', $event);"
(dbclick)="handleEvent('dbclick', $event);"
(dblclick)="handleEvent('dblclick', $event);"
(mousedown)="handleEvent('mousedown', $event);"
(mouseover)="handleEvent('mouseover', $event);"
(mouseout)="handleEvent('mouseout', $event);"
Expand Down Expand Up @@ -115,7 +115,7 @@ export class AppComponent extends ExampleAppComponentBlueprint {
{name: 'tooltipopen', value: '', type: 'event' },
{name: 'tooltipclose', value: '', type: 'event' },
{name: 'click', value: '', type: 'event' },
{name: 'dbclick', value: '', type: 'event' },
{name: 'dblclick', value: '', type: 'event' },
{name: 'mousedown', value: '', type: 'event' },
{name: 'mouseover', value: '', type: 'event' },
{name: 'mouseout', value: '', type: 'event' },
Expand Down
4 changes: 2 additions & 2 deletions examples/marker-directive/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ const template: string = `
(tooltipopen)="handleEvent('tooltipopen', $event);"
(tooltipclose)="handleEvent('tooltipclose', $event);"
(click)="handleEvent('click', $event);"
(dbclick)="handleEvent('dbclick', $event);"
(dblclick)="handleEvent('dblclick', $event);"
(mousedown)="handleEvent('mousedown', $event);"
(mouseover)="handleEvent('mouseover', $event);"
(mouseout)="handleEvent('mouseout', $event);"
Expand Down Expand Up @@ -111,7 +111,7 @@ export class AppComponent extends ExampleAppComponentBlueprint {
{name: 'tooltipopen', value: '', type: 'event' },
{name: 'tooltipclose', value: '', type: 'event' },
{name: 'click', value: '', type: 'event' },
{name: 'dbclick', value: '', type: 'event' },
{name: 'dblclick', value: '', type: 'event' },
{name: 'mousedown', value: '', type: 'event' },
{name: 'mouseover', value: '', type: 'event' },
{name: 'mouseout', value: '', type: 'event' },
Expand Down
4 changes: 2 additions & 2 deletions examples/tile-layer-directive/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ const template: string = `
(tooltipopen)="handleEvent('tooltipopen', $event);"
(tooltipclose)="handleEvent('tooltipclose', $event);"
(click)="handleEvent('click', $event);"
(dbclick)="handleEvent('dbclick', $event);"
(dblclick)="handleEvent('dblclick', $event);"
(mousedown)="handleEvent('mousedown', $event);"
(mouseover)="handleEvent('mouseover', $event);"
(mouseout)="handleEvent('mouseout', $event);"
Expand Down Expand Up @@ -120,7 +120,7 @@ export class AppComponent extends ExampleAppComponentBlueprint {
{name: 'tooltipopen', value: '', type: 'event' },
{name: 'tooltipclose', value: '', type: 'event' },
{name: 'click', value: '', type: 'event' },
{name: 'dbclick', value: '', type: 'event' },
{name: 'dblclick', value: '', type: 'event' },
{name: 'mousedown', value: '', type: 'event' },
{name: 'mouseover', value: '', type: 'event' },
{name: 'mouseout', value: '', type: 'event' },
Expand Down
4 changes: 2 additions & 2 deletions examples/wms-layer-directive/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ const template: string = `
(tooltipopen)="handleEvent('tooltipopen', $event);"
(tooltipclose)="handleEvent('tooltipclose', $event);"
(click)="handleEvent('click', $event);"
(dbclick)="handleEvent('dbclick', $event);"
(dblclick)="handleEvent('dblclick', $event);"
(mousedown)="handleEvent('mousedown', $event);"
(mouseover)="handleEvent('mouseover', $event);"
(mouseout)="handleEvent('mouseout', $event);"
Expand Down Expand Up @@ -133,7 +133,7 @@ export class AppComponent extends ExampleAppComponentBlueprint {
{name: 'tooltipopen', value: '', type: 'event' },
{name: 'tooltipclose', value: '', type: 'event' },
{name: 'click', value: '', type: 'event' },
{name: 'dbclick', value: '', type: 'event' },
{name: 'dblclick', value: '', type: 'event' },
{name: 'mousedown', value: '', type: 'event' },
{name: 'mouseover', value: '', type: 'event' },
{name: 'mouseout', value: '', type: 'event' },
Expand Down
6 changes: 3 additions & 3 deletions ts/attribution-control.directive.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -240,12 +240,12 @@ describe('Attribution-Control Directive', () => {
}));
});
});
describe('(dbclick)', () => {
describe('(dblclick)', () => {
it('should fire an event when firing event from DOM', (done: MochaDone) => {
control.dbclickEvent.subscribe(() => {
control.dblclickEvent.subscribe(() => {
done();
});
control.getContainer().dispatchEvent(new MouseEvent('dbclick', {
control.getContainer().dispatchEvent(new MouseEvent('dblclick', {
clientX: 3,
clientY: 4,
screenX: 1,
Expand Down
14 changes: 7 additions & 7 deletions ts/attribution-control.directive.ts
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ import { enhanceMouseEvent } from './mouse-event-helper';
* (add)="..."
* (remove)="..."
* (click)="..."
* (dbclick)="..."
* (dblclick)="..."
* (mousedown)="..."
* (mouseover)="..."
* (mouseout)="..."
Expand Down Expand Up @@ -98,11 +98,11 @@ export class AttributionControlDirective extends Control.Attribution implements
*/
@Output('click') public clickEvent: EventEmitter<LeafletMouseEvent> = new EventEmitter();
/**
* From leaflet fired dbclick event.
* Use it with `<yaga-attribution-control (dbclick)="processEvent($event)">`
* @link http://leafletjs.com/reference-1.2.0.html#control-attribution-dbclick Original Leaflet documentation
* From leaflet fired dblclick event.
* Use it with `<yaga-attribution-control (dblclick)="processEvent($event)">`
* @link http://leafletjs.com/reference-1.2.0.html#control-attribution-dblclick Original Leaflet documentation
*/
@Output('dbclick') public dbclickEvent: EventEmitter<LeafletMouseEvent> = new EventEmitter();
@Output('dblclick') public dblclickEvent: EventEmitter<LeafletMouseEvent> = new EventEmitter();
/**
* From leaflet fired mousedown event.
* Use it with `<yaga-attribution-control (mousedown)="processEvent($event)">`
Expand Down Expand Up @@ -132,8 +132,8 @@ export class AttributionControlDirective extends Control.Attribution implements
this.getContainer().addEventListener('click', (event: MouseEvent) => {
this.clickEvent.emit(enhanceMouseEvent(event, (this as any)._map as Map));
});
this.getContainer().addEventListener('dbclick', (event: MouseEvent) => {
this.dbclickEvent.emit(enhanceMouseEvent(event, (this as any)._map as Map));
this.getContainer().addEventListener('dblclick', (event: MouseEvent) => {
this.dblclickEvent.emit(enhanceMouseEvent(event, (this as any)._map as Map));
});
this.getContainer().addEventListener('mousedown', (event: MouseEvent) => {
this.mousedownEvent.emit(enhanceMouseEvent(event, (this as any)._map as Map));
Expand Down
6 changes: 3 additions & 3 deletions ts/circle-marker.directive.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -391,15 +391,15 @@ describe('Circle-Marker Directive', () => {
layer.fire('click', testEvent);
});
});
describe('(dbclick)', () => {
describe('(dblclick)', () => {
it('should fire event in Angular when firing event in Leaflet', (done: MochaDone) => {
const testHandle: any = {};
const testEvent: any = { testHandle };
layer.dbclickEvent.subscribe((event: any) => {
layer.dblclickEvent.subscribe((event: any) => {
expect(event.testHandle).to.equal(testHandle);
return done();
});
layer.fire('dbclick', testEvent);
layer.fire('dblclick', testEvent);
});
});
describe('(mousedown)', () => {
Expand Down
12 changes: 6 additions & 6 deletions ts/circle-marker.directive.ts
Original file line number Diff line number Diff line change
Expand Up @@ -270,11 +270,11 @@ export class CircleMarkerDirective<T> extends CircleMarker implements OnDestroy,
*/
@Output('click') public clickEvent: EventEmitter<LeafletMouseEvent> = new EventEmitter();
/**
* From leaflet fired dbclick event.
* Use it with `<yaga-circle-marker (dbclick)="processEvent($event)">`
* @link http://leafletjs.com/reference-1.2.0.html#circlemarker-dbclick Original Leaflet documentation
* From leaflet fired dblclick event.
* Use it with `<yaga-circle-marker (dblclick)="processEvent($event)">`
* @link http://leafletjs.com/reference-1.2.0.html#circlemarker-dblclick Original Leaflet documentation
*/
@Output('dbclick') public dbclickEvent: EventEmitter<LeafletMouseEvent> = new EventEmitter();
@Output('dblclick') public dblclickEvent: EventEmitter<LeafletMouseEvent> = new EventEmitter();
/**
* From leaflet fired mousedown event.
* Use it with `<yaga-circle-marker (mousedown)="processEvent($event)">`
Expand Down Expand Up @@ -344,8 +344,8 @@ export class CircleMarkerDirective<T> extends CircleMarker implements OnDestroy,
this.on('click', (event: LeafletMouseEvent) => {
this.clickEvent.emit(event);
});
this.on('dbclick', (event: LeafletMouseEvent) => {
this.dbclickEvent.emit(event);
this.on('dblclick', (event: LeafletMouseEvent) => {
this.dblclickEvent.emit(event);
});
this.on('mousedown', (event: LeafletMouseEvent) => {
this.mousedownEvent.emit(event);
Expand Down
14 changes: 7 additions & 7 deletions ts/circle.directive.ts
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ import { MapComponent } from './map.component';
* (tooltipopen)="..."
* (tooltipclose)="..."
* (click)="..."
* (dbclick)="..."
* (dblclick)="..."
* (mousedown)="..."
* (mouseover)="..."
* (mouseout)="..."
Expand Down Expand Up @@ -274,11 +274,11 @@ export class CircleDirective<T> extends Circle implements OnDestroy, AfterConten
*/
@Output('click') public clickEvent: EventEmitter<LeafletMouseEvent> = new EventEmitter();
/**
* From leaflet fired dbclick event.
* Use it with `<yaga-circle (dbclick)="processEvent($event)">`
* @link http://leafletjs.com/reference-1.2.0.html#circle-dbclick Original Leaflet documentation
* From leaflet fired dblclick event.
* Use it with `<yaga-circle (dblclick)="processEvent($event)">`
* @link http://leafletjs.com/reference-1.2.0.html#circle-dblclick Original Leaflet documentation
*/
@Output('dbclick') public dbclickEvent: EventEmitter<LeafletMouseEvent> = new EventEmitter();
@Output('dblclick') public dblclickEvent: EventEmitter<LeafletMouseEvent> = new EventEmitter();
/**
* From leaflet fired mousedown event.
* Use it with `<yaga-circle (mousedown)="processEvent($event)">`
Expand Down Expand Up @@ -348,8 +348,8 @@ export class CircleDirective<T> extends Circle implements OnDestroy, AfterConten
this.on('click', (event: LeafletMouseEvent) => {
this.clickEvent.emit(event);
});
this.on('dbclick', (event: LeafletMouseEvent) => {
this.dbclickEvent.emit(event);
this.on('dblclick', (event: LeafletMouseEvent) => {
this.dblclickEvent.emit(event);
});
this.on('mousedown', (event: LeafletMouseEvent) => {
this.mousedownEvent.emit(event);
Expand Down
6 changes: 3 additions & 3 deletions ts/geojson.directive.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -335,13 +335,13 @@ describe('GeoJSON Directive', () => {
layer.fire('click', testEvent);
});
});
describe('(dbclick)', () => {
describe('(dblclick)', () => {
it('should fire event in Angular when firing event in Leaflet', (done: MochaDone) => {
layer.dbclickEvent.subscribe((event: any) => {
layer.dblclickEvent.subscribe((event: any) => {
expect(event.testHandle).to.equal(testHandle);
return done();
});
layer.fire('dbclick', testEvent);
layer.fire('dblclick', testEvent);
});
});
describe('(mousedown)', () => {
Expand Down
14 changes: 7 additions & 7 deletions ts/geojson.directive.ts
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,7 @@ export interface IGeoJSONDirectiveMiddlewareDictionary<T> {
* (tooltipopen)="..."
* (tooltipclose)="..."
* (click)="..."
* (dbclick)="..."
* (dblclick)="..."
* (mousedown)="..."
* (mouseover)="..."
* (mouseout)="..."
Expand Down Expand Up @@ -177,11 +177,11 @@ export class GeoJSONDirective<T> extends GeoJSON implements OnDestroy, AfterCont
*/
@Output('click') public clickEvent: EventEmitter<LeafletMouseEvent> = new EventEmitter();
/**
* From leaflet fired dbclick event.
* Use it with `<yaga-geojson (dbclick)="processEvent($event)">`
* @link http://leafletjs.com/reference-1.2.0.html#geojson-dbclick Original Leaflet documentation
* From leaflet fired dblclick event.
* Use it with `<yaga-geojson (dblclick)="processEvent($event)">`
* @link http://leafletjs.com/reference-1.2.0.html#geojson-dblclick Original Leaflet documentation
*/
@Output('dbclick') public dbclickEvent: EventEmitter<LeafletMouseEvent> = new EventEmitter();
@Output('dblclick') public dblclickEvent: EventEmitter<LeafletMouseEvent> = new EventEmitter();
/**
* From leaflet fired mousedown event.
* Use it with `<yaga-geojson (mousedown)="processEvent($event)">`
Expand Down Expand Up @@ -278,8 +278,8 @@ export class GeoJSONDirective<T> extends GeoJSON implements OnDestroy, AfterCont
this.on('click', (event: LeafletMouseEvent) => {
this.clickEvent.emit(event);
});
this.on('dbclick', (event: LeafletMouseEvent) => {
this.dbclickEvent.emit(event);
this.on('dblclick', (event: LeafletMouseEvent) => {
this.dblclickEvent.emit(event);
});
this.on('mousedown', (event: LeafletMouseEvent) => {
this.mousedownEvent.emit(event);
Expand Down
6 changes: 3 additions & 3 deletions ts/image-overlay.directive.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -486,15 +486,15 @@ describe('Image-Overlay Directive', () => {
layer.fire('click', testEvent);
});
});
describe('(dbclick)', () => {
describe('(dblclick)', () => {
it('should fire event in Angular when firing event in Leaflet', (done: MochaDone) => {
const testHandle: any = {};
const testEvent: any = { testHandle };
layer.dbclickEvent.subscribe((event: any) => {
layer.dblclickEvent.subscribe((event: any) => {
expect(event.testHandle).to.equal(testEvent.testHandle);
return done();
});
layer.fire('dbclick', testEvent);
layer.fire('dblclick', testEvent);
});
});
describe('(mousedown)', () => {
Expand Down
14 changes: 7 additions & 7 deletions ts/image-overlay.directive.ts
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ import { LayerProvider } from './layer.provider';
* (tooltipopen)="..."
* (tooltipclose)="..."
* (click)="..."
* (dbclick)="..."
* (dblclick)="..."
* (mousedown)="..."
* (mouseover)="..."
* (mouseout)="..."
Expand Down Expand Up @@ -176,11 +176,11 @@ export class ImageOverlayDirective extends ImageOverlay implements OnDestroy {
*/
@Output('click') public clickEvent: EventEmitter<LeafletMouseEvent> = new EventEmitter();
/**
* From leaflet fired dbclick event.
* Use it with `<yaga-image-overlay (dbclick)="processEvent($event)">`
* @link http://leafletjs.com/reference-1.2.0.html#imageoverlay-dbclick Original Leaflet documentation
* From leaflet fired dblclick event.
* Use it with `<yaga-image-overlay (dblclick)="processEvent($event)">`
* @link http://leafletjs.com/reference-1.2.0.html#imageoverlay-dblclick Original Leaflet documentation
*/
@Output('dbclick') public dbclickEvent: EventEmitter<LeafletMouseEvent> = new EventEmitter();
@Output('dblclick') public dblclickEvent: EventEmitter<LeafletMouseEvent> = new EventEmitter();
/**
* From leaflet fired mousedown event.
* Use it with `<yaga-image-overlay (mousedown)="processEvent($event)">`
Expand Down Expand Up @@ -258,8 +258,8 @@ export class ImageOverlayDirective extends ImageOverlay implements OnDestroy {
this.on('click', (event: LeafletMouseEvent) => {
this.clickEvent.emit(event);
});
this.on('dbclick', (event: LeafletMouseEvent) => {
this.dbclickEvent.emit(event);
this.on('dblclick', (event: LeafletMouseEvent) => {
this.dblclickEvent.emit(event);
});
this.on('mousedown', (event: LeafletMouseEvent) => {
this.mousedownEvent.emit(event);
Expand Down
6 changes: 3 additions & 3 deletions ts/layers-control.directive.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -140,12 +140,12 @@ describe('Layers-Control Directive', () => {
}));
});
});
describe('(dbclick)', () => {
describe('(dblclick)', () => {
it('should fire an event when firing event from DOM', (done: MochaDone) => {
control.dbclickEvent.subscribe(() => {
control.dblclickEvent.subscribe(() => {
done();
});
control.getContainer().dispatchEvent(new MouseEvent('dbclick', {
control.getContainer().dispatchEvent(new MouseEvent('dblclick', {
clientX: 3,
clientY: 4,
screenX: 1,
Expand Down
14 changes: 7 additions & 7 deletions ts/layers-control.directive.ts
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ import { enhanceMouseEvent } from './mouse-event-helper';
* (add)="..."
* (remove)="..."
* (click)="..."
* (dbclick)="..."
* (dblclick)="..."
* (mousedown)="..."
* (mouseover)="..."
* (mouseout)="..."
Expand Down Expand Up @@ -94,11 +94,11 @@ export class LayersControlDirective extends Control.Layers implements OnDestroy
*/
@Output('click') public clickEvent: EventEmitter<LeafletMouseEvent> = new EventEmitter();
/**
* From leaflet fired dbclick event.
* Use it with `<yaga-layers-control (dbclick)="processEvent($event)">`
* @link http://leafletjs.com/reference-1.2.0.html#control-layers-dbclick Original Leaflet documentation
* From leaflet fired dblclick event.
* Use it with `<yaga-layers-control (dblclick)="processEvent($event)">`
* @link http://leafletjs.com/reference-1.2.0.html#control-layers-dblclick Original Leaflet documentation
*/
@Output('dbclick') public dbclickEvent: EventEmitter<LeafletMouseEvent> = new EventEmitter();
@Output('dblclick') public dblclickEvent: EventEmitter<LeafletMouseEvent> = new EventEmitter();
/**
* From leaflet fired mousedown event.
* Use it with `<yaga-layers-control (mousedown)="processEvent($event)">`
Expand Down Expand Up @@ -130,8 +130,8 @@ export class LayersControlDirective extends Control.Layers implements OnDestroy
this.getContainer().addEventListener('click', (event: MouseEvent) => {
this.clickEvent.emit(enhanceMouseEvent(event, (this as any)._map as Map));
});
this.getContainer().addEventListener('dbclick', (event: MouseEvent) => {
this.dbclickEvent.emit(enhanceMouseEvent(event, (this as any)._map as Map));
this.getContainer().addEventListener('dblclick', (event: MouseEvent) => {
this.dblclickEvent.emit(enhanceMouseEvent(event, (this as any)._map as Map));
});
this.getContainer().addEventListener('mousedown', (event: MouseEvent) => {
this.mousedownEvent.emit(enhanceMouseEvent(event, (this as any)._map as Map));
Expand Down
6 changes: 3 additions & 3 deletions ts/marker.directive.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -613,15 +613,15 @@ describe('Marker Directive', () => {
layer.fire('click', testEvent);
});
});
describe('(dbclick)', () => {
describe('(dblclick)', () => {
it('should fire event in Angular when firing event in Leaflet', (done: MochaDone) => {
const testHandle: any = {};
const testEvent: any = { testHandle };
layer.dbclickEvent.subscribe((event: any) => {
layer.dblclickEvent.subscribe((event: any) => {
expect(event.testHandle).to.equal(testHandle);
return done();
});
layer.fire('dbclick', testEvent);
layer.fire('dblclick', testEvent);
});
});
describe('(mousedown)', () => {
Expand Down

0 comments on commit e79fb6b

Please sign in to comment.