JavaScript classes working

[gpl/argeo-suite.git] / swt / org.argeo.app.geo.swt / src / org / argeo / app / geo / swt / openlayers / OLMap.java

diff --git a/swt/org.argeo.app.geo.swt/src/org/argeo/app/geo/swt/openlayers/OLMap.java b/swt/org.argeo.app.geo.swt/src/org/argeo/app/geo/swt/openlayers/OLMap.java
index d045afd21d9aa3e6cd91ba2a359bfde54ac285e7..0b704e6ca47373e8c04da3bf373c051b21f59352 100644 (file)
--- a/swt/org.argeo.app.geo.swt/src/org/argeo/app/geo/swt/openlayers/OLMap.java
+++ b/swt/org.argeo.app.geo.swt/src/org/argeo/app/geo/swt/openlayers/OLMap.java
@@ -19,7 +19,7 @@ public class OLMap extends Composite implements MapPart {
        // CompletableFuture<>();
        private CompletableFuture<Boolean> pageLoaded = new CompletableFuture<>();
 
-       private String mapVar = "window.argeoMap";
+       private String mapVar = "globalThis.argeoMap";
 
        public OLMap(Composite parent, int style) {
                super(parent, style);
@@ -38,7 +38,9 @@ public class OLMap extends Composite implements MapPart {
                        public void completed(ProgressEvent event) {
 
                                // create map
-                               browser.execute(mapVar + " = Object.create(window.argeo.app.geo.ArgeoMap);");
+                               browser.execute(mapVar + " = new globalThis.argeo.app.geo.ArgeoMap();");
+
+                               // browser.execute("console.log(myInstance.myField)");
                                pageLoaded.complete(true);
                        }