Make shouldStopEvent default to the identity func
This commit is contained in:
@@ -3,7 +3,6 @@ goog.provide('ol.DragBoxEvent');
|
|||||||
goog.provide('ol.interaction.DragBox');
|
goog.provide('ol.interaction.DragBox');
|
||||||
|
|
||||||
goog.require('goog.events.Event');
|
goog.require('goog.events.Event');
|
||||||
goog.require('goog.functions');
|
|
||||||
goog.require('ol');
|
goog.require('ol');
|
||||||
goog.require('ol.events.ConditionType');
|
goog.require('ol.events.ConditionType');
|
||||||
goog.require('ol.events.condition');
|
goog.require('ol.events.condition');
|
||||||
@@ -205,9 +204,3 @@ ol.interaction.DragBox.handleDownEvent_ = function(mapBrowserEvent) {
|
|||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
||||||
/**
|
|
||||||
* @inheritDoc
|
|
||||||
*/
|
|
||||||
ol.interaction.DragBox.prototype.shouldStopEvent = goog.functions.identity;
|
|
||||||
|
|||||||
@@ -160,3 +160,9 @@ ol.interaction.DragPan.handleDownEvent_ = function(mapBrowserEvent) {
|
|||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @inheritDoc
|
||||||
|
*/
|
||||||
|
ol.interaction.DragPan.prototype.shouldStopEvent = goog.functions.FALSE;
|
||||||
|
|||||||
@@ -1,7 +1,6 @@
|
|||||||
goog.provide('ol.interaction.DragRotateAndZoom');
|
goog.provide('ol.interaction.DragRotateAndZoom');
|
||||||
|
|
||||||
goog.require('goog.asserts');
|
goog.require('goog.asserts');
|
||||||
goog.require('goog.functions');
|
|
||||||
goog.require('goog.math.Vec2');
|
goog.require('goog.math.Vec2');
|
||||||
goog.require('ol');
|
goog.require('ol');
|
||||||
goog.require('ol.ViewHint');
|
goog.require('ol.ViewHint');
|
||||||
@@ -150,12 +149,3 @@ ol.interaction.DragRotateAndZoom.handleDownEvent_ = function(mapBrowserEvent) {
|
|||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
||||||
/**
|
|
||||||
* @inheritDoc
|
|
||||||
* Stop the event if it was handled, so that interaction `DragZoom`
|
|
||||||
* does not interfere.
|
|
||||||
*/
|
|
||||||
ol.interaction.DragRotateAndZoom.prototype.shouldStopEvent =
|
|
||||||
goog.functions.identity;
|
|
||||||
|
|||||||
@@ -120,3 +120,9 @@ ol.interaction.DragRotate.handleDownEvent_ = function(mapBrowserEvent) {
|
|||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @inheritDoc
|
||||||
|
*/
|
||||||
|
ol.interaction.DragRotate.prototype.shouldStopEvent = goog.functions.FALSE;
|
||||||
|
|||||||
@@ -554,6 +554,12 @@ ol.interaction.Draw.prototype.abortDrawing_ = function() {
|
|||||||
};
|
};
|
||||||
|
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @inheritDoc
|
||||||
|
*/
|
||||||
|
ol.interaction.Draw.prototype.shouldStopEvent = goog.functions.FALSE;
|
||||||
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Redraw the skecth features.
|
* Redraw the skecth features.
|
||||||
* @private
|
* @private
|
||||||
|
|||||||
@@ -760,12 +760,6 @@ ol.interaction.Modify.prototype.removeVertex_ = function() {
|
|||||||
};
|
};
|
||||||
|
|
||||||
|
|
||||||
/**
|
|
||||||
* @inheritDoc
|
|
||||||
*/
|
|
||||||
ol.interaction.Modify.prototype.shouldStopEvent = goog.functions.identity;
|
|
||||||
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @param {ol.geom.SimpleGeometry} geometry Geometry.
|
* @param {ol.geom.SimpleGeometry} geometry Geometry.
|
||||||
* @param {number} index Index.
|
* @param {number} index Index.
|
||||||
|
|||||||
@@ -161,3 +161,9 @@ ol.interaction.PinchRotate.handleDownEvent_ = function(mapBrowserEvent) {
|
|||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @inheritDoc
|
||||||
|
*/
|
||||||
|
ol.interaction.PinchRotate.prototype.shouldStopEvent = goog.functions.FALSE;
|
||||||
|
|||||||
@@ -150,3 +150,9 @@ ol.interaction.PinchZoom.handleDownEvent_ =
|
|||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @inheritDoc
|
||||||
|
*/
|
||||||
|
ol.interaction.PinchZoom.prototype.shouldStopEvent = goog.functions.FALSE;
|
||||||
|
|||||||
@@ -206,12 +206,16 @@ ol.interaction.Pointer.handleEvent = function(mapBrowserEvent) {
|
|||||||
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* This method allows inheriting classes to stop the event from being
|
* This method is used to determine if "down" events should be propagated to
|
||||||
* passed to further interactions. For example, this is required for
|
* other interactions or should be stopped.
|
||||||
* interaction `DragRotateAndZoom`.
|
*
|
||||||
|
* The method receives the return code of the "handleDownEvent" function.
|
||||||
|
*
|
||||||
|
* By default this function is the "identity" function. It's overidden in
|
||||||
|
* child classes.
|
||||||
*
|
*
|
||||||
* @protected
|
|
||||||
* @param {boolean} handled Was the event handled by the interaction?
|
* @param {boolean} handled Was the event handled by the interaction?
|
||||||
* @return {boolean} Should the event be stopped?
|
* @return {boolean} Should the event be stopped?
|
||||||
|
* @protected
|
||||||
*/
|
*/
|
||||||
ol.interaction.Pointer.prototype.shouldStopEvent = goog.functions.FALSE;
|
ol.interaction.Pointer.prototype.shouldStopEvent = goog.functions.identity;
|
||||||
|
|||||||
Reference in New Issue
Block a user