ashatora/openlayers
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #4847 from openlayers/greenkeeper-eslint-2.1.0

Browse Source 
Update eslint to version 2.1.0 🚀
This commit is contained in:
Tim Schaub
2016-02-15 16:50:52 -07:00
parent 44c6972f31 03761642ed
commit 1902d597ef
4 changed files with 21 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files
package.json
+1 -1
View File
@@ -54,7 +54,7 @@
"clean-css": "3.4.9", "clean-css": "3.4.9",
"coveralls": "2.11.6", "coveralls": "2.11.6",
"debounce": "^1.0.0", "debounce": "^1.0.0",
"eslint": "2.0.0", "eslint": "2.1.0",
"eslint-config-openlayers": "4.0.0", "eslint-config-openlayers": "4.0.0",
"expect.js": "0.3.1", "expect.js": "0.3.1",
"gaze": "^0.5.1", "gaze": "^0.5.1",
test/spec/ol/interaction/drawinteraction.test.js
+6 -8
View File
@@ -49,14 +49,12 @@ describe('ol.interaction.Draw', function() {
// calculated in case body has top < 0 (test runner with small window) // calculated in case body has top < 0 (test runner with small window)
var position = goog.style.getClientPosition(viewport); var position = goog.style.getClientPosition(viewport);
var shiftKey = opt_shiftKey !== undefined ? opt_shiftKey : false; var shiftKey = opt_shiftKey !== undefined ? opt_shiftKey : false;
var event = new ol.MapBrowserPointerEvent(type, map, var event = new ol.pointer.PointerEvent(type, {
new ol.pointer.PointerEvent(type, clientX: position.x + x + width / 2,
{ clientY: position.y + y + height / 2,
clientX: position.x + x + width / 2, shiftKey: shiftKey
clientY: position.y + y + height / 2, });
shiftKey: shiftKey map.handleMapBrowserEvent(new ol.MapBrowserPointerEvent(type, map, event));
}));
map.handleMapBrowserEvent(event);
} }
describe('constructor', function() { describe('constructor', function() {
test/spec/ol/interaction/modifyinteraction.test.js
+8 -9
View File
@@ -66,15 +66,14 @@ describe('ol.interaction.Modify', function() {
// calculated in case body has top < 0 (test runner with small window) // calculated in case body has top < 0 (test runner with small window)
var position = goog.style.getClientPosition(viewport); var position = goog.style.getClientPosition(viewport);
var shiftKey = opt_shiftKey !== undefined ? opt_shiftKey : false; var shiftKey = opt_shiftKey !== undefined ? opt_shiftKey : false;
var event = new ol.MapBrowserPointerEvent(type, map, var pointerEvent = new ol.pointer.PointerEvent(type, {
new ol.pointer.PointerEvent(type, type: type,
{ button: button,
type: type, clientX: position.x + x + width / 2,
button: button, clientY: position.y + y + height / 2,
clientX: position.x + x + width / 2, shiftKey: shiftKey
clientY: position.y + y + height / 2, });
shiftKey: shiftKey var event = new ol.MapBrowserPointerEvent(type, map, pointerEvent);
}));
event.pointerEvent.pointerId = 1; event.pointerEvent.pointerId = 1;
map.handleMapBrowserEvent(event); map.handleMapBrowserEvent(event);
} }
test/spec/ol/interaction/selectinteraction.test.js
+6 -8
View File
@@ -80,14 +80,12 @@ describe('ol.interaction.Select', function() {
// calculated in case body has top < 0 (test runner with small window) // calculated in case body has top < 0 (test runner with small window)
var position = goog.style.getClientPosition(viewport); var position = goog.style.getClientPosition(viewport);
var shiftKey = opt_shiftKey !== undefined ? opt_shiftKey : false; var shiftKey = opt_shiftKey !== undefined ? opt_shiftKey : false;
var event = new ol.MapBrowserPointerEvent(type, map, var event = new ol.pointer.PointerEvent(type, {
new ol.pointer.PointerEvent(type, clientX: position.x + x + width / 2,
{ clientY: position.y + y + height / 2,
clientX: position.x + x + width / 2, shiftKey: shiftKey
clientY: position.y + y + height / 2, });
shiftKey: shiftKey map.handleMapBrowserEvent(new ol.MapBrowserPointerEvent(type, map, event));
}));
map.handleMapBrowserEvent(event);
} }
describe('constructor', function() { describe('constructor', function() {