FIX #51: bouncing N times when exclisive=true

hosuaby · Jun 25, 2023 · 4e38ec8 · 4e38ec8
1 parent 9e1b21c
commit 4e38ec8
Show file tree

Hide file tree

Showing 6 changed files with 46 additions and 1 deletion.
diff --git a/dist/BouncingMotionCss3.js b/dist/BouncingMotionCss3.js
@@ -115,6 +115,8 @@ var BouncingMotionCss3 = /*#__PURE__*/function () {
 
     _defineProperty(this, "bouncingAnimationPlaying", false);
 
+    _defineProperty(this, "onMotionEnd", void 0);
+
     _classPrivateFieldInitSpec(this, _lastAnimationName, {
       writable: true,
       value: contractAnimationName
@@ -205,6 +207,12 @@ var BouncingMotionCss3 = /*#__PURE__*/function () {
             });
 
             this.bouncingAnimationPlaying = false;
+
+            if (this.onMotionEnd) {
+              this.onMotionEnd();
+              this.onMotionEnd = null;
+            }
+
             this.marker.fire('bounceend');
           }
         }

diff --git a/dist/MarkerPrototypeExt.js b/dist/MarkerPrototypeExt.js
@@ -49,8 +49,16 @@ var _default = {
    * @return {Marker} this marker
    */
   bounce: function bounce() {
+    var _this = this;
+
     var times = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : null;
 
+    if (times) {
+      this._bouncingMotion.onMotionEnd = function () {
+        _leaflet.Marker.prototype._orchestration.removeBouncingMarker(_this);
+      };
+    }
+
     this._bouncingMotion.bounce(times);
 
     var exclusive = this._bouncingMotion.bouncingOptions.exclusive;

diff --git a/dist/bundle.js b/dist/bundle.js
@@ -343,8 +343,16 @@
      * @return {Marker} this marker
      */
     bounce: function bounce() {
+      var _this = this;
+
       var times = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : null;
 
+      if (times) {
+        this._bouncingMotion.onMotionEnd = function () {
+          L.Marker.prototype._orchestration.removeBouncingMarker(_this);
+        };
+      }
+
       this._bouncingMotion.bounce(times);
 
       var exclusive = this._bouncingMotion.bouncingOptions.exclusive;
@@ -627,6 +635,8 @@
 
       _defineProperty(this, "bouncingAnimationPlaying", false);
 
+      _defineProperty(this, "onMotionEnd", void 0);
+
       _classPrivateFieldInitSpec(this, _lastAnimationName, {
         writable: true,
         value: contractAnimationName
@@ -717,6 +727,12 @@
               });
 
               this.bouncingAnimationPlaying = false;
+
+              if (this.onMotionEnd) {
+                this.onMotionEnd();
+                this.onMotionEnd = null;
+              }
+
               this.marker.fire('bounceend');
             }
           }

diff --git a/dist/bundle.min.js b/dist/bundle.min.js
diff --git a/src/BouncingMotionCss3.js b/src/BouncingMotionCss3.js
@@ -35,6 +35,7 @@ export default class BouncingMotionCss3 {
     iconStyles;
     shadowStyles;
     bouncingAnimationPlaying = false;
+    onMotionEnd;
     #lastAnimationName = contractAnimationName;
     #classes = ['bouncing'];
     #eventCounter;
@@ -98,6 +99,12 @@ export default class BouncingMotionCss3 {
                         }
                     });
                     this.bouncingAnimationPlaying = false;
+
+                    if (this.onMotionEnd) {
+                        this.onMotionEnd();
+                        this.onMotionEnd = null;
+                    }
+
                     this.marker.fire('bounceend');
                 }
             }

diff --git a/src/MarkerPrototypeExt.js b/src/MarkerPrototypeExt.js
@@ -40,6 +40,12 @@ export default {
      * @return {Marker} this marker
      */
     bounce: function(times = null) {
+        if (times) {
+            this._bouncingMotion.onMotionEnd = () => {
+                Marker.prototype._orchestration.removeBouncingMarker(this);
+            };
+        }
+
         this._bouncingMotion.bounce(times);
         const exclusive = this._bouncingMotion.bouncingOptions.exclusive;
         Marker.prototype._orchestration.addBouncingMarker(this, exclusive);