@osovitny/anatoly 2.0.45 → 2.0.47

package/bundles/osovitny-anatoly.umd.js

@@ -1621,37 +1621,45 @@
       function IdleService() {
           this.expired$ = new rxjs.Subject();
       }
-      IdleService.prototype.startWatching = function (timeOutSeconds) {
-          var _this = this;
-          this.idle$ = rxjs.merge(rxjs.fromEvent(document, "mousemove"), rxjs.fromEvent(document, "click"), rxjs.fromEvent(document, "mousedown"), rxjs.fromEvent(document, "keypress"), rxjs.fromEvent(document, "DOMMouseScroll"), rxjs.fromEvent(document, "mousewheel"), rxjs.fromEvent(document, "touchmove"), rxjs.fromEvent(document, "MSPointerMove"), rxjs.fromEvent(window, "mousemove"), rxjs.fromEvent(window, "resize"));
+      //Private
+      IdleService.prototype.resetTimeCounters = function (timeOutSeconds) {
+          this.timeOutSeconds = timeOutSeconds;
           this.timeOutMilliSeconds = timeOutSeconds * 1000;
-          this.idleSubscription = this.idle$.subscribe(function (res) {
-              _this.resetTimer();
-          });
-          this.startTimer();
-          return this.expired$;
+          this.startDate = new Date();
       };
       IdleService.prototype.startTimer = function () {
           var _this = this;
-          this.timer$ = rxjs.timer(this.timeOutMilliSeconds, this.timeOutMilliSeconds).subscribe(function (res) {
-              _this.expired$.next(true);
+          this.timer$ = rxjs.timer(this.timeOutMilliSeconds, 1 * 1000).subscribe(function (res) {
+              var nowDate = new Date();
+              var 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);
+              }
           });
       };
       IdleService.prototype.resetTimer = function () {
-          this.timer$.unsubscribe();
+          this.startDate = new Date();
+      };
+      //Public
+      IdleService.prototype.startWatching = function (timeOutSeconds) {
+          var _this = this;
+          this.idle$ = rxjs.merge(rxjs.fromEvent(document, 'mousemove'), rxjs.fromEvent(document, 'click'), rxjs.fromEvent(document, 'mousedown'), rxjs.fromEvent(document, 'keypress'), rxjs.fromEvent(document, 'DOMMouseScroll'), rxjs.fromEvent(document, 'mousewheel'), rxjs.fromEvent(document, 'touchmove'), rxjs.fromEvent(document, 'MSPointerMove'), rxjs.fromEvent(window, 'mousemove'), rxjs.fromEvent(window, 'resize'));
+          this.resetTimeCounters(timeOutSeconds);
+          this.idleSubscription = this.idle$.subscribe(function (res) {
+              _this.resetTimer();
+          });
           this.startTimer();
+          return this.expired$;
       };
-      IdleService.prototype.stopTimer = function () {
+      IdleService.prototype.stopWatching = function () {
           this.timer$.unsubscribe();
           this.idleSubscription.unsubscribe();
       };
-      IdleService.prototype.restartIdleTimer = function () {
-          var _this = this;
+      IdleService.prototype.restartIdleTimer = function (timeOutSeconds) {
           this.timer$.unsubscribe();
-          this.idleSubscription.unsubscribe();
-          this.idleSubscription = this.idle$.subscribe(function (res) {
-              _this.resetTimer();
-          });
+          this.resetTimeCounters(timeOutSeconds);
           this.startTimer();
       };
       return IdleService;
@@ -1659,32 +1667,35 @@
   IdleService.ɵprov = i0.ɵɵdefineInjectable({ factory: function IdleService_Factory() { return new IdleService(); }, token: IdleService, providedIn: "root" });
   IdleService.decorators = [
       { type: i0.Injectable, args: [{
-                  providedIn: "root",
+                  providedIn: 'root'
               },] }
   ];
 
   var WebStorageService = /** @class */ (function () {
       function WebStorageService(storage) {
-          this.currentClientKey = AppCoreSettings.SERVICES_CONF.selectedClientID;
           this.storage =
               storage === 'local' || storage === 'localStorage'
                   ? localStorage
                   : sessionStorage;
       }
       WebStorageService.prototype.setItem = function (key, value) {
-          this.storage.setItem(this.currentClientKey + key, value);
+          this.storage.setItem(key, value);
       };
       WebStorageService.prototype.setObject = function (key, value) {
-          this.storage.setItem(this.currentClientKey + key, JSON.stringify(value));
+          this.storage.setItem(key, JSON.stringify(value));
       };
       WebStorageService.prototype.getItem = function (key) {
-          return this.storage.getItem(this.currentClientKey + key);
+          return this.storage.getItem(key);
       };
       WebStorageService.prototype.getObject = function (key) {
-          return JSON.parse(this.storage.getItem(this.currentClientKey + key) || '{}');
+          var value = this.storage.getItem(key);
+          if (!value) {
+              return null;
+          }
+          return JSON.parse(value);
       };
       WebStorageService.prototype.remove = function (key) {
-          this.storage.removeItem(this.currentClientKey + key);
+          this.storage.removeItem(key);
       };
       return WebStorageService;
   }());
@@ -1849,7 +1860,9 @@
                       AppContextService,
                       LoadingService,
                       DigitalMarketingService,
-                      GoogleAnalyticsService
+                      GoogleAnalyticsService,
+                      LocalStorageService,
+                      SessionStorageService
                   ],
               },] }
   ];