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

Merge pull request #1141 from elemoine/relay

Browse Source 
Do not relay contextmenu and mousemove events
This commit is contained in:
Éric Lemoine
2013-10-18 02:58:17 -07:00
parent 7e737f8b71 1c890d837e
commit c8f02fcd6e
10 changed files with 94 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
examples/gpx.html
View File

@@ -47,6 +47,7 @@
</div>
<script src="jquery.min.js" type="text/javascript"></script>
<script src="loader.js?id=gpx" type="text/javascript"></script>
<script src="../resources/example-behaviour.js" type="text/javascript"></script>

14
examples/gpx.js
View File

@@ -28,9 +28,9 @@ var map = new ol.Map({
})
});
map.on(['click', 'mousemove'], function(evt) {
var displayFeatureInfo = function(pixel) {
map.getFeatures({
pixel: evt.getPixel(),
pixel: pixel,
layers: [vector],
success: function(featuresByLayer) {
var features = featuresByLayer[0];
@@ -41,4 +41,14 @@ map.on(['click', 'mousemove'], function(evt) {
document.getElementById('info').innerHTML = info.join(', ') || '&nbsp;';
}
});
};
$(map.getViewport()).on('mousemove', function(evt) {
var pixel = map.getEventPixel(evt.originalEvent);
displayFeatureInfo(pixel);
});
map.on('click', function(evt) {
var pixel = evt.getPixel();
displayFeatureInfo(pixel);
});

14
examples/kml-earthquakes.js
View File

@@ -59,8 +59,8 @@ info.tooltip({
animation: false,
trigger: 'manual'
});
map.on(['click', 'mousemove'], function(evt) {
var pixel = evt.getPixel();
var displayFeatureInfo = function(pixel) {
info.css({
left: pixel[0] + 'px',
top: (pixel[1] - 15) + 'px'
@@ -80,4 +80,14 @@ map.on(['click', 'mousemove'], function(evt) {
}
}
});
};
$(map.getViewport()).on('mousemove', function(evt) {
var pixel = map.getEventPixel(evt.originalEvent);
displayFeatureInfo(pixel);
});
map.on('click', function(evt) {
var pixel = evt.getPixel();
displayFeatureInfo(pixel);
});

14
examples/kml-timezones.js
View File

@@ -81,8 +81,8 @@ info.tooltip({
animation: false,
trigger: 'manual'
});
map.on(['click', 'mousemove'], function(evt) {
var pixel = evt.getPixel();
var displayFeatureInfo = function(pixel) {
info.css({
left: pixel[0] + 'px',
top: (pixel[1] - 15) + 'px'
@@ -102,4 +102,14 @@ map.on(['click', 'mousemove'], function(evt) {
}
}
});
};
$(map.getViewport()).on('mousemove', function(evt) {
var pixel = map.getEventPixel(evt.originalEvent);
displayFeatureInfo(pixel);
});
map.on('click', function(evt) {
var pixel = evt.getPixel();
displayFeatureInfo(pixel);
});

1
examples/kml.html
View File

@@ -48,6 +48,7 @@
</div>
<script src="jquery.min.js" type="text/javascript"></script>
<script src="loader.js?id=kml" type="text/javascript"></script>
<script src="../resources/example-behaviour.js" type="text/javascript"></script>

14
examples/kml.js
View File

@@ -39,9 +39,9 @@ var map = new ol.Map({
})
});
map.on(['click', 'mousemove'], function(evt) {
var displayFeatureInfo = function(pixel) {
map.getFeatures({
pixel: evt.getPixel(),
pixel: pixel,
layers: [vector],
success: function(featuresByLayer) {
var features = featuresByLayer[0];
@@ -52,4 +52,14 @@ map.on(['click', 'mousemove'], function(evt) {
document.getElementById('info').innerHTML = info.join(', ') || '&nbsp';
}
});
};
$(map.getViewport()).on('mousemove', function(evt) {
var pixel = map.getEventPixel(evt.originalEvent);
displayFeatureInfo(pixel);
});
map.on('click', function(evt) {
var pixel = evt.getPixel();
displayFeatureInfo(pixel);
});

1
examples/vector-layer.html
View File

@@ -48,6 +48,7 @@
</div>
<script src="jquery.min.js" type="text/javascript"></script>
<script src="loader.js?id=vector-layer" type="text/javascript"></script>
<script src="../resources/example-behaviour.js" type="text/javascript"></script>

14
examples/vector-layer.js
View File

@@ -64,9 +64,9 @@ var map = new ol.Map({
})
});
map.on(['click', 'mousemove'], function(evt) {
var displayFeatureInfo = function(pixel) {
map.getFeatures({
pixel: evt.getPixel(),
pixel: pixel,
layers: [vector],
success: function(featuresByLayer) {
var features = featuresByLayer[0];
@@ -75,4 +75,14 @@ map.on(['click', 'mousemove'], function(evt) {
'&nbsp;';
}
});
};
$(map.getViewport()).on('mousemove', function(evt) {
var pixel = map.getEventPixel(evt.originalEvent);
displayFeatureInfo(pixel);
});
map.on('click', function(evt) {
var pixel = evt.getPixel();
displayFeatureInfo(pixel);
});

11
src/ol/map.js
View File

@@ -237,7 +237,9 @@ ol.Map = function(options) {
goog.events.EventType.CLICK,
goog.events.EventType.DBLCLICK,
ol.BrowserFeature.HAS_TOUCH ?
goog.events.EventType.TOUCHSTART : goog.events.EventType.MOUSEDOWN
goog.events.EventType.TOUCHSTART : goog.events.EventType.MOUSEDOWN,
ol.BrowserFeature.HAS_TOUCH ?
goog.events.EventType.TOUCHEND : goog.events.EventType.MOUSEUP
], goog.events.Event.stopPropagation);
goog.dom.appendChild(this.viewport_, this.overlayContainerStopEvent_);
@@ -704,12 +706,7 @@ ol.Map.prototype.handleMapBrowserEvent = function(mapBrowserEvent) {
// coordinates so interactions cannot be used.
return;
}
if (mapBrowserEvent.type == goog.events.EventType.MOUSEOUT ||
mapBrowserEvent.type == goog.events.EventType.TOUCHEND) {
this.focus_ = null;
} else {
this.focus_ = mapBrowserEvent.getCoordinate();
}
this.focus_ = mapBrowserEvent.getCoordinate();
mapBrowserEvent.frameState = this.frameState_;
var interactions = this.getInteractions();
var interactionsArray = /** @type {Array.<ol.interaction.Interaction>} */

58
src/ol/mapbrowserevent.js
View File

@@ -3,6 +3,7 @@ goog.provide('ol.MapBrowserEvent.EventType');
goog.provide('ol.MapBrowserEventHandler');
goog.require('goog.array');
goog.require('goog.asserts');
goog.require('goog.events');
goog.require('goog.events.BrowserEvent');
goog.require('goog.events.EventTarget');
@@ -121,20 +122,18 @@ ol.MapBrowserEventHandler = function(map) {
*/
this.map_ = map;
/**
* @type {number}
* @private
*/
this.clickTimeoutId_ = 0;
/**
* @type {boolean}
* @private
*/
this.dragged_ = false;
/**
* Timestamp for the first click of a double click. Will be set back to 0
* as soon as a double click is detected.
* @type {?number}
* @private
*/
this.timestamp_ = null;
/**
* @type {Array.<number>}
* @private
@@ -166,16 +165,7 @@ ol.MapBrowserEventHandler = function(map) {
this.click_, false, this),
goog.events.listen(element,
goog.events.EventType.MOUSEDOWN,
this.handleMouseDown_, false, this),
goog.events.listen(element,
goog.events.EventType.MOUSEMOVE,
this.relayEvent_, false, this),
goog.events.listen(element,
goog.events.EventType.MOUSEOUT,
this.relayEvent_, false, this),
goog.events.listen(element,
goog.events.EventType.CONTEXTMENU,
this.relayEvent_, false, this)
this.handleMouseDown_, false, this)
];
// touch events
this.touchListenerKeys_ = [
@@ -205,7 +195,7 @@ ol.MapBrowserEventHandler.prototype.click_ = function(browserEvent) {
if (!this.dragged_) {
var newEvent;
var type = browserEvent.type;
if (this.timestamp_ === 0 || type == goog.events.EventType.DBLCLICK) {
if (type == goog.events.EventType.DBLCLICK) {
newEvent = new ol.MapBrowserEvent(
ol.MapBrowserEvent.EventType.DBLCLICK, this.map_, browserEvent);
this.dispatchEvent(newEvent);
@@ -332,17 +322,26 @@ ol.MapBrowserEventHandler.prototype.handleTouchEnd_ = function(browserEvent) {
ol.MapBrowserEvent.EventType.TOUCHEND, this.map_, browserEvent);
this.dispatchEvent(newEvent);
if (!this.dragged_) {
var now = goog.now();
if (!this.timestamp_ || now - this.timestamp_ > 250) {
this.timestamp_ = now;
goog.asserts.assert(!goog.isNull(this.down_));
if (this.clickTimeoutId_ !== 0) {
// double-click
goog.global.clearTimeout(this.clickTimeoutId_);
this.clickTimeoutId_ = 0;
newEvent = new ol.MapBrowserEvent(
ol.MapBrowserEvent.EventType.DBLCLICK, this.map_, this.down_);
this.dispatchEvent(newEvent);
this.down_ = null;
} else {
this.timestamp_ = 0;
}
if (!goog.isNull(this.down_)) {
this.click_(this.down_);
// click
this.clickTimeoutId_ = goog.global.setTimeout(goog.bind(function() {
this.clickTimeoutId_ = 0;
newEvent = new ol.MapBrowserEvent(
ol.MapBrowserEvent.EventType.CLICK, this.map_, this.down_);
this.dispatchEvent(newEvent);
this.down_ = null;
}, this), 250);
}
}
this.down_ = null;
};
@@ -379,8 +378,5 @@ ol.MapBrowserEvent.EventType = {
DRAGEND: 'dragend',
TOUCHSTART: goog.events.EventType.TOUCHSTART,
TOUCHMOVE: goog.events.EventType.TOUCHMOVE,
TOUCHEND: goog.events.EventType.TOUCHEND,
MOUSEMOVE: goog.events.EventType.MOUSEMOVE,
MOUSEOUT: goog.events.EventType.MOUSEOUT,
CONTEXTMENU: goog.events.EventType.CONTEXTMENU
TOUCHEND: goog.events.EventType.TOUCHEND
};