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

Remove goog.isNull in mapbrowserevent class

Browse Source
This commit is contained in:
Marc Jansen
2015-09-29 15:24:06 +02:00
parent 02fe825113
commit 5502083af9
1 changed files with 8 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/ol/mapbrowserevent.js
+8 -9
View File
@@ -284,8 +284,7 @@ ol.MapBrowserEventHandler.prototype.handlePointerUp_ = function(pointerEvent) {
// to 0). // to 0).
// See http://www.w3.org/TR/pointerevents/#button-states // See http://www.w3.org/TR/pointerevents/#button-states
if (!this.dragging_ && this.isMouseActionButton_(pointerEvent)) { if (!this.dragging_ && this.isMouseActionButton_(pointerEvent)) {
goog.asserts.assert(!goog.isNull(this.down_), goog.asserts.assert(this.down_, 'this.down_ must be truthy');
'this.down_ should not be null');
this.emulateClick_(this.down_); this.emulateClick_(this.down_);
} }
@@ -326,7 +325,7 @@ ol.MapBrowserEventHandler.prototype.handlePointerDown_ =
this.down_ = pointerEvent; this.down_ = pointerEvent;
if (goog.isNull(this.dragListenerKeys_)) { if (!this.dragListenerKeys_) {
/* Set up a pointer event handler on the `document`, /* Set up a pointer event handler on the `document`,
* which is required when the pointer is moved outside * which is required when the pointer is moved outside
* the viewport when dragging. * the viewport when dragging.
@@ -396,7 +395,7 @@ ol.MapBrowserEventHandler.prototype.handlePointerMove_ =
* @private * @private
*/ */
ol.MapBrowserEventHandler.prototype.relayEvent_ = function(pointerEvent) { ol.MapBrowserEventHandler.prototype.relayEvent_ = function(pointerEvent) {
var dragging = !goog.isNull(this.down_) && this.isMoving_(pointerEvent); var dragging = !!(this.down_ && this.isMoving_(pointerEvent));
this.dispatchEvent(new ol.MapBrowserPointerEvent( this.dispatchEvent(new ol.MapBrowserPointerEvent(
pointerEvent.type, this.map_, pointerEvent, dragging)); pointerEvent.type, this.map_, pointerEvent, dragging));
}; };
@@ -417,23 +416,23 @@ ol.MapBrowserEventHandler.prototype.isMoving_ = function(pointerEvent) {
* @inheritDoc * @inheritDoc
*/ */
ol.MapBrowserEventHandler.prototype.disposeInternal = function() { ol.MapBrowserEventHandler.prototype.disposeInternal = function() {
if (!goog.isNull(this.relayedListenerKey_)) { if (this.relayedListenerKey_) {
goog.events.unlistenByKey(this.relayedListenerKey_); goog.events.unlistenByKey(this.relayedListenerKey_);
this.relayedListenerKey_ = null; this.relayedListenerKey_ = null;
} }
if (!goog.isNull(this.pointerdownListenerKey_)) { if (this.pointerdownListenerKey_) {
goog.events.unlistenByKey(this.pointerdownListenerKey_); goog.events.unlistenByKey(this.pointerdownListenerKey_);
this.pointerdownListenerKey_ = null; this.pointerdownListenerKey_ = null;
} }
if (!goog.isNull(this.dragListenerKeys_)) { if (this.dragListenerKeys_) {
this.dragListenerKeys_.forEach(goog.events.unlistenByKey); this.dragListenerKeys_.forEach(goog.events.unlistenByKey);
this.dragListenerKeys_ = null; this.dragListenerKeys_ = null;
} }
if (!goog.isNull(this.documentPointerEventHandler_)) { if (this.documentPointerEventHandler_) {
goog.dispose(this.documentPointerEventHandler_); goog.dispose(this.documentPointerEventHandler_);
this.documentPointerEventHandler_ = null; this.documentPointerEventHandler_ = null;
} }
if (!goog.isNull(this.pointerEventHandler_)) { if (this.pointerEventHandler_) {
goog.dispose(this.pointerEventHandler_); goog.dispose(this.pointerEventHandler_);
this.pointerEventHandler_ = null; this.pointerEventHandler_ = null;
} }