Validate container option in map constructor (#5695)

* Validate container option * import HTMLElement
mapbox · Nov 21, 2017 · 3a0af63 · 3a0af63
1 parent fc4bf61
commit 3a0af63
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/flow-typed/window.js b/flow-typed/window.js
@@ -115,6 +115,7 @@ declare interface Window extends EventTarget, IDBEnvironment {
 
     Blob: typeof Blob;
     HTMLImageElement: typeof HTMLImageElement;
+    HTMLElement: typeof HTMLElement;
     HTMLVideoElement: typeof HTMLVideoElement;
     HTMLCanvasElement: typeof HTMLCanvasElement;
     Image: typeof Image;

diff --git a/src/ui/map.js b/src/ui/map.js
@@ -3,7 +3,7 @@
 const util = require('../util/util');
 const browser = require('../util/browser');
 const window = require('../util/window');
-const {HTMLImageElement} = require('../util/window');
+const {HTMLImageElement, HTMLElement} = require('../util/window');
 const DOM = require('../util/dom');
 const ajax = require('../util/ajax');
 
@@ -280,8 +280,10 @@ class Map extends Camera {
             } else {
                 this._container = container;
             }
-        } else {
+        } else if (options.container instanceof HTMLElement) {
             this._container = options.container;
+        } else {
+            throw new Error(`Invalid type: 'container' must be a String or HTMLElement.`);
         }
 
         if (options.maxBounds) {