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

Replace goog.structs.Map with plain object

Browse Source
This commit is contained in:
tsauerwein
2014-03-13 15:02:33 +01:00
parent 8a26ac6e24
commit 51a557efbb
5 changed files with 39 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/ol/pointer/mousesource.js
View File

@@ -30,6 +30,7 @@
goog.provide('ol.pointer.MouseSource');
goog.require('goog.object');
goog.require('ol.pointer.EventSource');
@@ -51,7 +52,7 @@ ol.pointer.MouseSource = function(dispatcher) {
/**
* @const
* @type {goog.structs.Map}
* @type {Object.<string, goog.events.BrowserEvent|Object>}
*/
this.pointerMap = dispatcher.pointerMap;
@@ -160,14 +161,16 @@ ol.pointer.MouseSource.prepareEvent = function(inEvent, dispatcher) {
*/
ol.pointer.MouseSource.prototype.mousedown = function(inEvent) {
if (!this.isEventSimulatedFromTouch_(inEvent)) {
var p = this.pointerMap.containsKey(ol.pointer.MouseSource.POINTER_ID);
var p = goog.object.containsKey(this.pointerMap,
ol.pointer.MouseSource.POINTER_ID.toString());
// TODO(dfreedman) workaround for some elements not sending mouseup
// http://crbug/149091
if (p) {
this.cancel(inEvent);
}
var e = ol.pointer.MouseSource.prepareEvent(inEvent, this.dispatcher);
this.pointerMap.set(ol.pointer.MouseSource.POINTER_ID, inEvent);
goog.object.set(this.pointerMap,
ol.pointer.MouseSource.POINTER_ID.toString(), inEvent);
this.dispatcher.down(e, inEvent);
}
};
@@ -193,7 +196,8 @@ ol.pointer.MouseSource.prototype.mousemove = function(inEvent) {
*/
ol.pointer.MouseSource.prototype.mouseup = function(inEvent) {
if (!this.isEventSimulatedFromTouch_(inEvent)) {
var p = this.pointerMap.get(ol.pointer.MouseSource.POINTER_ID);
var p = goog.object.get(this.pointerMap,
ol.pointer.MouseSource.POINTER_ID.toString());
if (p && p.button === inEvent.button) {
var e = ol.pointer.MouseSource.prepareEvent(inEvent, this.dispatcher);
@@ -246,5 +250,6 @@ ol.pointer.MouseSource.prototype.cancel = function(inEvent) {
* Remove the mouse from the list of active pointers.
*/
ol.pointer.MouseSource.prototype.cleanupMouse = function() {
this.pointerMap.remove(ol.pointer.MouseSource.POINTER_ID);
goog.object.remove(this.pointerMap,
ol.pointer.MouseSource.POINTER_ID.toString());
};