@coolon/angular-ui-powerups 0.0.62 → 0.0.63

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

@@ -991,20 +991,6 @@
         function InteractionContext() {
             return _super.call(this) || this;
         }
-        /**
-         * Returns true if an activity is currently running.
-         */
-        /**
-         * Returns true if an activity is currently running.
-         * @return {?}
-         */
-        InteractionContext.prototype.isActive = /**
-         * Returns true if an activity is currently running.
-         * @return {?}
-         */
-        function () {
-            return this.activityList.length > 0;
-        };
         return InteractionContext;
     }(pectin.GarbageCollector));
     if (false) {
@@ -1020,6 +1006,12 @@
          * @type {?}
          */
         InteractionContext.prototype.activityList;
+        /**
+         * Returns true if an activity is currently running.
+         * @abstract
+         * @return {?}
+         */
+        InteractionContext.prototype.isActive = function () { };
         /**
          * @abstract
          * @template D, R, E
@@ -1909,29 +1901,16 @@
             var _a = pectin.Dsl.disposeWith(_this), chain = _a.chain, observe = _a.observe;
             _this.currentActivity = chain(_this.activityList).last();
             return _this;
-            // observe.valuesFrom(this.router.events)
-            //   .tap((event:RouterEvent) => {
-            //     const nav = router.getCurrentNavigation();
-            //     console.log({
-            //       previousUrl: nav.previousNavigation && nav.previousNavigation.finalUrl,
-            //       initialUrl: nav.initialUrl,
-            //       finalUrl: nav.finalUrl,
-            //     });
-            //
-            //   })
-            //   .filter(event => event instanceof NavigationStart)
-            //   .subscribe((event: NavigationStart) => {
-            //     console.log(event.navigationTrigger);
-            //     if (event.navigationTrigger === 'popstate' && this.isActive()) {
-            //       const prev = router.getCurrentNavigation().previousNavigation.finalUrl;
-            //       // this.router.navigateByUrl(prev.toString(), {
-            //       //   replaceUrl: true,
-            //       //   skipLocationChange: false
-            //       // });
-            //       // this.cancelActivity();
-            //     }
-            //   });
         }
+        /**
+         * @return {?}
+         */
+        DialogInteractionService.prototype.isActive = /**
+         * @return {?}
+         */
+        function () {
+            return this._active;
+        };
         /**
          * @return {?}
          */
@@ -4805,11 +4784,11 @@
                 // NavigationStart -> .... -> NavigationEnd === navigated (so ask next time)
                 // NavigationStart -> .... -> NavigationError === canceled (guard cancelled so ask next time)
                 if (event instanceof router.NavigationEnd) {
-                    console.log("navigation ended");
+                    console.log('navigation ended');
                     self._alreadyAccepted = [];
                 }
                 if (event instanceof router.NavigationError) {
-                    console.log("navigation errored");
+                    console.log('navigation errored');
                     self._alreadyAccepted = [];
                 }
             }));
@@ -4883,7 +4862,8 @@
                 if (!nextState.url.startsWith(placeDefinitionPath)) {
                     /** @type {?} */
                     var self_1 = this;
-                    return Promise.resolve(component.canDeactivate()).then((/**
+                    return Promise.resolve(component.canDeactivate())
+                        .then((/**
                      * @param {?} canLeave
                      * @return {?}
                      */
@@ -4892,11 +4872,26 @@
                             // Angular doesn't preserve the url when a guard cancels the back button.
                             // See https://github.com/angular/angular/issues/13586#issuecomment-432795720
                             _this.location.go(currentState.url);
+                            return false;
                         }
                         else {
+                            if (_this.interactionContext.isActive()) {
+                                _this.interactionContext.currentActivity.value.cancel(null);
+                                return false;
+                            }
+                            else {
+                                return true;
+                            }
+                        }
+                    })).then((/**
+                     * @param {?} canDeactivate
+                     * @return {?}
+                     */
+                    function (canDeactivate) {
+                        if (canDeactivate) {
                             self_1._alreadyAccepted.push(component);
                         }
-                        return canLeave;
+                        return canDeactivate;
                     }));
                 }
                 return true;