Merge branch 'release' of ssh://git.stwan.bits:7999/wv/opensphere

johnstacy · Sep 3, 2019 · 2442b35 · 2442b35
2 parents 3ca8912 + 309710c
commit 2442b35
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 2 deletions.
diff --git a/src/os/ogc/spatial.js b/src/os/ogc/spatial.js
@@ -22,7 +22,7 @@ os.ogc.spatial.Format = {
 /**
  * Convert an element containing a KML geometry to an ol.Feature.
  *
- * @param {Element} element The element containing a KML geometry
+ * @param {Document|Element} element The element containing a KML geometry
  * @return {ol.geom.Geometry} The geometry
  *
  * @suppress {accessControls} Because OL3 decided not to let us use their code...

diff --git a/src/os/ui/window.js b/src/os/ui/window.js
@@ -1227,6 +1227,8 @@ os.ui.WindowCtrl.prototype.onWindowResize_ = function() {
       this.element.removeClass('u-parent-resizer-xl');
     }
     this.element.addClass(addClass);
+
+    goog.dom.ViewportSizeMonitor.getInstanceForWindow().dispatchEvent(goog.events.EventType.RESIZE);
   }
 };
 

diff --git a/views/main.html b/views/main.html
@@ -1,4 +1,4 @@
-<div id="js-window__container" class="h-100 w-100 position-absolute js-main d-flex">
+<div id="js-window__container" class="h-100 w-100 position-absolute js-main d-flex overflow-hidden">
   <div class="dd-target c-main d-flex flex-column flex-fill w-100" url-drag-drop dd-element=".os-app">
     <nav-top></nav-top>
     <div id="js-main" class="d-flex flex-row flex-fill position-relative">