globalThis #357

SymbolixAU · May 24, 2022 · 8b0ff5c · 8b0ff5c
1 parent 878aaff
commit 8b0ff5c
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 15 deletions.
diff --git a/DESCRIPTION b/DESCRIPTION
@@ -1,7 +1,7 @@
 Package: mapdeck
 Type: Package
 Title: Interactive Maps Using 'Mapbox GL JS' and 'Deck.gl'
-Version: 0.3.40003
+Version: 0.3.40004
 Date: 2020-10-28
 Authors@R: c(
     person("David", "Cooley", ,"[email protected]", role = c("aut", "cre"))

diff --git a/R/mapdeck_dependencies.R b/R/mapdeck_dependencies.R
@@ -160,7 +160,7 @@ deckgl_min_js <- function() {
 	list(
 		createHtmlDependency(
 			name = "deckgl",
-			version = "8.7.8",
+			version = "8.7.10",
 			src = system.file("htmlwidgets/lib/", package = "mapdeck"),
 			script = c("deckgl.min.js"),
 			all_files = FALSE

diff --git a/inst/htmlwidgets/lib/deckgl.min.js b/inst/htmlwidgets/lib/deckgl.min.js
diff --git a/inst/htmlwidgets/mapdeck.js b/inst/htmlwidgets/mapdeck.js
@@ -1,23 +1,32 @@
+
+// issue 357
+if( typeof globalThis === 'undefined') {
+	var globalThis = window;
+}
+
+
 HTMLWidgets.widget({
 
   name: 'mapdeck',
   type: 'output',
 
   factory: function(el, width, height) {
 
+		var deckgl;
+
     return {
 
       renderValue: function(x) {
 
       	md_setup_window( el.id );
 
-				if( x.show_view_state ) {
-      	  md_setup_view_state( el.id );
-      	  window[el.id + 'mapViewState'] = document.createElement("div");
-      	  window[el.id + 'mapViewState'].setAttribute('id', el.id + 'mapViewState');
-      	  window[el.id + 'mapViewState'].setAttribute('class', 'mapViewState');
-      	  var mapbox_ctrl = document.getElementById( "mapViewStateContainer"+el.id);
-    			mapbox_ctrl.appendChild( window[el.id + 'mapViewState'] );
+      	if( x.show_view_state ) {
+					md_setup_view_state( el.id );
+					window[el.id + 'mapViewState'] = document.createElement("div");
+					window[el.id + 'mapViewState'].setAttribute('id', el.id + 'mapViewState');
+					window[el.id + 'mapViewState'].setAttribute('class', 'mapViewState');
+					var mapbox_ctrl = document.getElementById( "mapViewStateContainer"+el.id);
+					mapbox_ctrl.appendChild( window[el.id + 'mapViewState'] );
 				}
 
         // INITIAL VIEW
@@ -34,7 +43,7 @@ HTMLWidgets.widget({
         };
 
        if( x.access_token === null ) {
-       	 const deckgl = new deck.DeckGL({
+       	 deckgl = new deck.DeckGL({
        	 	  views: [ new deck.MapView({
        	 	  	id: el.id,
        	 	  	repeat: x.repeat_view
@@ -48,7 +57,7 @@ HTMLWidgets.widget({
 			   });
 			   window[el.id + 'map'] = deckgl;
        } else {
-        const deckgl = new deck.DeckGL({
+        deckgl = new deck.DeckGL({
         	  views: [ new deck.MapView({
         	  	id: el.id,
         	  	repeat: x.repeat_view
@@ -123,8 +132,8 @@ HTMLWidgets.widget({
 
 			  window[el.id + 'map'] = deckgl;
 
-       }
-			    md_initialise_map(el, x);
+       } // end if { access_token } else { }
+				md_initialise_map(el, x);
       },
 
       resize: function(width, height) {