From 6c581b8eafff42ebd4ea32f89d2a67b482090eb5 Mon Sep 17 00:00:00 2001 From: Marc Jansen Date: Wed, 23 Sep 2015 20:14:12 +0200 Subject: [PATCH] Remove goog.isDef from pointerinteraction --- src/ol/interaction/pointerinteraction.js | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/ol/interaction/pointerinteraction.js b/src/ol/interaction/pointerinteraction.js index 059d1aa4d9..18cff5509d 100644 --- a/src/ol/interaction/pointerinteraction.js +++ b/src/ol/interaction/pointerinteraction.js @@ -26,9 +26,9 @@ goog.require('ol.interaction.Interaction'); */ ol.interaction.Pointer = function(opt_options) { - var options = goog.isDef(opt_options) ? opt_options : {}; + var options = opt_options ? opt_options : {}; - var handleEvent = goog.isDef(options.handleEvent) ? + var handleEvent = options.handleEvent ? options.handleEvent : ol.interaction.Pointer.handleEvent; goog.base(this, { @@ -39,28 +39,28 @@ ol.interaction.Pointer = function(opt_options) { * @type {function(ol.MapBrowserPointerEvent):boolean} * @private */ - this.handleDownEvent_ = goog.isDef(options.handleDownEvent) ? + this.handleDownEvent_ = options.handleDownEvent ? options.handleDownEvent : ol.interaction.Pointer.handleDownEvent; /** * @type {function(ol.MapBrowserPointerEvent)} * @private */ - this.handleDragEvent_ = goog.isDef(options.handleDragEvent) ? + this.handleDragEvent_ = options.handleDragEvent ? options.handleDragEvent : ol.interaction.Pointer.handleDragEvent; /** * @type {function(ol.MapBrowserPointerEvent)} * @private */ - this.handleMoveEvent_ = goog.isDef(options.handleMoveEvent) ? + this.handleMoveEvent_ = options.handleMoveEvent ? options.handleMoveEvent : ol.interaction.Pointer.handleMoveEvent; /** * @type {function(ol.MapBrowserPointerEvent):boolean} * @private */ - this.handleUpEvent_ = goog.isDef(options.handleUpEvent) ? + this.handleUpEvent_ = options.handleUpEvent ? options.handleUpEvent : ol.interaction.Pointer.handleUpEvent; /**