@coolon/angular-ui-powerups 0.0.97 → 0.0.98

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

@@ -2184,7 +2184,7 @@
          * @return {?}
          */
         function () {
-            this._initialActivityOutletContext = null;
+            this._initialActivityOutletContext.value = null;
             this.initialActivityOutletContextEvent.emit(null);
         };
         // @Trace()
@@ -2361,8 +2361,7 @@
         __extends(InplaceInteractionContextComponent, _super);
         function InplaceInteractionContextComponent() {
             var _this = _super.call(this) || this;
-            _this._active = new pectin.DelegatingValueModel().withDefault(false);
-            var _a = pectin.Dsl.disposeWith(_this), chain = _a.chain, valueOf = _a.valueOf, before = _a.before, when = _a.when, after = _a.after, observe = _a.observe, switchOn = _a.switchOn;
+            _this._active = new pectin.MutableValueModel(false);
             return _this;
         }
         /**
@@ -2373,7 +2372,6 @@
          */
         function () {
             this.setActivityList(this.interactionContext.activityList);
-            this._active.setDelegate(this.interactionContext.active);
         };
         Object.defineProperty(InplaceInteractionContextComponent.prototype, "active", {
             get: /**
@@ -2401,6 +2399,7 @@
          */
         function (activityType, data) {
             var _this = this;
+            this._active.value = true;
             /** @type {?} */
             var self = this;
             return new Promise((/**
@@ -2417,6 +2416,7 @@
                      * @return {?}
                      */
                     function (result) {
+                        self._active.value = false;
                         resolve(result);
                     },
                     onCancel: /**
@@ -2424,6 +2424,7 @@
                      * @return {?}
                      */
                     function (error) {
+                        self._active.value = false;
                         reject(error);
                     }
                 };
@@ -4014,67 +4015,33 @@
          * @return {?}
          */
         function (nextState) {
-            return __awaiter(this, void 0, void 0, function () {
-                return __generator(this, function (_a) {
-                    // Automatically cancel any active activities if the navigation session was triggered
-                    // by the back button.
-                    if (this.navigationSession.isPopState && this.component.interactionContext && this.component.interactionContext.isActive()) {
-                        // Note: any modal interactions run in a different router outlet so we should never get place deactivated while
-                        // one is active. This is because:
-                        // 1. the user can't click anything to navigate away
-                        // 2. clicking the back button will only change the outlet route and will leave the component route alone. This
-                        //    is all handled by the InteractionGuard and so the component guards will never run.
-                        // TODO: how will I handle this now??
-                        // BUT: activities could call navigate while they're still active.. but we'll barf and tell them
-                        //      to call activity.done(newVisitToNavigateTo) and let the caller do the navigate after the
-                        //      dialog has closed.
-                        // Can I capture this in placeRouter.navigate(..) ? i.e. navigationSession && navigationSession.interactionContext.isActive()
-                        // Or can I just ignore it altogether?
-                        // 1. I no longer have a singleton dialog interaction that can be returned from any component in the deactivation cycle.
-                        // 2. We only ever check the component once per nav cycle
-                        // 3. The navigation session interaction context will barf if multiple components try and use it at once.
-                        // if (this.component.interactionContext instanceof DialogInteractionContext) {
-                        //   // BUT: activities could call navigate while they're still active.. but we'll barf and tell them
-                        //   //      to call activity.done(newVisitToNavigateTo) and let the caller do the navigate after the
-                        //   //      dialog has closed.
-                        //   lang.illegalState('Navigation started from an activity in a modal dialog. Have your activity return a Visit instead and navigate after the activity has finished');
-                        // }
-                        // Now we just cancel the current activity and stay where we are
-                        this.cancelCurrentActivityOf(this.component.interactionContext);
-                        return [2 /*return*/, false];
-                    }
-                    // Ok, so now we're really leaving, so we ask the component if we should.;
-                    if (this.isNotJustAChangeInRouteId(nextState) && this.component.canDeactivate) {
-                        // No interaction in progress, so ask the component .
-                        // This may start an interaction, hence checking the interaction context before now. I.e. if the place pops up the dialog, and
-                        // the user clicks back again, we'll re-enter here and go bang when the component tries to open another dialog.
-                        return [2 /*return*/, this.component.canDeactivate(this.navigationSession.interactionContext)];
-                    }
-                    return [2 /*return*/, true];
-                });
-            });
-        };
-        /**
-         * @protected
-         * @param {?} interactionContext
-         * @return {?}
-         */
-        PlaceComponentDeactivationHandler.prototype.cancelCurrentActivityOf = /**
-         * @protected
-         * @param {?} interactionContext
-         * @return {?}
-         */
-        function (interactionContext) {
             return __awaiter(this, void 0, void 0, function () {
                 var activity;
                 return __generator(this, function (_a) {
                     switch (_a.label) {
-                        case 0: return [4 /*yield*/, interactionContext.getCurrentActivity()];
+                        case 0:
+                            if (!(this.navigationSession.isPopState && this.component.interactionContext && this.component.interactionContext.isActive())) return [3 /*break*/, 2];
+                            // Note: Modal interactions are run in a different router outlet so we never get place deactivating while
+                            // a model interaction is active. This is because:
+                            // 1. the user can't click anything to navigate away
+                            // 2. clicking the back button will only change the outlet route portion of the URL. This
+                            //    is all handled by the InteractionGuard and so the component guards will never run.
+                            //
+                            // Now we just cancel the current activity...
+                            return [4 /*yield*/, this.component.interactionContext.getCurrentActivity()];
                         case 1:
                             activity = _a.sent();
-                            console.log('cancelling', { activity: activity });
                             activity.cancel(null);
-                            return [2 /*return*/];
+                            return [2 /*return*/, false]; // ..and stay where we are.
+                        case 2:
+                            // Ok, so now we're really leaving, so we ask the component if we should.;
+                            if (this.isNotJustAChangeInRouteId(nextState) && this.component.canDeactivate) {
+                                // No interaction in progress, so ask the component .
+                                // This may start an interaction, hence checking the interaction context before now. I.e. if the place pops up the dialog, and
+                                // the user clicks back again, we'll re-enter here and go bang when the component tries to open another dialog.
+                                return [2 /*return*/, this.component.canDeactivate(this.navigationSession.interactionContext)];
+                            }
+                            return [2 /*return*/, true];
                     }
                 });
             });
@@ -4116,15 +4083,15 @@
     /**
      * @abstract
      */
-    exports.NavigationSession = /** @class */ (function (_super) {
-        __extends(NavigationSession, _super);
-        function NavigationSession(context) {
+    exports.NavigationState = /** @class */ (function (_super) {
+        __extends(NavigationState, _super);
+        function NavigationState(context) {
             var _this = _super.call(this) || this;
             _this.context = context;
             _this._visits = new Map();
             return _this;
         }
-        Object.defineProperty(NavigationSession.prototype, "interactionContext", {
+        Object.defineProperty(NavigationState.prototype, "interactionContext", {
             get: /**
              * @return {?}
              */
@@ -4138,7 +4105,7 @@
          * @param {?} visit
          * @return {?}
          */
-        NavigationSession.prototype.storeVisit = /**
+        NavigationState.prototype.storeVisit = /**
          * @param {?} visit
          * @return {?}
          */
@@ -4149,7 +4116,7 @@
          * @param {?} placeDef
          * @return {?}
          */
-        NavigationSession.prototype.getVisitFor = /**
+        NavigationState.prototype.getVisitFor = /**
          * @param {?} placeDef
          * @return {?}
          */
@@ -4160,7 +4127,7 @@
          * @param {?} newUrl
          * @return {?}
          */
-        NavigationSession.prototype.onBackClickedDuringNavigationInteraction = /**
+        NavigationState.prototype.onBackClickedDuringNavigationInteraction = /**
          * @param {?} newUrl
          * @return {?}
          */
@@ -4170,7 +4137,7 @@
         /**
          * @return {?}
          */
-        NavigationSession.prototype.getVisits = /**
+        NavigationState.prototype.getVisits = /**
          * @return {?}
          */
         function () {
@@ -4182,7 +4149,7 @@
          * @param {?} message
          * @return {?}
          */
-        NavigationSession.prototype.illegalTransition = /**
+        NavigationState.prototype.illegalTransition = /**
          * @protected
          * @template R
          * @param {?} message
@@ -4195,7 +4162,7 @@
          * @protected
          * @return {?}
          */
-        NavigationSession.prototype.currentRouterUrl = /**
+        NavigationState.prototype.currentRouterUrl = /**
          * @protected
          * @return {?}
          */
@@ -4207,21 +4174,21 @@
          * @param {?} event
          * @return {?}
          */
-        NavigationSession.prototype.createActiveSession = /**
+        NavigationState.prototype.createActiveSession = /**
          * @protected
          * @param {?} event
          * @return {?}
          */
         function (event) {
             // TODO: check if the event is purely for interaction context changes.
-            return new NavigationSession.Active(this.context, event.navigationTrigger === 'popstate', this.currentRouterUrl());
+            return new NavigationState.Active(this.context, event.navigationTrigger === 'popstate', this.currentRouterUrl());
         };
         /**
          * @protected
          * @param {?} url
          * @return {?}
          */
-        NavigationSession.prototype.updateLocation = /**
+        NavigationState.prototype.updateLocation = /**
          * @protected
          * @param {?} url
          * @return {?}
@@ -4232,7 +4199,7 @@
         /**
          * @return {?}
          */
-        NavigationSession.prototype.toString = /**
+        NavigationState.prototype.toString = /**
          * @return {?}
          */
         function () {
@@ -4243,59 +4210,59 @@
             __metadata("design:type", Function),
             __metadata("design:paramtypes", [Object]),
             __metadata("design:returntype", void 0)
-        ], NavigationSession.prototype, "updateLocation", null);
-        return NavigationSession;
+        ], NavigationState.prototype, "updateLocation", null);
+        return NavigationState;
     }(pectin.GarbageCollector));
     if (false) {
         /**
          * @type {?}
          * @private
          */
-        exports.NavigationSession.prototype._visits;
+        exports.NavigationState.prototype._visits;
         /** @type {?} */
-        exports.NavigationSession.prototype.isPopState;
+        exports.NavigationState.prototype.isPopState;
         /** @type {?} */
-        exports.NavigationSession.prototype.active;
+        exports.NavigationState.prototype.active;
         /** @type {?} */
-        exports.NavigationSession.prototype.startingUrl;
+        exports.NavigationState.prototype.startingUrl;
         /**
          * @type {?}
          * @protected
          */
-        exports.NavigationSession.prototype.context;
+        exports.NavigationState.prototype.context;
         /**
          * @abstract
          * @param {?} event
          * @return {?}
          */
-        exports.NavigationSession.prototype.onStart = function (event) { };
+        exports.NavigationState.prototype.onStart = function (event) { };
         /**
          * @abstract
          * @param {?} event
          * @return {?}
          */
-        exports.NavigationSession.prototype.onCancel = function (event) { };
+        exports.NavigationState.prototype.onCancel = function (event) { };
         /**
          * @abstract
          * @param {?} event
          * @return {?}
          */
-        exports.NavigationSession.prototype.onError = function (event) { };
+        exports.NavigationState.prototype.onError = function (event) { };
         /**
          * @abstract
          * @param {?} event
          * @return {?}
          */
-        exports.NavigationSession.prototype.onEnd = function (event) { };
+        exports.NavigationState.prototype.onEnd = function (event) { };
         /**
          * @abstract
          * @param {?} component
          * @param {?} nextState
          * @return {?}
          */
-        exports.NavigationSession.prototype.canDeactivatePlace = function (component, nextState) { };
+        exports.NavigationState.prototype.canDeactivatePlace = function (component, nextState) { };
     }
-    (function (NavigationSession) {
+    (function (NavigationState) {
         var Context = /** @class */ (function () {
             function Context(router, modalInteractionService, angularLocation, notifySuccess) {
                 this.router = router;
@@ -4305,7 +4272,7 @@
             }
             return Context;
         }());
-        NavigationSession.Context = Context;
+        NavigationState.Context = Context;
         if (false) {
             /** @type {?} */
             Context.prototype.router;
@@ -4395,8 +4362,8 @@
                 return this.illegalTransition(event);
             };
             return Idle;
-        }(NavigationSession));
-        NavigationSession.Idle = Idle;
+        }(NavigationState));
+        NavigationState.Idle = Idle;
         if (false) {
             /** @type {?} */
             Idle.prototype.isPopState;
@@ -4472,8 +4439,13 @@
              * @return {?}
              */
             function (event) {
-                // active sessions can have many cancel start cycles.
-                return this;
+                if (this.isPopState) { // back button clicked and a guard cancelled
+                    // Angular doesn't preserve the url when a guard cancels the back button.
+                    // See https://github.com/angular/angular/issues/13586#issuecomment-432795720
+                    pectin.Logger.get(this).info('WORK-AROUND: Updating browser location after pop state - see angular issue #13586');
+                    this.updateLocation(this.startingUrl);
+                }
+                return this.isPopState ? new Idle(this.context) : this;
             };
             /**
              * @param {?} event
@@ -4574,9 +4546,27 @@
             function () {
                 return this.constructor.name + "(startingUrl: " + this.startingUrl + ", isPopState:" + this.isPopState + ")";
             };
+            __decorate([
+                pectin.Trace(),
+                __metadata("design:type", Function),
+                __metadata("design:paramtypes", [router.NavigationStart]),
+                __metadata("design:returntype", NavigationState)
+            ], Active.prototype, "onStart", null);
+            __decorate([
+                pectin.Trace(),
+                __metadata("design:type", Function),
+                __metadata("design:paramtypes", [router.NavigationCancel]),
+                __metadata("design:returntype", NavigationState)
+            ], Active.prototype, "onCancel", null);
+            __decorate([
+                pectin.Trace(),
+                __metadata("design:type", Function),
+                __metadata("design:paramtypes", [router.NavigationError]),
+                __metadata("design:returntype", NavigationState)
+            ], Active.prototype, "onError", null);
             return Active;
-        }(NavigationSession));
-        NavigationSession.Active = Active;
+        }(NavigationState));
+        NavigationState.Active = Active;
         if (false) {
             /** @type {?} */
             Active.prototype.active;
@@ -4697,23 +4687,23 @@
                 pectin.Trace(),
                 __metadata("design:type", Function),
                 __metadata("design:paramtypes", [router.NavigationStart]),
-                __metadata("design:returntype", NavigationSession)
+                __metadata("design:returntype", NavigationState)
             ], ModalInteractionSession.prototype, "onStart", null);
             __decorate([
                 pectin.Trace(),
                 __metadata("design:type", Function),
                 __metadata("design:paramtypes", [router.NavigationCancel]),
-                __metadata("design:returntype", NavigationSession)
+                __metadata("design:returntype", NavigationState)
             ], ModalInteractionSession.prototype, "onCancel", null);
             __decorate([
                 pectin.Trace(),
                 __metadata("design:type", Function),
                 __metadata("design:paramtypes", [router.NavigationEnd]),
-                __metadata("design:returntype", NavigationSession)
+                __metadata("design:returntype", NavigationState)
             ], ModalInteractionSession.prototype, "onEnd", null);
             return ModalInteractionSession;
-        }(NavigationSession));
-        NavigationSession.ModalInteractionSession = ModalInteractionSession;
+        }(NavigationState));
+        NavigationState.ModalInteractionSession = ModalInteractionSession;
         if (false) {
             /** @type {?} */
             ModalInteractionSession.prototype.active;
@@ -4826,8 +4816,8 @@
                 return this.constructor.name + "(startingUrl: " + this.startingUrl + ", locationChangeTriggerUrl:" + this.locationChangeTriggerUrl + ")";
             };
             return CancelledDuringNavigationInteraction;
-        }(NavigationSession));
-        NavigationSession.CancelledDuringNavigationInteraction = CancelledDuringNavigationInteraction;
+        }(NavigationState));
+        NavigationState.CancelledDuringNavigationInteraction = CancelledDuringNavigationInteraction;
         if (false) {
             /** @type {?} */
             CancelledDuringNavigationInteraction.prototype.active;
@@ -4843,7 +4833,7 @@
             /** @type {?} */
             CancelledDuringNavigationInteraction.prototype.locationChangeTriggerUrl;
         }
-    })(exports.NavigationSession || (exports.NavigationSession = {}));
+    })(exports.NavigationState || (exports.NavigationState = {}));
 
     /**
      * @fileoverview added by tsickle
@@ -5061,14 +5051,14 @@
             var _a = pectin.Dsl.disposeWith(_this), chain = _a.chain, valueOf = _a.valueOf, before = _a.before, when = _a.when, after = _a.after, observe = _a.observe, switchOn = _a.switchOn;
             _this.activeVisitIndex = chain(_this._activeVisits).indexBy('placeDefinition');
             _this.navigationSessionActive = chain(_this.navigationSessionModel).pluck('active');
-            _this._navigationSessionContext = new exports.NavigationSession.Context(_this.router, _this.modalInteractionService, _this.angularLocation, (/**
+            _this._navigationSessionContext = new exports.NavigationState.Context(_this.router, _this.modalInteractionService, _this.angularLocation, (/**
              * @param {?} session
              * @return {?}
              */
             function (session) {
                 _this.processNavigationSuccess(session);
             }));
-            _this._navigationSessionModel.value = new exports.NavigationSession.Idle(_this._navigationSessionContext);
+            _this._navigationSessionModel.value = new exports.NavigationState.Idle(_this._navigationSessionContext);
             // TODO: make setup the callbacks in during module initiation to make this testable.
             _this.router.events.subscribe((/**
              * @param {?} event
@@ -5119,7 +5109,7 @@
              * @return {?}
              */
             function (url) {
-                console.log("#### url changed -> " + url);
+                console.log("#### url changed ->", { url: url, navIsActive: _this.navigationSessionActive.value });
                 /** @type {?} */
                 var interactionContext = _this.navigationSessionActive.value && _this.navigationSession.interactionContext;
                 if (interactionContext && interactionContext.isActive()) {
@@ -5145,6 +5135,9 @@
          */
         function (session) {
             var _this = this;
+            // We need to update the visits before the session finishes.  This allows the placeOutets to ignore visit
+            // changes that occur while routerNavigationActive is true.
+            pectin.assert.isTruthy(this.navigationSessionActive.value);
             /** @type {?} */
             var visits = session.getVisits();
             visits.forEach((/**
@@ -5152,8 +5145,6 @@
              * @return {?}
              */
             function (v) { return _this.placeHistory.add(v); }));
-            // Update visits before we end the navigation session.  This allows the placeOutets to
-            // ignore visit changes that occur while the navigation is in progress
             this._activeVisits.value = visits;
         };
         Object.defineProperty(PlaceRouter.prototype, "navigationSession", {
@@ -5296,7 +5287,7 @@
                              */
                             function (current) {
                                 /** @type {?} */
-                                var session = new exports.NavigationSession.Active(_this._navigationSessionContext, false, _this.router.routerState.snapshot.url);
+                                var session = new exports.NavigationState.Active(_this._navigationSessionContext, false, _this.router.routerState.snapshot.url);
                                 session.storeVisit(visit);
                                 return session;
                             }));
@@ -5361,144 +5352,11 @@
                 [def.getFormattedRouteId(visit), def.getFormattedRouteParameters(visit)] :
                 [def.getFormattedRouteParameters(visit)];
         };
-        // private onAngularRouterStarted(event: NavigationStart) {
-        //   if (!this.navigationSession) {
-        //     // We been activated by an external route rather than placeRouter.go(visit)
-        //     this._navigationSessionModel.value = this.createExternalNavigationSession(event);
-        //   }
-        //   this.firstRoute = false;
-        // }
-        //
-        // private createExternalNavigationSession(event: NavigationStart) {
-        //   return new NavigationSession.Active(
-        //     this.modalInteractionService,
-        //     this.angularLocation,
-        //     // event.url,
-        //     event.navigationTrigger === 'popstate'
-        //   );
-        // }
-        // private onAngularRouterFinished(cancelled: boolean) {
-        //   const session = this._navigationSessionModel.value;
-        //   if (session.backClickedDuringCanDeactivateInteraction) {
-        //     // we swallow this finished event but keep the session alive as we're going to
-        //     // get another route started event, which will trigger anohter canDeactivate dialog
-        //     // if we start a new session.
-        //     // session.resetInteractionSession()
-        //   } else {
-        //     if (!cancelled) {
-        //       const visits = session.getVisits();
-        //       visits.forEach(v => this.placeHistory.add(v));
-        //       // Update visits before we end the navigation session.  This allows the placeOutets to
-        //       // ignore visit changes that occur while the navigation is in progress
-        //       this._activeVisits.value = visits;
-        //     } else {
-        //       // TODO: move this to the navigation session
-        //       // Angular doesn't preserve the url when a guard cancels the back button.
-        //       // See https://github.com/angular/angular/issues/13586#issuecomment-432795720
-        //       // session.rememberPopStateReturnUrl(this.router.routerState.snapshot.url);
-        //       if (session.isPopState) {
-        //         console.log('cancelled during popstate');
-        //         // this.angularLocation.go(session.previousUrl);
-        //       }
-        //     }
-        //     session.dispose();
-        //     this._navigationSessionModel.value = null;
-        //   }
-        // }
-        // private onAngularRouterStarted(event: NavigationStart) {
-        //   if (!this.navigationSession) {
-        //     // We been activated by an external route rather than placeRouter.go(visit)
-        //     this._navigationSessionModel.value = this.createExternalNavigationSession(event);
-        //   }
-        //   this.firstRoute = false;
-        // }
-        //
-        // private createExternalNavigationSession(event: NavigationStart) {
-        //   return new NavigationSession.Active(
-        //     this.modalInteractionService,
-        //     this.angularLocation,
-        //     // event.url,
-        //     event.navigationTrigger === 'popstate'
-        //   );
-        // }
-        // private onAngularRouterFinished(cancelled: boolean) {
-        //   const session = this._navigationSessionModel.value;
-        //   if (session.backClickedDuringCanDeactivateInteraction) {
-        //     // we swallow this finished event but keep the session alive as we're going to
-        //     // get another route started event, which will trigger anohter canDeactivate dialog
-        //     // if we start a new session.
-        //     // session.resetInteractionSession()
-        //   } else {
-        //     if (!cancelled) {
-        //       const visits = session.getVisits();
-        //       visits.forEach(v => this.placeHistory.add(v));
-        //       // Update visits before we end the navigation session.  This allows the placeOutets to
-        //       // ignore visit changes that occur while the navigation is in progress
-        //       this._activeVisits.value = visits;
-        //     } else {
-        //       // TODO: move this to the navigation session
-        //       // Angular doesn't preserve the url when a guard cancels the back button.
-        //       // See https://github.com/angular/angular/issues/13586#issuecomment-432795720
-        //       // session.rememberPopStateReturnUrl(this.router.routerState.snapshot.url);
-        //       if (session.isPopState) {
-        //         console.log('cancelled during popstate');
-        //         // this.angularLocation.go(session.previousUrl);
-        //       }
-        //     }
-        //     session.dispose();
-        //     this._navigationSessionModel.value = null;
-        //   }
-        // }
         /**
          * @param {?} activatedRoute
          * @return {?}
          */
-        PlaceRouter.prototype.extractChildPath = 
-        // private onAngularRouterStarted(event: NavigationStart) {
-        //   if (!this.navigationSession) {
-        //     // We been activated by an external route rather than placeRouter.go(visit)
-        //     this._navigationSessionModel.value = this.createExternalNavigationSession(event);
-        //   }
-        //   this.firstRoute = false;
-        // }
-        //
-        // private createExternalNavigationSession(event: NavigationStart) {
-        //   return new NavigationSession.Active(
-        //     this.modalInteractionService,
-        //     this.angularLocation,
-        //     // event.url,
-        //     event.navigationTrigger === 'popstate'
-        //   );
-        // }
-        // private onAngularRouterFinished(cancelled: boolean) {
-        //   const session = this._navigationSessionModel.value;
-        //   if (session.backClickedDuringCanDeactivateInteraction) {
-        //     // we swallow this finished event but keep the session alive as we're going to
-        //     // get another route started event, which will trigger anohter canDeactivate dialog
-        //     // if we start a new session.
-        //     // session.resetInteractionSession()
-        //   } else {
-        //     if (!cancelled) {
-        //       const visits = session.getVisits();
-        //       visits.forEach(v => this.placeHistory.add(v));
-        //       // Update visits before we end the navigation session.  This allows the placeOutets to
-        //       // ignore visit changes that occur while the navigation is in progress
-        //       this._activeVisits.value = visits;
-        //     } else {
-        //       // TODO: move this to the navigation session
-        //       // Angular doesn't preserve the url when a guard cancels the back button.
-        //       // See https://github.com/angular/angular/issues/13586#issuecomment-432795720
-        //       // session.rememberPopStateReturnUrl(this.router.routerState.snapshot.url);
-        //       if (session.isPopState) {
-        //         console.log('cancelled during popstate');
-        //         // this.angularLocation.go(session.previousUrl);
-        //       }
-        //     }
-        //     session.dispose();
-        //     this._navigationSessionModel.value = null;
-        //   }
-        // }
-        /**
+        PlaceRouter.prototype.extractChildPath = /**
          * @param {?} activatedRoute
          * @return {?}
          */
@@ -5626,7 +5484,7 @@
                             ,
                                 _a)
                         }], {
-                        replaceUrl: false,
+                        replaceUrl: false
                     });
                 }
             };