@osovitny/anatoly 2.14.39 → 2.14.40

package/fesm2015/osovitny-anatoly.mjs

@@ -683,11 +683,15 @@ function localizationInitializerFactory(translate, localizationService, injector
         let locationInitialized = injector.get(LOCATION_INITIALIZED, Promise.resolve(null));
         locationInitialized.then(() => {
             let languageToSet = localizationService.configureTranslationSettings(translate);
-            translate.use(languageToSet).subscribe(() => {
-            }, () => {
-                resolve(null);
-            }, () => {
-                resolve(null);
+            translate.use(languageToSet).subscribe({
+                next: (data) => {
+                },
+                error: (e) => {
+                    resolve(null);
+                },
+                complete: () => {
+                    resolve(null);
+                }
             });
         });
     });
@@ -1421,9 +1425,10 @@ class AppContextService extends BaseApiService {
         }
         let now = new Date();
         console.log('Requesting a new AppContext at ' + now);
-        this.subscription = this.get('getCurrentContext', null).subscribe((data) => {
-            this.dataReceived(data);
-        }, (e) => {
+        this.subscription = this.get('getCurrentContext', null).subscribe({
+            next: (data) => {
+                this.dataReceived(data);
+            }
         });
     }
     updateCurrent(success = null) {
@@ -1483,13 +1488,15 @@ class IdleService {
         this.startDate = new Date();
     }
     startTimer() {
-        this.timer$ = timer(this.timeOutMilliSeconds, 1 * 1000).subscribe((res) => {
-            let nowDate = new Date();
-            let exiredDate = new Date(this.startDate.getTime() + this.timeOutMilliSeconds);
-            if (nowDate.getTime() >= exiredDate.getTime()) {
-                //console.log("nowDate: " + nowDate);
-                //console.log("exiredDate: " + exiredDate);
-                this.expired$.next(true);
+        this.timer$ = timer(this.timeOutMilliSeconds, 1 * 1000).subscribe({
+            next: (data) => {
+                let nowDate = new Date();
+                let exiredDate = new Date(this.startDate.getTime() + this.timeOutMilliSeconds);
+                if (nowDate.getTime() >= exiredDate.getTime()) {
+                    //console.log("nowDate: " + nowDate);
+                    //console.log("exiredDate: " + exiredDate);
+                    this.expired$.next(true);
+                }
             }
         });
     }
@@ -1500,8 +1507,10 @@ class IdleService {
     startWatching(timeOutSeconds) {
         this.idle$ = merge(fromEvent(document, 'mousemove'), fromEvent(document, 'click'), fromEvent(document, 'mousedown'), fromEvent(document, 'keypress'), fromEvent(document, 'DOMMouseScroll'), fromEvent(document, 'mousewheel'), fromEvent(document, 'touchmove'), fromEvent(document, 'MSPointerMove'), fromEvent(window, 'mousemove'), fromEvent(window, 'resize'));
         this.resetTimeCounters(timeOutSeconds);
-        this.idleSubscription = this.idle$.subscribe((res) => {
-            this.resetTimer();
+        this.idleSubscription = this.idle$.subscribe({
+            next: (data) => {
+                this.resetTimer();
+            }
         });
         this.startTimer();
         return this.expired$;
@@ -1616,11 +1625,13 @@ class GoogleAnalyticsService {
         */
     }
     subscribe() {
-        this.subscription = this.router.events.subscribe(event => {
-            if (event instanceof NavigationEnd) {
-                if (window.ga) {
-                    window.ga('set', 'page', event.urlAfterRedirects);
-                    window.ga('send', 'pageview');
+        this.subscription = this.router.events.subscribe({
+            next: (event) => {
+                if (event instanceof NavigationEnd) {
+                    if (window.ga) {
+                        window.ga('set', 'page', event.urlAfterRedirects);
+                        window.ga('send', 'pageview');
+                    }
                 }
             }
         });
@@ -1955,13 +1966,16 @@ class BaseGridReadService extends BehaviorSubject {
             url = this.baseReadUrl + `${this.serializeParams(params)}`;
             this.savedReadParams = params;
         }
-        this.http.get(url).pipe(map(res => res)).subscribe(data => {
-            super.next(data);
-            if (success)
-                success();
-        }, e => {
-            if (error)
-                error(e);
+        this.http.get(url).pipe(map(res => res)).subscribe({
+            next: (data) => {
+                super.next(data);
+                if (success)
+                    success();
+            },
+            error: (e) => {
+                if (error)
+                    error(e);
+            }
         });
     }
 }
@@ -2007,24 +2021,31 @@ class BaseGridEditService extends BaseGridReadService {
     save(data, isNew, sucess) {
         const action = isNew ? 'add' : 'update';
         this.reset();
-        this.post(action, data).subscribe(() => {
-        }, () => {
-            this.read();
-        }, () => {
-            this.read();
-            if (sucess)
-                sucess();
+        this.post(action, data).subscribe({
+            next: (data) => {
+            },
+            error: (e) => {
+                this.read();
+            },
+            complete: () => {
+                this.read();
+                if (sucess)
+                    sucess();
+            }
         });
     }
     delete(data, sucess) {
         this.reset();
         const url = `${this.baseUrl}/delete${this.serializeParams(data)}`;
-        return this.http.delete(url).subscribe(() => {
-            this.read();
-            if (sucess)
-                sucess();
-        }, () => {
-            this.read();
+        return this.http.delete(url).subscribe({
+            next: (data) => {
+                this.read();
+                if (sucess)
+                    sucess();
+            },
+            error: (e) => {
+                this.read();
+            }
         });
     }
     post(action, data) {
@@ -2118,12 +2139,17 @@ class EmailsApiService extends BaseApiService {
         this.baseUrl = Consts.emailsApiPath;
     }
     sendContactUs(captcha, name, email, topic, subject, message, success, error) {
-        return this.post('sendContactUs', { captcha, name, email, topic, subject, message }).subscribe(data => {
-            if (success)
-                success(data);
-        }, e => {
-            if (error)
-                error(e);
+        return this.post('sendContactUs', { captcha, name, email, topic, subject, message }).subscribe({
+            next: (data) => {
+                if (success) {
+                    success(data);
+                }
+            },
+            error: (e) => {
+                if (error) {
+                    error(e);
+                }
+            }
         });
     }
 }
@@ -2155,13 +2181,31 @@ class CoreApiService extends BaseApiService {
         this.baseUrl = Consts.coreApiPath;
     }
     getTimezonesJsonFile(done) {
-        this.getExternalJsonFile('anatoly', 'timezones.json').subscribe(data => done(data));
+        this.getExternalJsonFile('anatoly', 'timezones.json').subscribe({
+            next: (data) => {
+                if (done) {
+                    done(data);
+                }
+            }
+        });
     }
     getUSStatesJsonFile(done) {
-        this.getExternalJsonFile('anatoly', 'usStates.json').subscribe(data => done(data));
+        this.getExternalJsonFile('anatoly', 'usStates.json').subscribe({
+            next: (data) => {
+                if (done) {
+                    done(data);
+                }
+            }
+        });
     }
     getCountriesJsonFile(done) {
-        this.getExternalJsonFile('anatoly', 'countries.json').subscribe(data => done(data));
+        this.getExternalJsonFile('anatoly', 'countries.json').subscribe({
+            next: (data) => {
+                if (done) {
+                    done(data);
+                }
+            }
+        });
     }
 }
 CoreApiService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "14.0.6", ngImport: i0, type: CoreApiService, deps: [{ token: i1$3.HttpClient }], target: i0.ɵɵFactoryTarget.Injectable });
@@ -3116,8 +3160,10 @@ class LoadingComponent {
         this.show = false;
     }
     ngOnInit() {
-        this.subs.sink = this.loadingService.subscribe((state) => {
-            this.show = state;
+        this.subs.sink = this.loadingService.subscribe({
+            next: (data) => {
+                this.show = data;
+            }
         });
     }
     ngOnDestroy() {
@@ -3162,19 +3208,22 @@ class PageSpinnerComponent {
     constructor(router, document) {
         this.router = router;
         this.document = document;
-        this.backgroundColor = '#2196f3';
-        this.spinner = Spinkit.skLine;
         this.isSpinnerVisible = true;
         this.Spinkit = Spinkit;
-        this.router.events.subscribe(event => {
-            if (event instanceof NavigationStart) {
-                this.isSpinnerVisible = true;
-            }
-            else if (event instanceof NavigationEnd || event instanceof NavigationCancel || event instanceof NavigationError) {
+        this.backgroundColor = '#2196f3';
+        this.spinner = Spinkit.skLine;
+        this.router.events.subscribe({
+            next: (event) => {
+                if (event instanceof NavigationStart) {
+                    this.isSpinnerVisible = true;
+                }
+                else if (event instanceof NavigationEnd || event instanceof NavigationCancel || event instanceof NavigationError) {
+                    this.isSpinnerVisible = false;
+                }
+            },
+            error: (e) => {
                 this.isSpinnerVisible = false;
             }
-        }, () => {
-            this.isSpinnerVisible = false;
         });
     }
     ngOnDestroy() {
@@ -3808,15 +3857,19 @@ class UrlSlugComponent extends BaseEditComponent {
         this.setFormValue(this.controlName, event.urlSlug);
     }
     startWatching() {
-        this.subs.sink = this.formGroup.get(this.watchedControlName).valueChanges.subscribe(value => {
-            if (this.firstValue) {
-                this.firstValue = false;
-                return;
+        this.subs.sink = this.formGroup.get(this.watchedControlName).valueChanges.subscribe({
+            next: (value) => {
+                if (this.firstValue) {
+                    this.firstValue = false;
+                    return;
+                }
+                this.generateUrlSlug(value);
             }
-            this.generateUrlSlug(value);
         });
-        this.subs.sink = this.formGroup.get(this.controlName).valueChanges.subscribe(value => {
-            this.hrefGo = value;
+        this.subs.sink = this.formGroup.get(this.controlName).valueChanges.subscribe({
+            next: (value) => {
+                this.hrefGo = value;
+            }
         });
     }
     //Events