Import events conditions explicitly

This commit is contained in:
Marc Jansen
2018-02-05 18:22:42 +01:00
parent 1c8e60487c
commit 6e764a20b3
16 changed files with 54 additions and 69 deletions
+2 -2
View File
@@ -4,7 +4,7 @@ import MapBrowserPointerEvent from '../../../../src/ol/MapBrowserPointerEvent.js
import View from '../../../../src/ol/View.js';
import {equals} from '../../../../src/ol/array.js';
import {listen} from '../../../../src/ol/events.js';
import _ol_events_condition_ from '../../../../src/ol/events/condition.js';
import {always} from '../../../../src/ol/events/condition.js';
import Circle from '../../../../src/ol/geom/Circle.js';
import LineString from '../../../../src/ol/geom/LineString.js';
import MultiLineString from '../../../../src/ol/geom/MultiLineString.js';
@@ -884,7 +884,7 @@ describe('ol.interaction.Draw', function() {
it('supports freehand drawing for circles', function() {
draw.freehand_ = true;
draw.freehandCondition_ = _ol_events_condition_.always;
draw.freehandCondition_ = always;
// no feture created when not moved
simulateEvent('pointermove', 10, 20);
+2 -2
View File
@@ -4,7 +4,7 @@ import Map from '../../../../src/ol/Map.js';
import MapBrowserPointerEvent from '../../../../src/ol/MapBrowserPointerEvent.js';
import View from '../../../../src/ol/View.js';
import {getListeners} from '../../../../src/ol/events.js';
import _ol_events_condition_ from '../../../../src/ol/events/condition.js';
import {doubleClick} from '../../../../src/ol/events/condition.js';
import Circle from '../../../../src/ol/geom/Circle.js';
import LineString from '../../../../src/ol/geom/LineString.js';
import Point from '../../../../src/ol/geom/Point.js';
@@ -524,7 +524,7 @@ describe('ol.interaction.Modify', function() {
beforeEach(function() {
modify = new Modify({
features: new Collection(features),
deleteCondition: _ol_events_condition_.doubleClick
deleteCondition: doubleClick
});
map.addInteraction(modify);