From 55d56d65bcd4527209862eecfe56facf4169b4ed Mon Sep 17 00:00:00 2001 From: greenkeeperio-bot Date: Mon, 15 Feb 2016 12:00:49 -0700 Subject: [PATCH 1/2] chore(package): update eslint to version 2.1.0 http://greenkeeper.io/ --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 3856c2a657..95caf2211b 100644 --- a/package.json +++ b/package.json @@ -54,7 +54,7 @@ "clean-css": "3.4.9", "coveralls": "2.11.6", "debounce": "^1.0.0", - "eslint": "2.0.0", + "eslint": "2.1.0", "eslint-config-openlayers": "4.0.0", "expect.js": "0.3.1", "gaze": "^0.5.1", From 03761642ed24e6db8956c39001a92f71334ac251 Mon Sep 17 00:00:00 2001 From: Tim Schaub Date: Mon, 15 Feb 2016 16:03:36 -0700 Subject: [PATCH 2/2] Correct indentation --- .../spec/ol/interaction/drawinteraction.test.js | 14 ++++++-------- .../ol/interaction/modifyinteraction.test.js | 17 ++++++++--------- .../ol/interaction/selectinteraction.test.js | 14 ++++++-------- 3 files changed, 20 insertions(+), 25 deletions(-) diff --git a/test/spec/ol/interaction/drawinteraction.test.js b/test/spec/ol/interaction/drawinteraction.test.js index f08bb70617..390baf6b91 100644 --- a/test/spec/ol/interaction/drawinteraction.test.js +++ b/test/spec/ol/interaction/drawinteraction.test.js @@ -49,14 +49,12 @@ describe('ol.interaction.Draw', function() { // calculated in case body has top < 0 (test runner with small window) var position = goog.style.getClientPosition(viewport); var shiftKey = opt_shiftKey !== undefined ? opt_shiftKey : false; - var event = new ol.MapBrowserPointerEvent(type, map, - new ol.pointer.PointerEvent(type, - { - clientX: position.x + x + width / 2, - clientY: position.y + y + height / 2, - shiftKey: shiftKey - })); - map.handleMapBrowserEvent(event); + var event = new ol.pointer.PointerEvent(type, { + clientX: position.x + x + width / 2, + clientY: position.y + y + height / 2, + shiftKey: shiftKey + }); + map.handleMapBrowserEvent(new ol.MapBrowserPointerEvent(type, map, event)); } describe('constructor', function() { diff --git a/test/spec/ol/interaction/modifyinteraction.test.js b/test/spec/ol/interaction/modifyinteraction.test.js index f6f8d5b7dd..d0c0a492e5 100644 --- a/test/spec/ol/interaction/modifyinteraction.test.js +++ b/test/spec/ol/interaction/modifyinteraction.test.js @@ -66,15 +66,14 @@ describe('ol.interaction.Modify', function() { // calculated in case body has top < 0 (test runner with small window) var position = goog.style.getClientPosition(viewport); var shiftKey = opt_shiftKey !== undefined ? opt_shiftKey : false; - var event = new ol.MapBrowserPointerEvent(type, map, - new ol.pointer.PointerEvent(type, - { - type: type, - button: button, - clientX: position.x + x + width / 2, - clientY: position.y + y + height / 2, - shiftKey: shiftKey - })); + var pointerEvent = new ol.pointer.PointerEvent(type, { + type: type, + button: button, + clientX: position.x + x + width / 2, + clientY: position.y + y + height / 2, + shiftKey: shiftKey + }); + var event = new ol.MapBrowserPointerEvent(type, map, pointerEvent); event.pointerEvent.pointerId = 1; map.handleMapBrowserEvent(event); } diff --git a/test/spec/ol/interaction/selectinteraction.test.js b/test/spec/ol/interaction/selectinteraction.test.js index 7bc518130c..6667ae52a2 100644 --- a/test/spec/ol/interaction/selectinteraction.test.js +++ b/test/spec/ol/interaction/selectinteraction.test.js @@ -80,14 +80,12 @@ describe('ol.interaction.Select', function() { // calculated in case body has top < 0 (test runner with small window) var position = goog.style.getClientPosition(viewport); var shiftKey = opt_shiftKey !== undefined ? opt_shiftKey : false; - var event = new ol.MapBrowserPointerEvent(type, map, - new ol.pointer.PointerEvent(type, - { - clientX: position.x + x + width / 2, - clientY: position.y + y + height / 2, - shiftKey: shiftKey - })); - map.handleMapBrowserEvent(event); + var event = new ol.pointer.PointerEvent(type, { + clientX: position.x + x + width / 2, + clientY: position.y + y + height / 2, + shiftKey: shiftKey + }); + map.handleMapBrowserEvent(new ol.MapBrowserPointerEvent(type, map, event)); } describe('constructor', function() {