From 268d6eda8ff82703ed36d83a4f87c0b43f9d7ee7 Mon Sep 17 00:00:00 2001 From: Frederic Junod Date: Tue, 23 Feb 2016 11:24:56 +0100 Subject: [PATCH] Mark overlayContainer and overlayContainerStopEvent as non-nullable And remove an unnecessary cast --- src/ol/map.js | 8 ++++---- src/ol/overlay.js | 3 +-- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/src/ol/map.js b/src/ol/map.js index e06e84a068..2bc5918ae7 100644 --- a/src/ol/map.js +++ b/src/ol/map.js @@ -272,7 +272,7 @@ ol.Map = function(options) { /** * @private - * @type {Element} + * @type {!Element} */ this.overlayContainer_ = document.createElement('DIV'); this.overlayContainer_.className = 'ol-overlaycontainer'; @@ -280,7 +280,7 @@ ol.Map = function(options) { /** * @private - * @type {Element} + * @type {!Element} */ this.overlayContainerStopEvent_ = document.createElement('DIV'); this.overlayContainerStopEvent_.className = 'ol-overlaycontainer-stopevent'; @@ -904,7 +904,7 @@ ol.Map.prototype.getViewport = function() { * this container will let mousedown and touchstart events through to the map, * so clicks and gestures on an overlay will trigger {@link ol.MapBrowserEvent} * events. - * @return {Element} The map's overlay container. + * @return {!Element} The map's overlay container. */ ol.Map.prototype.getOverlayContainer = function() { return this.overlayContainer_; @@ -916,7 +916,7 @@ ol.Map.prototype.getOverlayContainer = function() { * event propagation. Elements added to this container won't let mousedown and * touchstart events through to the map, so clicks and gestures on an overlay * don't trigger any {@link ol.MapBrowserEvent}. - * @return {Element} The map's overlay container that stops events. + * @return {!Element} The map's overlay container that stops events. */ ol.Map.prototype.getOverlayContainerStopEvent = function() { return this.overlayContainerStopEvent_; diff --git a/src/ol/overlay.js b/src/ol/overlay.js index 1fdd1aa9d1..22e6378bee 100644 --- a/src/ol/overlay.js +++ b/src/ol/overlay.js @@ -280,8 +280,7 @@ ol.Overlay.prototype.handleMapChanged = function() { var container = this.stopEvent_ ? map.getOverlayContainerStopEvent() : map.getOverlayContainer(); if (this.insertFirst_) { - goog.dom.insertChildAt(/** @type {!Element} */ ( - container), this.element_, 0); + goog.dom.insertChildAt(container, this.element_, 0); } else { container.appendChild(this.element_); }