@coolon/angular-ui-powerups 0.0.87 → 0.0.88
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/bundles/coolon-angular-ui-powerups.umd.js +34 -35
- package/bundles/coolon-angular-ui-powerups.umd.js.map +1 -1
- package/bundles/coolon-angular-ui-powerups.umd.min.js +1 -1
- package/bundles/coolon-angular-ui-powerups.umd.min.js.map +1 -1
- package/coolon-angular-ui-powerups.metadata.json +1 -1
- package/esm2015/lib/place/components/place-outlet/place-outlet.component.js +8 -8
- package/esm2015/lib/place/place-router.js +3 -13
- package/esm2015/lib/place/route/guards/leave-place.guard.js +19 -16
- package/esm5/lib/place/components/place-outlet/place-outlet.component.js +8 -8
- package/esm5/lib/place/place-router.js +11 -15
- package/esm5/lib/place/route/guards/leave-place.guard.js +18 -15
- package/fesm2015/coolon-angular-ui-powerups.js +27 -34
- package/fesm2015/coolon-angular-ui-powerups.js.map +1 -1
- package/fesm5/coolon-angular-ui-powerups.js +34 -35
- package/fesm5/coolon-angular-ui-powerups.js.map +1 -1
- package/lib/place/route/guards/leave-place.guard.d.ts +2 -2
- package/package.json +1 -1
|
@@ -4069,12 +4069,16 @@ var PlaceRouter = /** @class */ (function (_super) {
|
|
|
4069
4069
|
[def.getFormattedRouteId(visit), def.getFormattedRouteParameters(visit)] :
|
|
4070
4070
|
[def.getFormattedRouteParameters(visit)];
|
|
4071
4071
|
};
|
|
4072
|
+
// @Trace()
|
|
4073
|
+
// @Trace()
|
|
4072
4074
|
/**
|
|
4073
4075
|
* @private
|
|
4074
4076
|
* @param {?} event
|
|
4075
4077
|
* @return {?}
|
|
4076
4078
|
*/
|
|
4077
|
-
PlaceRouter.prototype.onAngularRouterStarted =
|
|
4079
|
+
PlaceRouter.prototype.onAngularRouterStarted =
|
|
4080
|
+
// @Trace()
|
|
4081
|
+
/**
|
|
4078
4082
|
* @private
|
|
4079
4083
|
* @param {?} event
|
|
4080
4084
|
* @return {?}
|
|
@@ -4091,11 +4095,15 @@ var PlaceRouter = /** @class */ (function (_super) {
|
|
|
4091
4095
|
}
|
|
4092
4096
|
this.firstRoute = false;
|
|
4093
4097
|
};
|
|
4098
|
+
// @Trace()
|
|
4099
|
+
// @Trace()
|
|
4094
4100
|
/**
|
|
4095
4101
|
* @private
|
|
4096
4102
|
* @return {?}
|
|
4097
4103
|
*/
|
|
4098
|
-
PlaceRouter.prototype.onAngularRouterFinished =
|
|
4104
|
+
PlaceRouter.prototype.onAngularRouterFinished =
|
|
4105
|
+
// @Trace()
|
|
4106
|
+
/**
|
|
4099
4107
|
* @private
|
|
4100
4108
|
* @return {?}
|
|
4101
4109
|
*/
|
|
@@ -4150,18 +4158,6 @@ var PlaceRouter = /** @class */ (function (_super) {
|
|
|
4150
4158
|
__metadata("design:paramtypes", [Visit, Object]),
|
|
4151
4159
|
__metadata("design:returntype", Promise)
|
|
4152
4160
|
], PlaceRouter.prototype, "navigate", null);
|
|
4153
|
-
__decorate([
|
|
4154
|
-
Trace(),
|
|
4155
|
-
__metadata("design:type", Function),
|
|
4156
|
-
__metadata("design:paramtypes", [NavigationStart]),
|
|
4157
|
-
__metadata("design:returntype", void 0)
|
|
4158
|
-
], PlaceRouter.prototype, "onAngularRouterStarted", null);
|
|
4159
|
-
__decorate([
|
|
4160
|
-
Trace(),
|
|
4161
|
-
__metadata("design:type", Function),
|
|
4162
|
-
__metadata("design:paramtypes", []),
|
|
4163
|
-
__metadata("design:returntype", void 0)
|
|
4164
|
-
], PlaceRouter.prototype, "onAngularRouterFinished", null);
|
|
4165
4161
|
return PlaceRouter;
|
|
4166
4162
|
}(GarbageCollector));
|
|
4167
4163
|
if (false) {
|
|
@@ -4431,12 +4427,12 @@ var PlaceOutletComponent = /** @class */ (function (_super) {
|
|
|
4431
4427
|
var _this = this;
|
|
4432
4428
|
/** @type {?} */
|
|
4433
4429
|
var visit = this.routerVisit.value;
|
|
4434
|
-
console.log({
|
|
4435
|
-
|
|
4436
|
-
|
|
4437
|
-
|
|
4438
|
-
|
|
4439
|
-
});
|
|
4430
|
+
// console.log({
|
|
4431
|
+
// visit,
|
|
4432
|
+
// place: visit ? visit.placeDefinition.component : null,
|
|
4433
|
+
// inOutletActivation: this._inOutletActivation.value,
|
|
4434
|
+
// inRoutingSession: this.placeRouter.navigationSessionActive.value
|
|
4435
|
+
// });
|
|
4440
4436
|
if (visit) { // can be null while the place and index sync up
|
|
4441
4437
|
this._inRouteVisitUpdate.whileTrue((/**
|
|
4442
4438
|
* @return {?}
|
|
@@ -4552,7 +4548,7 @@ var PlaceOutletComponent = /** @class */ (function (_super) {
|
|
|
4552
4548
|
* @return {?}
|
|
4553
4549
|
*/
|
|
4554
4550
|
function () {
|
|
4555
|
-
console.log({ activePlace: this._activePlace.value });
|
|
4551
|
+
// console.log({ activePlace: this._activePlace.value });
|
|
4556
4552
|
};
|
|
4557
4553
|
// @Trace()
|
|
4558
4554
|
// @Trace()
|
|
@@ -6144,11 +6140,11 @@ if (false) {
|
|
|
6144
6140
|
* @suppress {checkTypes,extraRequire,missingOverride,missingReturn,unusedPrivateMembers,uselessCode} checked by tsc
|
|
6145
6141
|
*/
|
|
6146
6142
|
var LeavePlaceGuard = /** @class */ (function () {
|
|
6147
|
-
function LeavePlaceGuard(router, injector, placeRouter,
|
|
6143
|
+
function LeavePlaceGuard(router, injector, placeRouter, dialogInteractionContext, angularLocation) {
|
|
6148
6144
|
this.router = router;
|
|
6149
6145
|
this.injector = injector;
|
|
6150
6146
|
this.placeRouter = placeRouter;
|
|
6151
|
-
this.
|
|
6147
|
+
this.dialogInteractionContext = dialogInteractionContext;
|
|
6152
6148
|
this.angularLocation = angularLocation;
|
|
6153
6149
|
}
|
|
6154
6150
|
// @Trace()
|
|
@@ -6260,19 +6256,22 @@ var LeavePlaceGuard = /** @class */ (function () {
|
|
|
6260
6256
|
// we check the dialog interaction first, so that components that don't need to check if they're in an
|
|
6261
6257
|
// interaction during the canDeactivate cycle.
|
|
6262
6258
|
// TODO: Add tests: show dialog -> hit back -> same route
|
|
6263
|
-
if (this.
|
|
6264
|
-
console.log('cancelling', { activity: this.
|
|
6265
|
-
this.
|
|
6259
|
+
if (this.dialogInteractionContext.isActive()) {
|
|
6260
|
+
console.log('cancelling', { activity: this.dialogInteractionContext.currentActivity });
|
|
6261
|
+
this.dialogInteractionContext.currentActivity.cancel(null);
|
|
6266
6262
|
canLeave = false;
|
|
6267
6263
|
}
|
|
6268
6264
|
else {
|
|
6269
6265
|
canLeave = true;
|
|
6270
6266
|
}
|
|
6271
|
-
|
|
6272
|
-
|
|
6273
|
-
|
|
6274
|
-
|
|
6275
|
-
|
|
6267
|
+
if (canLeave) {
|
|
6268
|
+
// now check if the component has an active interaction. This will handle
|
|
6269
|
+
// an inplace interaction contexts
|
|
6270
|
+
if (component.interactionContext && component.interactionContext.isActive()) {
|
|
6271
|
+
canLeave = false;
|
|
6272
|
+
console.log('cancelling', { activity: component.interactionContext.currentActivity });
|
|
6273
|
+
component.interactionContext.currentActivity.cancel(null);
|
|
6274
|
+
}
|
|
6276
6275
|
}
|
|
6277
6276
|
if (!canLeave) return [3 /*break*/, 3];
|
|
6278
6277
|
return [4 /*yield*/, component.canDeactivate()];
|
|
@@ -6282,9 +6281,9 @@ var LeavePlaceGuard = /** @class */ (function () {
|
|
|
6282
6281
|
_a.label = 3;
|
|
6283
6282
|
case 3: return [3 /*break*/, 5];
|
|
6284
6283
|
case 4:
|
|
6285
|
-
if (this.
|
|
6286
|
-
console.log('cancelling', { activity: this.
|
|
6287
|
-
this.
|
|
6284
|
+
if (this.dialogInteractionContext.isActive()) {
|
|
6285
|
+
console.log('cancelling', { activity: this.dialogInteractionContext.currentActivity });
|
|
6286
|
+
this.dialogInteractionContext.currentActivity.cancel(null);
|
|
6288
6287
|
canLeave = false;
|
|
6289
6288
|
}
|
|
6290
6289
|
else {
|
|
@@ -6343,7 +6342,7 @@ if (false) {
|
|
|
6343
6342
|
*/
|
|
6344
6343
|
LeavePlaceGuard.prototype.placeRouter;
|
|
6345
6344
|
/** @type {?} */
|
|
6346
|
-
LeavePlaceGuard.prototype.
|
|
6345
|
+
LeavePlaceGuard.prototype.dialogInteractionContext;
|
|
6347
6346
|
/** @type {?} */
|
|
6348
6347
|
LeavePlaceGuard.prototype.angularLocation;
|
|
6349
6348
|
}
|