@ts-core/angular 11.0.82 → 11.0.86

package/bundles/ts-core-angular.umd.js

@@ -4722,7 +4722,7 @@
                 },] }
     ];
     function languageServiceFactory(cookie, options) {
-        if (options && !options.service) {
+        if (!_.isNil(options) && _.isNil(options.service)) {
             options.service = cookie;
         }
         return new language.LanguageService(options);
@@ -7328,15 +7328,17 @@
         //	Constructor
         //
         // --------------------------------------------------------------------------
-        function ThemeAssetDirective(element, theme) {
+        function ThemeAssetDirective(element, theme, themeAsset) {
             var _this = _super.call(this) || this;
             _this.theme = theme;
+            _this.themeAsset = themeAsset;
             _this._extension = 'png';
             _this._isFile = false;
             _this._isImage = false;
             _this._isVideo = false;
             _this._isSound = false;
             _this._isBackground = false;
+            _this._isIgnoreTheme = true;
             _this.element = ViewUtil.parseElement(element.nativeElement);
             _this.theme.changed.pipe(operators.takeUntil(_this.destroyed)).subscribe(function () {
                 _this.isTriedThemeDefault = false;
@@ -7354,21 +7356,21 @@
                 return null;
             }
             if (this.isImage) {
-                return asset.Assets.getImage(id, this.extension);
+                return this.themeAsset.getImage(id, this.extension, this.isIgnoreTheme);
             }
             if (this.isBackground) {
-                return asset.Assets.getBackground(id, this.extension);
+                return this.themeAsset.getBackground(id, this.extension, this.isIgnoreTheme);
             }
             if (this.isSound) {
-                return asset.Assets.getSound(id, this.extension);
+                return this.themeAsset.getSound(id, this.extension, this.isIgnoreTheme);
             }
             if (this.isVideo) {
-                return asset.Assets.getVideo(id, this.extension);
+                return this.themeAsset.getVideo(id, this.extension, this.isIgnoreTheme);
             }
             if (this.isFile) {
-                return asset.Assets.getFile(id, this.extension);
+                return this.themeAsset.getFile(id, this.extension, this.isIgnoreTheme);
             }
-            return asset.Assets.getIcon(id, this.extension);
+            return this.themeAsset.getIcon(id, this.extension, this.isIgnoreTheme);
         };
         // --------------------------------------------------------------------------
         //
@@ -7383,7 +7385,7 @@
                 return;
             }
             this.isTriedThemeDefault = true;
-            this.source = this.getSource(this.getDefaultSourceId(this.theme.theme));
+            this.source = this.getSource(this.getDefaultSourceId());
             this.commitSourceProperties();
         };
         // --------------------------------------------------------------------------
@@ -7398,10 +7400,8 @@
         ThemeAssetDirective.prototype.getSourceId = function (theme) {
             return !_.isNil(theme) ? this.name + _.capitalize(theme.name) : null;
         };
-        ThemeAssetDirective.prototype.getDefaultSourceId = function (theme) {
-            var value = this.name;
-            value += theme.isDark ? 'Dark' : 'Light';
-            return value;
+        ThemeAssetDirective.prototype.getDefaultSourceId = function () {
+            return this.themeAsset.getName(this.name, this.isIgnoreTheme);
         };
         // --------------------------------------------------------------------------
         //
@@ -7492,6 +7492,20 @@
             enumerable: false,
             configurable: true
         });
+        Object.defineProperty(ThemeAssetDirective.prototype, "isIgnoreTheme", {
+            get: function () {
+                return this._isIgnoreTheme;
+            },
+            set: function (value) {
+                if (value === this._isIgnoreTheme) {
+                    return;
+                }
+                this._isIgnoreTheme = value;
+                this.setSourceProperties();
+            },
+            enumerable: false,
+            configurable: true
+        });
         Object.defineProperty(ThemeAssetDirective.prototype, "name", {
             get: function () {
                 return this._name;
@@ -7536,6 +7550,7 @@
         isFile: [{ type: i0.Input }],
         isImage: [{ type: i0.Input }],
         isBackground: [{ type: i0.Input }],
+        isIgnoreTheme: [{ type: i0.Input }],
         name: [{ type: i0.Input }],
         extension: [{ type: i0.Input }]
     };
@@ -7547,8 +7562,8 @@
         //	Constructor
         //
         // --------------------------------------------------------------------------
-        function ThemeAssetBackgroundDirective(element, theme) {
-            return _super.call(this, element, theme) || this;
+        function ThemeAssetBackgroundDirective(element, theme, themeAsset) {
+            return _super.call(this, element, theme, themeAsset) || this;
         }
         // --------------------------------------------------------------------------
         //
@@ -7571,7 +7586,8 @@
     ];
     ThemeAssetBackgroundDirective.ctorParameters = function () { return [
         { type: i0.ElementRef },
-        { type: theme.ThemeService }
+        { type: theme.ThemeService },
+        { type: theme.ThemeAssetService }
     ]; };
 
     var ThemeAssetImageDirective = /** @class */ (function (_super) {
@@ -7581,8 +7597,8 @@
         //	Constructor
         //
         // --------------------------------------------------------------------------
-        function ThemeAssetImageDirective(element, theme) {
-            return _super.call(this, element, theme) || this;
+        function ThemeAssetImageDirective(element, theme, themeAsset) {
+            return _super.call(this, element, theme, themeAsset) || this;
         }
         // --------------------------------------------------------------------------
         //
@@ -7604,7 +7620,8 @@
     ];
     ThemeAssetImageDirective.ctorParameters = function () { return [
         { type: i0.ElementRef },
-        { type: theme.ThemeService }
+        { type: theme.ThemeService },
+        { type: theme.ThemeAssetService }
     ]; };
 
     var ThemeToggleDirective = /** @class */ (function (_super) {
@@ -7932,6 +7949,11 @@
                         provide: theme.ThemeService,
                         deps: [CookieService, THEME_OPTIONS],
                         useFactory: themeServiceFactory
+                    },
+                    {
+                        provide: theme.ThemeAssetService,
+                        deps: [theme.ThemeService],
+                        useFactory: themeAssetServiceFactory
                     }
                 ]
             };
@@ -7946,11 +7968,14 @@
                 },] }
     ];
     function themeServiceFactory(cookie, options) {
-        if (!_.isNil(options) && !_.isNil(options.service)) {
+        if (!_.isNil(options) && _.isNil(options.service)) {
             options.service = cookie;
         }
         return new theme.ThemeService(options);
     }
+    function themeAssetServiceFactory(theme$1) {
+        return new theme.ThemeAssetService(theme$1);
+    }
     var THEME_OPTIONS = new i0.InjectionToken("THEME_OPTIONS");
 
     var WindowDragAreaDirective = /** @class */ (function (_super) {
@@ -9115,6 +9140,7 @@
             this._loginData = null;
         };
         LoginBaseService.prototype.parseLoginErrorResponse = function (error) { };
+        LoginBaseService.prototype.parseLogoutErrorResponse = function (error) { };
         LoginBaseService.prototype.parseLoginSidResponse = function (response) {
             this._loginData = response;
         };
@@ -9124,6 +9150,7 @@
             }
             this.reset();
         };
+        // public abstract registration(param: any): void;
         LoginBaseService.prototype.loginByResponse = function (param) {
             return __awaiter(this, void 0, void 0, function () {
                 return __generator(this, function (_a) {
@@ -9159,17 +9186,38 @@
             return true;
         };
         LoginBaseService.prototype.logout = function () {
-            if (!this.isLoggedIn) {
-                return;
-            }
-            this.observer.next(new observer.ObservableData(common.LoadableEvent.STARTED));
-            this.observer.next(new observer.ObservableData(exports.LoginBaseServiceEvent.LOGOUT_STARTED));
-            this.logoutRequest();
-            this.reset();
-            this._isLoggedIn = false;
-            this.status = common.LoadableStatus.NOT_LOADED;
-            this.observer.next(new observer.ObservableData(common.LoadableEvent.FINISHED));
-            this.observer.next(new observer.ObservableData(exports.LoginBaseServiceEvent.LOGOUT_FINISHED));
+            return __awaiter(this, void 0, void 0, function () {
+                var error_3;
+                return __generator(this, function (_a) {
+                    switch (_a.label) {
+                        case 0:
+                            if (!this.isLoggedIn) {
+                                return [2 /*return*/];
+                            }
+                            this.observer.next(new observer.ObservableData(common.LoadableEvent.STARTED));
+                            this.observer.next(new observer.ObservableData(exports.LoginBaseServiceEvent.LOGOUT_STARTED));
+                            _a.label = 1;
+                        case 1:
+                            _a.trys.push([1, 3, 4, 5]);
+                            return [4 /*yield*/, this.logoutRequest()];
+                        case 2:
+                            _a.sent();
+                            return [3 /*break*/, 5];
+                        case 3:
+                            error_3 = _a.sent();
+                            this.parseLogoutErrorResponse(error.ExtendedError.create(error_3));
+                            return [3 /*break*/, 5];
+                        case 4:
+                            this.reset();
+                            this._isLoggedIn = false;
+                            this.status = common.LoadableStatus.NOT_LOADED;
+                            this.observer.next(new observer.ObservableData(common.LoadableEvent.FINISHED));
+                            this.observer.next(new observer.ObservableData(exports.LoginBaseServiceEvent.LOGOUT_FINISHED));
+                            return [7 /*endfinally*/];
+                        case 5: return [2 /*return*/];
+                    }
+                });
+            });
         };
         LoginBaseService.prototype.isCanLoginWithSid = function () {
             return this.sid != null || this.getSavedSid() != null;
@@ -10424,6 +10472,7 @@
             var _this = this;
             this.router.events.pipe(operators.takeUntil(this.destroyed)).subscribe(function (event) {
                 if (event instanceof router.NavigationStart) {
+                    _this._previousUrl = _this.url;
                     _this.status = common.LoadableStatus.LOADING;
                 }
                 else if (event instanceof router.NavigationEnd || event instanceof router.NavigationCancel || event instanceof router.NavigationError) {
@@ -10468,7 +10517,7 @@
                         this.isNeedUpdateExtras = false;
                         this.applyExtras(this.extrasToApply);
                     }
-                    this.observer.next(new observer.ObservableData(common.LoadableEvent.COMPLETE, { url: this.url, lastUrl: this.lastUrl }));
+                    this.observer.next(new observer.ObservableData(common.LoadableEvent.COMPLETE, { url: this.url, previousUrl: this.previousUrl }));
                     break;
             }
             if (newStatus === common.LoadableStatus.LOADED || newStatus === common.LoadableStatus.ERROR) {
@@ -10614,16 +10663,16 @@
             enumerable: false,
             configurable: true
         });
-        Object.defineProperty(RouterBaseService.prototype, "lastUrl", {
+        Object.defineProperty(RouterBaseService.prototype, "urlTree", {
             get: function () {
-                return this._lastUrl;
+                return this.router.parseUrl(this.url);
             },
             enumerable: false,
             configurable: true
         });
-        Object.defineProperty(RouterBaseService.prototype, "urlTree", {
+        Object.defineProperty(RouterBaseService.prototype, "lastUrl", {
             get: function () {
-                return this.router.parseUrl(this.url);
+                return this._lastUrl;
             },
             enumerable: false,
             configurable: true
@@ -10635,6 +10684,20 @@
             enumerable: false,
             configurable: true
         });
+        Object.defineProperty(RouterBaseService.prototype, "previousUrl", {
+            get: function () {
+                return this._previousUrl;
+            },
+            enumerable: false,
+            configurable: true
+        });
+        Object.defineProperty(RouterBaseService.prototype, "previousUrlTree", {
+            get: function () {
+                return this.router.parseUrl(this.previousUrl);
+            },
+            enumerable: false,
+            configurable: true
+        });
         Object.defineProperty(RouterBaseService.prototype, "router", {
             get: function () {
                 return this._router;
@@ -10722,7 +10785,7 @@
             }
             return this.user.id === value;
         };
-        UserBaseService.prototype.updateUser = function (data) {
+        UserBaseService.prototype.userUpdate = function (data) {
             if (!this.hasUser) {
                 return;
             }
@@ -10918,6 +10981,7 @@
     exports.cookieServiceFactory = cookieServiceFactory;
     exports.languageServiceFactory = languageServiceFactory;
     exports.loggerServiceFactory = loggerServiceFactory;
+    exports.themeAssetServiceFactory = themeAssetServiceFactory;
     exports.themeServiceFactory = themeServiceFactory;
     exports.ɵa = AssetFilePipe;
     exports.ɵb = AssetSoundPipe;