Fix error when removing image while loading publiclab#1396

Falke-Design · Jun 22, 2024 · 03635a4 · 03635a4
1 parent bc49085
commit 03635a4
Show file tree

Hide file tree

Showing 3 changed files with 27 additions and 24 deletions.
diff --git a/dist/leaflet.distortableimage.js b/dist/leaflet.distortableimage.js
diff --git a/dist/leaflet.distortableimage.js.map b/dist/leaflet.distortableimage.js.map
diff --git a/src/DistortableImageOverlay.js b/src/DistortableImageOverlay.js
@@ -39,39 +39,42 @@ L.DistortableImageOverlay = L.ImageOverlay.extend({
     }
 
     // Have to wait for the image to load because need to access its w/h
-    L.DomEvent.on(this.getElement(), 'load', () => {
-      this.getPane().appendChild(this.getElement());
-      this._initImageDimensions();
-
-      if (this.options.rotation) {
-        const units = this.options.rotation.deg >= 0 ? 'deg' : 'rad';
-        this.setAngle(this.options.rotation[units], units);
-      } else {
-        this.rotation = {deg: 0, rad: 0};
-        this._reset();
-      }
-
-      /* Initialize default corners if not already set */
-      if (!this._corners) {
-        if (map.options.zoomAnimation && L.Browser.any3d) {
-          map.on('zoomanim', this._animateZoom, this);
-        }
-      }
-
-      if (this.editable) { this.editing.enable(); }
-      this.eP = null;
-    });
+    L.DomEvent.on(this.getElement(), 'load', this._initAfterLoading, this);
 
     this.fire('add');
   },
 
   onRemove(map) {
+    L.DomEvent.on(this.getElement(), 'load', this._initAfterLoading, this);
     if (this.editing) { this.editing.disable(); }
     this.fire('remove');
 
     L.ImageOverlay.prototype.onRemove.call(this, map);
   },
 
+  _initAfterLoading() {
+    this.getPane().appendChild(this.getElement());
+    this._initImageDimensions();
+
+    if (this.options.rotation) {
+      const units = this.options.rotation.deg >= 0 ? 'deg' : 'rad';
+      this.setAngle(this.options.rotation[units], units);
+    } else {
+      this.rotation = {deg: 0, rad: 0};
+      this._reset();
+    }
+
+    /* Initialize default corners if not already set */
+    if (!this._corners) {
+      if (map.options.zoomAnimation && L.Browser.any3d) {
+        map.on('zoomanim', this._animateZoom, this);
+      }
+    }
+
+    if (this.editable) { this.editing.enable(); }
+    this.eP = null;
+  },
+
   _initImageDimensions() {
     const map = this._map;
     const originalImageWidth = L.DomUtil.getStyle(this.getElement(), 'width');