@coolon/angular-ui-powerups 0.0.119 → 0.0.120

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

@@ -4216,20 +4216,19 @@
                 new NavigationState.IdleDuringInteraction(this.context, this.currentRouterUrl()) :
                 new NavigationState.Idle(this.context);
         };
-        //
-        //
         /**
          * @param {?} url
+         * @param {?=} options
          * @return {?}
          */
-        NavigationState.prototype.resetBrowserLocation = 
-        //
-        /**
+        NavigationState.prototype.resetBrowserLocation = /**
          * @param {?} url
+         * @param {?=} options
          * @return {?}
          */
-        function (url) {
-            this.placeRouter.resetBrowserLocation(url);
+        function (url, options) {
+            if (options === void 0) { options = { replaceCurrent: false }; }
+            this.placeRouter.resetBrowserLocation(url, options);
         };
         /**
          * @param {?} event
@@ -4275,6 +4274,25 @@
                 return p + ": " + _this[p];
             })).join(', ');
         };
+        /**
+         * @protected
+         * @param {?} url
+         * @return {?}
+         */
+        NavigationState.prototype.replaceBuggeredUrlAfterAngularRouterCancelled = /**
+         * @protected
+         * @param {?} url
+         * @return {?}
+         */
+        function (url) {
+            // Angular calls _this.resetUrlToCurrentUrlTree() on cancelling and fucks our history.
+            // So this means that the top of the stack is the url we want to go back to, and not the one that was on
+            // it before the cancel event fired.
+            // So we need to:
+            // - replace the just inserted url with the one that used to be there.
+            // - push our actual url back onto the top of the stack.
+            this.resetBrowserLocation(url, { replaceCurrent: true });
+        };
         return NavigationState;
     }(pectin.GarbageCollector));
     if (false) {
@@ -4608,11 +4626,11 @@
              * @return {?}
              */
             function (event) {
+                this.replaceBuggeredUrlAfterAngularRouterCancelled(this.poppedHistoryUrl);
                 // 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.resetBrowserLocation(this.poppedHistoryUrl); // put the popped history item back in.
-                this.resetBrowserLocation(this.startingUrl); // and now put our own url back in.
+                this.resetBrowserLocation(this.startingUrl);
                 return new Idle(this.context);
             };
             /**
@@ -4624,15 +4642,18 @@
              * @return {?}
              */
             function (event) {
-                // navigation was aborted.
-                if (this.currentRouterUrl() !== this.startingUrl) {
-                    // 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.resetBrowserLocation(this.poppedHistoryUrl); // put the popped history item back in.
-                    this.resetBrowserLocation(this.startingUrl); // and now put our own url back in.
-                }
-                return new Idle(this.context);
+                // // navigation was aborted.
+                // if (this.currentRouterUrl() !== this.startingUrl) {
+                //   // Angular doesn't preserve the url when a guard cancels the back button.
+                //   // See https://github.com/angular/angular/issues/13586#issuecomment-432795720
+                //   Logger.get(this).info('WORK-AROUND: Updating browser location after pop state - see angular issue #13586');
+                //   this.restoreHistory([
+                //     this.poppedHistoryUrl,
+                //     this.startingUrl
+                //   ]);
+                // }
+                // return new Idle(this.context);
+                return this.illegalTransition("when do I get this???");
             };
             /**
              * @param {?} locationTriggerUrl
@@ -4781,6 +4802,7 @@
              * @return {?}
              */
             function (event) {
+                // TODO: this.replaceBuggeredUrlAfterAngularRouterCancells(...);???
                 if (this.context.interactionService.isActive()) {
                     /** @type {?} */
                     var interactionIds = this.interactionService.activeInteractionContextIds.value;
@@ -4902,6 +4924,7 @@
                     this.resetBrowserLocation(this.placeRouter.parseUrl(this.startingUrl).updateInteractionIds(interactionIds).url);
                 }
                 else {
+                    // this.replaceBuggeredUrlAfterAngularRouterCancells(this.start)
                     this.resetBrowserLocation(this.startingUrl); // and now put our own url back in.
                 }
                 return this.createIdleState();
@@ -5002,6 +5025,7 @@
              * @return {?}
              */
             function (event) {
+                // TODO: this.replaceBuggeredUrlAfterAngularRouterCancells(...);???
                 if (this.interactionService.isActive()) {
                     /** @type {?} */
                     var interactionIds = this.interactionService.activeInteractionContextIds.value;
@@ -5037,7 +5061,7 @@
              * @return {?}
              */
             function (newUrl) {
-                return this.illegalTransition("Leaving interaction after pop-state should't block so should never see a back button click");
+                return this.illegalTransition('Leaving interaction after pop-state should\'t block so should never see a back button click');
             };
             return LeavingInteractionAfterPopStateTransition;
         }(AbstractInteractionTransition));
@@ -5048,74 +5072,6 @@
             /** @type {?} */
             LeavingInteractionAfterPopStateTransition.prototype.poppedHistoryUrl;
         }
-        // See LeavingInteractionAfterPopStateTransition.createNavigationInteractionCancelledState(...) above.
-        //
-        // export class LeavingInteractionAfterPopStateCancelled extends NavigationState {
-        //
-        //   readonly isPopState = false;
-        //   firstCancelHandled = false;
-        //   popStateHandled = false;
-        //   popStateEventUrl: string;
-        //   debugPropertyKeys = ['idle', 'startingUrl', 'poppedHistoryUrl', 'locationChangeTriggerUrl', 'popStateEventUrl', 'firstCancelHandled', 'popStateHandled'];
-        //
-        //   constructor(context: Context,
-        //               readonly startingUrl: string,
-        //               readonly locationChangeTriggerUrl: string,
-        //               readonly poppedHistoryUrl: string) {
-        //     super(context);
-        //   }
-        //
-        //   get isTransitional() {
-        //     return true;
-        //   }
-        //
-        //   onRouterStarted(event: NavigationStart): NavigationState {
-        //     return this.ignore(event);
-        //   }
-        //
-        //
-        //   onRouterCancelled(event: NavigationCancel): NavigationState {
-        //
-        //     // if (this.firstCancelHandled && this.popStateHandled) {
-        //     //   // Angular doesn't preserve the url when a guard cancels the back button.
-        //     //   // See https://github.com/angular/angular/issues/13586#issuecomment-432795720
-        //     //   Logger.get(this).info('WORK-AROUND: Updating browser location after pop state - see angular issue #13586');
-        //     //   this.resetBrowserLocation(this.locationChangeTriggerUrl); // put the second back click one back in.
-        //     //   this.resetBrowserLocation(this.poppedHistoryUrl); // put the first back click one back in.
-        //     //   if (this.interactionService.isActive()) {
-        //     //     const interactionIds = this.interactionService.activeInteractionContextIds.value;
-        //     //     this.resetBrowserLocation(this.placeRouter.parseUrl(this.startingUrl).updateInteractionIds(interactionIds).url);
-        //     //   } else {
-        //     //     this.resetBrowserLocation(this.startingUrl); // and now put our own url back in.
-        //     //   }
-        //     //   return this.createIdleState();
-        //     // } else {
-        //     //   this.firstCancelHandled = true;
-        //     return this.ignore(event);
-        //     // }
-        //   }
-        //
-        //
-        //   onRouterEnd(event: NavigationEnd): NavigationState {
-        //     return this.ignore(event);
-        //   }
-        //
-        //
-        //   onRouterError(event: NavigationError): NavigationState {
-        //     return this.ignore(event);
-        //   }
-        //
-        //
-        //   onPopState(event: NavigationStart): NavigationState {
-        //     // this.popStateHandled = true;
-        //     // this.popStateEventUrl = event.url;
-        //     return this.ignore(event);
-        //   }
-        //
-        //   async canDeactivatePlace(component: PlaceComponent, currentUrl: UrlSnapshot, nextUrl: UrlSnapshot): Promise<boolean | UrlSnapshot> {
-        //     return false;
-        //   }
-        // }
         /**
          * This state handles the scenario where a link navigation triggered an interaction and the user clicked back a to cancel it.
          * The routing event sequence is different depending on the link that was clicked.
@@ -5138,76 +5094,7 @@
          * -> PopState
          * -> NavigationCancel
          */
-        var 
-        // See LeavingInteractionAfterPopStateTransition.createNavigationInteractionCancelledState(...) above.
-        //
-        // export class LeavingInteractionAfterPopStateCancelled extends NavigationState {
-        //
-        //   readonly isPopState = false;
-        //   firstCancelHandled = false;
-        //   popStateHandled = false;
-        //   popStateEventUrl: string;
-        //   debugPropertyKeys = ['idle', 'startingUrl', 'poppedHistoryUrl', 'locationChangeTriggerUrl', 'popStateEventUrl', 'firstCancelHandled', 'popStateHandled'];
-        //
-        //   constructor(context: Context,
-        //               readonly startingUrl: string,
-        //               readonly locationChangeTriggerUrl: string,
-        //               readonly poppedHistoryUrl: string) {
-        //     super(context);
-        //   }
-        //
-        //   get isTransitional() {
-        //     return true;
-        //   }
-        //
-        //   onRouterStarted(event: NavigationStart): NavigationState {
-        //     return this.ignore(event);
-        //   }
-        //
-        //
-        //   onRouterCancelled(event: NavigationCancel): NavigationState {
-        //
-        //     // if (this.firstCancelHandled && this.popStateHandled) {
-        //     //   // Angular doesn't preserve the url when a guard cancels the back button.
-        //     //   // See https://github.com/angular/angular/issues/13586#issuecomment-432795720
-        //     //   Logger.get(this).info('WORK-AROUND: Updating browser location after pop state - see angular issue #13586');
-        //     //   this.resetBrowserLocation(this.locationChangeTriggerUrl); // put the second back click one back in.
-        //     //   this.resetBrowserLocation(this.poppedHistoryUrl); // put the first back click one back in.
-        //     //   if (this.interactionService.isActive()) {
-        //     //     const interactionIds = this.interactionService.activeInteractionContextIds.value;
-        //     //     this.resetBrowserLocation(this.placeRouter.parseUrl(this.startingUrl).updateInteractionIds(interactionIds).url);
-        //     //   } else {
-        //     //     this.resetBrowserLocation(this.startingUrl); // and now put our own url back in.
-        //     //   }
-        //     //   return this.createIdleState();
-        //     // } else {
-        //     //   this.firstCancelHandled = true;
-        //     return this.ignore(event);
-        //     // }
-        //   }
-        //
-        //
-        //   onRouterEnd(event: NavigationEnd): NavigationState {
-        //     return this.ignore(event);
-        //   }
-        //
-        //
-        //   onRouterError(event: NavigationError): NavigationState {
-        //     return this.ignore(event);
-        //   }
-        //
-        //
-        //   onPopState(event: NavigationStart): NavigationState {
-        //     // this.popStateHandled = true;
-        //     // this.popStateEventUrl = event.url;
-        //     return this.ignore(event);
-        //   }
-        //
-        //   async canDeactivatePlace(component: PlaceComponent, currentUrl: UrlSnapshot, nextUrl: UrlSnapshot): Promise<boolean | UrlSnapshot> {
-        //     return false;
-        //   }
-        // }
-        /**
+        var /**
          * This state handles the scenario where a link navigation triggered an interaction and the user clicked back a to cancel it.
          * The routing event sequence is different depending on the link that was clicked.
          *
@@ -5330,7 +5217,7 @@
              */
             function () {
                 pectin.Logger.get(this).info('WORK-AROUND: Updating browser location after pop state - see angular issue #13586');
-                this.resetBrowserLocation(this.clickedLinkUrl); // put the back click one back in.
+                this.replaceBuggeredUrlAfterAngularRouterCancelled(this.clickedLinkUrl); // put the back click one back in.
                 if (this.interactionService.isActive()) {
                     /** @type {?} */
                     var interactionIds = this.interactionService.activeInteractionContextIds.value;
@@ -5450,7 +5337,13 @@
                     // 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.resetBrowserLocation(this.locationChangeTriggerUrl); // put the second back click one back in.
+                    // Angular calls _this.resetUrlToCurrentUrlTree() on cancelling and fucks our history.
+                    // So this means that the top of the stack is the url we want to go back to, and not the one that was on
+                    // it before the cancel event fired.
+                    // So we need to:
+                    // - replace the just inserted url with the one that used to be there.
+                    // - push our actual url back onto the top of the stack.
+                    this.replaceBuggeredUrlAfterAngularRouterCancelled(this.locationChangeTriggerUrl);
                     this.resetBrowserLocation(this.poppedHistoryUrl); // put the first back click one back in.
                     if (this.interactionService.isActive()) {
                         /** @type {?} */
@@ -6212,14 +6105,25 @@
         };
         /**
          * @param {?} url
+         * @param {?} options
          * @return {?}
          */
         PlaceRouter.prototype.resetBrowserLocation = /**
          * @param {?} url
+         * @param {?} options
          * @return {?}
          */
-        function (url) {
-            this.angularLocation.go(url);
+        function (url, options) {
+            options.replaceCurrent ? this.angularLocation.replaceState(url) : this.angularLocation.go(url);
+        };
+        /**
+         * @return {?}
+         */
+        PlaceRouter.prototype.forward = /**
+         * @return {?}
+         */
+        function () {
+            this.angularLocation.forward();
         };
         /**
          * @param {...?} visits