@coolon/angular-ui-powerups 0.0.107 → 0.0.109

package/bundles/coolon-angular-ui-powerups.umd.js

@@ -4622,23 +4622,21 @@
             function (event) {
                 return new InteractionTransition(this.context, event.url);
             };
+            // @Trace()
+            // @Trace()
             /**
              * @param {?} event
              * @return {?}
              */
-            IdleDuringInteraction.prototype.onPopState = /**
+            IdleDuringInteraction.prototype.onPopState = 
+            // @Trace()
+            /**
              * @param {?} event
              * @return {?}
              */
             function (event) {
                 return new InteractionPopStateTransition(this.context, event.url);
             };
-            __decorate([
-                pectin.Trace(),
-                __metadata("design:type", Function),
-                __metadata("design:paramtypes", [router.NavigationStart]),
-                __metadata("design:returntype", NavigationState)
-            ], IdleDuringInteraction.prototype, "onPopState", null);
             return IdleDuringInteraction;
         }(NavigationState));
         NavigationState.IdleDuringInteraction = IdleDuringInteraction;
@@ -4677,18 +4675,26 @@
          * This state exists to handle all events while any kind of navigation is in progress.  That way all other states can
          * happily ignore interaction contexts.
          */
-        var InteractionTransition = /** @class */ (function (_super) {
+        var /**
+         * This state exists to handle all events while any kind of navigation is in progress.  That way all other states can
+         * happily ignore interaction contexts.
+         */
+        InteractionTransition = /** @class */ (function (_super) {
             __extends(InteractionTransition, _super);
             function InteractionTransition() {
                 var _this = _super !== null && _super.apply(this, arguments) || this;
                 _this.isPopState = false;
                 return _this;
             }
+            // @Trace()
+            // @Trace()
             /**
              * @param {?} event
              * @return {?}
              */
-            InteractionTransition.prototype.onRouterCancelled = /**
+            InteractionTransition.prototype.onRouterCancelled = 
+            // @Trace()
+            /**
              * @param {?} event
              * @return {?}
              */
@@ -4703,11 +4709,15 @@
                     return new Idle(this.context);
                 }
             };
+            // @Trace()
+            // @Trace()
             /**
              * @param {?} event
              * @return {?}
              */
-            InteractionTransition.prototype.onRouterError = /**
+            InteractionTransition.prototype.onRouterError = 
+            // @Trace()
+            /**
              * @param {?} event
              * @return {?}
              */
@@ -4715,11 +4725,15 @@
                 // navigation was aborted.
                 return new IdleDuringInteraction(this.context, this.startingUrl);
             };
+            // @Trace()
+            // @Trace()
             /**
              * @param {?} event
              * @return {?}
              */
-            InteractionTransition.prototype.onRouterEnd = /**
+            InteractionTransition.prototype.onRouterEnd = 
+            // @Trace()
+            /**
              * @param {?} event
              * @return {?}
              */
@@ -4731,24 +4745,6 @@
                     return new Idle(this.context);
                 }
             };
-            __decorate([
-                pectin.Trace(),
-                __metadata("design:type", Function),
-                __metadata("design:paramtypes", [router.NavigationCancel]),
-                __metadata("design:returntype", NavigationState)
-            ], InteractionTransition.prototype, "onRouterCancelled", null);
-            __decorate([
-                pectin.Trace(),
-                __metadata("design:type", Function),
-                __metadata("design:paramtypes", [router.NavigationError]),
-                __metadata("design:returntype", NavigationState)
-            ], InteractionTransition.prototype, "onRouterError", null);
-            __decorate([
-                pectin.Trace(),
-                __metadata("design:type", Function),
-                __metadata("design:paramtypes", [router.NavigationEnd]),
-                __metadata("design:returntype", NavigationState)
-            ], InteractionTransition.prototype, "onRouterEnd", null);
             return InteractionTransition;
         }(AbstractInteractionTransition));
         NavigationState.InteractionTransition = InteractionTransition;
@@ -4760,18 +4756,26 @@
          * This state exists to handle all events while any kind of navigation is in progress.  That way all other states can
          * happily ignore interaction contexts.
          */
-        var InteractionPopStateTransition = /** @class */ (function (_super) {
+        var /**
+         * This state exists to handle all events while any kind of navigation is in progress.  That way all other states can
+         * happily ignore interaction contexts.
+         */
+        InteractionPopStateTransition = /** @class */ (function (_super) {
             __extends(InteractionPopStateTransition, _super);
             function InteractionPopStateTransition() {
                 var _this = _super !== null && _super.apply(this, arguments) || this;
                 _this.isPopState = true;
                 return _this;
             }
+            // @Trace()
+            // @Trace()
             /**
              * @param {?} event
              * @return {?}
              */
-            InteractionPopStateTransition.prototype.onRouterCancelled = /**
+            InteractionPopStateTransition.prototype.onRouterCancelled = 
+            // @Trace()
+            /**
              * @param {?} event
              * @return {?}
              */
@@ -4786,11 +4790,15 @@
                     return new Idle(this.context);
                 }
             };
+            // @Trace()
+            // @Trace()
             /**
              * @param {?} event
              * @return {?}
              */
-            InteractionPopStateTransition.prototype.onRouterEnd = /**
+            InteractionPopStateTransition.prototype.onRouterEnd = 
+            // @Trace()
+            /**
              * @param {?} event
              * @return {?}
              */
@@ -4802,18 +4810,6 @@
                     return new Idle(this.context);
                 }
             };
-            __decorate([
-                pectin.Trace(),
-                __metadata("design:type", Function),
-                __metadata("design:paramtypes", [router.NavigationCancel]),
-                __metadata("design:returntype", NavigationState)
-            ], InteractionPopStateTransition.prototype, "onRouterCancelled", null);
-            __decorate([
-                pectin.Trace(),
-                __metadata("design:type", Function),
-                __metadata("design:paramtypes", [router.NavigationEnd]),
-                __metadata("design:returntype", NavigationState)
-            ], InteractionPopStateTransition.prototype, "onRouterEnd", null);
             return InteractionPopStateTransition;
         }(AbstractInteractionTransition));
         NavigationState.InteractionPopStateTransition = InteractionPopStateTransition;
@@ -4853,20 +4849,28 @@
             function (event) {
                 return this.ignore(event);
             };
+            // @Trace()
+            // @Trace()
             /**
              * @param {?} event
              * @return {?}
              */
-            CancelledDuringNavigationInteraction.prototype.onRouterCancelled = /**
+            CancelledDuringNavigationInteraction.prototype.onRouterCancelled = 
+            // @Trace()
+            /**
              * @param {?} event
              * @return {?}
              */
             function (event) {
                 // Depending on the state of the router and what was done we get a different
-                // sequence of events.  I.e.  If they just clicked a link we'll get a cancel
-                // with the locationChangeTriggerUrl as the final event. However the user
-                // started the initial navigation with a pop state then we'll get one of
-                // those with the locationChangeTriggerUrl but no cancel event with it.
+                // sequence of events.
+                // If the navigation change was triggered by clicking a link we'll get a cancel with the locationChangeTriggerUrl as the final event.
+                // If the navigation change was triggered with a pop state then we'll get an onPopState with the locationChangeTriggerUrl but no cancel event with it.
+                if (this.gotPopStateWithLeavingUrl && this.interactionService.isActive()) {
+                    /** @type {?} */
+                    var interactionIds = this.interactionService.activeInteractionContextIds.value;
+                    this.resetBrowserLocation(this.placeRouter.parseUrl(this.startingUrl).updateInteractionIds(interactionIds).url);
+                }
                 return this.gotPopStateWithLeavingUrl || this.locationChangeTriggerUrl === event.url ? this.createIdleState() : this.ignore(event);
             };
             /**
@@ -4950,12 +4954,6 @@
             function () {
                 return this.constructor.name + "(isIdl: " + this.idle + ", startingUrl: " + this.startingUrl + ", locationChangeTriggerUrl:" + this.locationChangeTriggerUrl + ")";
             };
-            __decorate([
-                pectin.Trace(),
-                __metadata("design:type", Function),
-                __metadata("design:paramtypes", [router.NavigationCancel]),
-                __metadata("design:returntype", NavigationState)
-            ], CancelledDuringNavigationInteraction.prototype, "onRouterCancelled", null);
             return CancelledDuringNavigationInteraction;
         }(NavigationState));
         NavigationState.CancelledDuringNavigationInteraction = CancelledDuringNavigationInteraction;
@@ -5722,12 +5720,16 @@
         function (url) {
             return this.getActiveInteractionIdsFromUrl(url).length > 0;
         };
+        // @Trace()
+        // @Trace()
         /**
          * @param {?} urlSnapshot
          * @param {?=} navigationExtras
          * @return {?}
          */
-        PlaceRouter.prototype.navigateByUrl = /**
+        PlaceRouter.prototype.navigateByUrl = 
+        // @Trace()
+        /**
          * @param {?} urlSnapshot
          * @param {?=} navigationExtras
          * @return {?}
@@ -5810,12 +5812,6 @@
             { type: exports.ɵv }
         ]; };
         /** @nocollapse */ PlaceRouter.ngInjectableDef = core.ɵɵdefineInjectable({ factory: function PlaceRouter_Factory() { return new PlaceRouter(core.ɵɵinject(router.Router), core.ɵɵinject(router.UrlSerializer), core.ɵɵinject(common.Location), core.ɵɵinject(PlaceHistory), core.ɵɵinject(exports.ɵv)); }, token: PlaceRouter, providedIn: "root" });
-        __decorate([
-            pectin.Trace(),
-            __metadata("design:type", Function),
-            __metadata("design:paramtypes", [exports.UrlSnapshot, Object]),
-            __metadata("design:returntype", Promise)
-        ], PlaceRouter.prototype, "navigateByUrl", null);
         return PlaceRouter;
     }(pectin.GarbageCollector));
     if (false) {