azure-maps-control 2.1.13 → 2.1.14

package/dist/atlas-core.js

@@ -43487,7 +43487,7 @@ EFFET JURIDIQUE. Le présent contrat décrit certains droits juridiques. Vous po
 	    return Url;
 	}());
 
-	var version = "2.1.13";
+	var version = "2.1.14";
 
 	/**
 	 * A helper class that provides methods for getting various forms of the map controls current version.
@@ -68413,6 +68413,7 @@ EFFET JURIDIQUE. Le présent contrat décrit certains droits juridiques. Vous po
 	var HijackablePromise = /** @class */ (function () {
 	    function HijackablePromise(origin) {
 	        var _this = this;
+	        this.isHijacked = function () { return _this._hijackedToResolve !== undefined || _this._hijackedToReject !== undefined; };
 	        this.isResolved = function () { return _this._hijackedToResolve !== undefined || _this._toResolve !== undefined; };
 	        this.isRejected = function () { return _this._hijackedToReject !== undefined || _this._toReject !== undefined; };
 	        this.resultIfResolved = function () { return _this._hijackedToResolve || _this._toResolve; };
@@ -68426,39 +68427,28 @@ EFFET JURIDIQUE. Le présent contrat décrit certains droits juridiques. Vous po
 	            }
 	            else {
 	                // we retain the origin, and check if stays the same as resolved
-	                // to make sure we do nothing if the promise was switched
 	                var retainedInvocator_1 = _this.origin;
 	                _this.origin.then(function (result) {
-	                    // origin was switched
-	                    if (retainedInvocator_1 !== _this.origin) {
+	                    if (_this.isHijacked()) {
 	                        return;
 	                    }
-	                    if (!_this._hijackedToResolve) {
+	                    // origin was switched during invocation, discard the result and follow the chain
+	                    if (retainedInvocator_1 !== _this.origin) {
+	                        _this._thenResolver(resolve, reject);
+	                    }
+	                    else {
 	                        _this._toResolve = result;
 	                        resolve(result);
 	                    }
 	                }).catch(function (error) {
-	                    if (!_this._hijackedToReject) {
-	                        _this._toReject = error;
-	                        reject(error);
-	                    }
-	                });
-	            }
-	        };
-	        this._catchResolver = function (reject) {
-	            if (_this._hijackedToReject) {
-	                reject(_this._hijackedToReject);
-	            }
-	            else {
-	                // we retain the origin, and check if stays the same as resolved
-	                // to make sure we do nothing if the promise was switched
-	                var retainedInvocator_2 = _this.origin;
-	                _this.origin.catch(function (error) {
-	                    // origin was switched
-	                    if (retainedInvocator_2 !== _this.origin) {
+	                    if (_this.isHijacked()) {
 	                        return;
 	                    }
-	                    if (!_this._hijackedToReject) {
+	                    // origin was switched during invocation, discard the result and follow the chain
+	                    if (retainedInvocator_1 !== _this.origin) {
+	                        _this._thenResolver(resolve, reject);
+	                    }
+	                    else {
 	                        _this._toReject = error;
 	                        reject(error);
 	                    }
@@ -68485,14 +68475,20 @@ EFFET JURIDIQUE. Le présent contrat décrit certains droits juridiques. Vous po
 	    // tslint:disable-next-line: no-reserved-keywords
 	    HijackablePromise.prototype.catch = function (onrejected) {
 	        var _this = this;
-	        return new Promise(function (_, reject) {
+	        return new Promise(function (resolve, reject) {
+	            _this._resolve = resolve;
 	            _this._reject = reject;
-	            _this._catchResolver(reject);
-	        }).then(onrejected);
+	            _this._thenResolver(resolve, reject);
+	        }).catch(onrejected);
 	    };
 	    // tslint:disable-next-line: no-reserved-keywords
 	    HijackablePromise.prototype.finally = function (onfinally) {
-	        return this.origin.finally(onfinally);
+	        var _this = this;
+	        return new Promise(function (resolve, reject) {
+	            _this._resolve = resolve;
+	            _this._reject = reject;
+	            _this._thenResolver(resolve, reject);
+	        }).finally(onfinally);
 	    };
 	    HijackablePromise.prototype.hijackAndResolve = function (value) {
 	        this._hijackedToResolve = value;
@@ -68507,16 +68503,10 @@ EFFET JURIDIQUE. Le présent contrat décrit certains droits juridiques. Vous po
 	        }
 	    };
 	    HijackablePromise.prototype.switchWith = function (promise) {
-	        // switching the origin will discard the original in-progress promise result
+	        // switching the origin will discard the original in-progress promise result, as well any resolved non-hijacked state
 	        this.origin = promise;
-	        // then has been invoked on this promise
-	        if (this._resolve && this._reject) {
-	            this._thenResolver(this._resolve, this._reject);
-	            // catch has been invoked on this promise
-	        }
-	        else if (this._reject) {
-	            this._catchResolver(this._reject);
-	        }
+	        this._toResolve = undefined;
+	        this._toReject = undefined;
 	    };
 	    return HijackablePromise;
 	}());