@lenne.tech/ng-base 0.3.4 → 0.3.5

package/bundles/lenne.tech-ng-base-src-lib-base.umd.js

@@ -1173,13 +1173,10 @@
         ImageService.prototype.preLoadImages = function (options) {
             var _this = this;
             // Init configuration
-            var config = Object.assign({ doneFunnction: undefined, elements: document, regExp: undefined, timeout: undefined }, options);
+            var config = Object.assign({ doneFunnction: undefined, elements: document, regExp: undefined }, options);
             return new Promise(function (resolve) {
                 var e_1, _b;
                 var _a;
-                // Init variables
-                var resolved = false;
-                var timeoutId;
                 // Convert element(s) into array
                 if (!Array.isArray(config.elements)) {
                     // NodeList or HTMLCollection
@@ -1202,22 +1199,24 @@
                     var src = image.getAttribute('src');
                     // Check if changes are necessary and possible
                     if ((image.complete && image.naturalHeight !== 0) || // already laoded
-                        image.getAttribute('loading') !== 'lazy' || // loading attribute !== lazy
                         !src || // Image has no src
                         ((_a = config.regExp) === null || _a === void 0 ? void 0 : _a.test(src)) // Test if src matches regular expression
                     ) {
                         return "continue";
                     }
                     // Replace lazy loading image with immediately loading image
-                    var newImage = document.createElement('img');
-                    Array.from(image.attributes).forEach(function (attr) {
-                        if (attr.name !== 'loading' && attr.name !== 'src') {
-                            newImage.setAttribute(attr.name, attr.value);
-                        }
-                    });
-                    image.replaceWith(newImage);
+                    if (image.getAttribute('loading') === 'lazy') {
+                        var newImage_1 = document.createElement('img');
+                        Array.from(image.attributes).forEach(function (attr) {
+                            if (attr.name !== 'loading' && attr.name !== 'src') {
+                                newImage_1.setAttribute(attr.name, attr.value);
+                            }
+                        });
+                        image.replaceWith(newImage_1);
+                        image = newImage_1;
+                    }
                     // Wait for laoding
-                    promises.push(_this.loadImage(newImage, src));
+                    promises.push(_this.loadImage(image, src));
                 };
                 try {
                     // Prepare images
@@ -1233,24 +1232,6 @@
                     }
                     finally { if (e_1) throw e_1.error; }
                 }
-                if (config.timeout) {
-                    timeoutId = setTimeout(function () { return __awaiter(_this, void 0, void 0, function () {
-                        return __generator(this, function (_b) {
-                            switch (_b.label) {
-                                case 0:
-                                    resolved = true;
-                                    if (!config.doneFunnction) return [3 /*break*/, 2];
-                                    return [4 /*yield*/, config.doneFunction()];
-                                case 1:
-                                    _b.sent();
-                                    _b.label = 2;
-                                case 2:
-                                    resolve(undefined);
-                                    return [2 /*return*/];
-                            }
-                        });
-                    }); });
-                }
                 // Wait until all images loaded
                 Promise.all(promises)
                     .catch(function (e) { return console.error('Error during image loading', e); })
@@ -1259,14 +1240,6 @@
                     return __generator(this, function (_b) {
                         switch (_b.label) {
                             case 0:
-                                // Check if already resolved
-                                if (resolved) {
-                                    return [2 /*return*/];
-                                }
-                                // Stop timeout
-                                if (timeoutId) {
-                                    clearTimeout(timeoutId);
-                                }
                                 if (!config.doneFunnction) return [3 /*break*/, 2];
                                 return [4 /*yield*/, config.doneFunction()];
                             case 1:
@@ -1316,29 +1289,16 @@
             this.el = el;
             this.imageService = imageService;
             // Replace lazy loading images with immediate loading images
-            this.loadLazyImages = true;
+            this.loadImages = true;
             this.isBrowser = common.isPlatformBrowser(platformId);
         }
         MatchHeightDirective.prototype.onResize = function () {
             this.matchHeight(this.el.nativeElement, this.ltMatchHeight);
         };
-        MatchHeightDirective.prototype.ngAfterViewChecked = function () {
+        MatchHeightDirective.prototype.ngOnInit = function () {
             this.matchHeight(this.el.nativeElement, this.ltMatchHeight);
         };
         MatchHeightDirective.prototype.matchHeight = function (parent, target) {
-            var _this = this;
-            if (this.isBrowser) {
-                // Timeout is set to force Angular to wait for all actions and only continue once the process has run through.
-                // Otherwise, an infinite loop will occur.
-                setTimeout(function () {
-                    _this.matchHeightHelper(parent, target);
-                }, 1);
-            }
-            else {
-                this.matchHeightHelper(parent, target);
-            }
-        };
-        MatchHeightDirective.prototype.matchHeightHelper = function (parent, target) {
             return __awaiter(this, void 0, void 0, function () {
                 var classNames, _loop_1, this_1, classNames_1, classNames_1_1, className, e_1_1;
                 var e_1, _a;
@@ -1363,7 +1323,7 @@
                                             if (!children || children.length < 2) {
                                                 return [2 /*return*/, "continue"];
                                             }
-                                            if (!this_1.loadLazyImages) return [3 /*break*/, 2];
+                                            if (!this_1.loadImages) return [3 /*break*/, 2];
                                             return [4 /*yield*/, this_1.imageService.preLoadImages({ elements: children })];
                                         case 1:
                                             _c.sent();
@@ -1432,7 +1392,7 @@
     ]; };
     MatchHeightDirective.propDecorators = {
         ltMatchHeight: [{ type: i0.Input }],
-        loadLazyImages: [{ type: i0.Input }],
+        loadImages: [{ type: i0.Input }],
         onResize: [{ type: i0.HostListener, args: ['window:resize',] }]
     };
 
@@ -2955,48 +2915,26 @@
          * Scroll done promise
          */
         ScrollService.prototype.scrollDone = function (options) {
-            var _this = this;
             if (options === void 0) { options = {}; }
-            // Init configuration
-            var config = Object.assign({ doneFunction: undefined, timeout: undefined }, options);
-            // Return promise for scroll done
-            return new Promise(function (resolve, reject) { return __awaiter(_this, void 0, void 0, function () {
-                var rejected, timeoutId, result;
+            return __awaiter(this, void 0, void 0, function () {
+                var config;
                 return __generator(this, function (_a) {
                     switch (_a.label) {
                         case 0:
-                            rejected = false;
-                            // Set timeout handling if necessary
-                            if (config.timeout) {
-                                timeoutId = window.setTimeout(function () {
-                                    rejected = true;
-                                    reject(new Error('Timeout for scrollDone after:' + config.timeout));
-                                }, config.timeout);
-                            }
+                            config = Object.assign({ doneFunction: undefined }, options);
                             // Wait for scroll done
                             return [4 /*yield*/, this.scrollDoneDetection()];
                         case 1:
                             // Wait for scroll done
                             _a.sent();
-                            if (!!rejected) return [3 /*break*/, 4];
-                            // Stop timeout if set
-                            if (timeoutId) {
-                                window.clearTimeout(timeoutId);
+                            // Get result
+                            if (config.doneFunction) {
+                                return [2 /*return*/, config.doneFunction()];
                             }
-                            result = void 0;
-                            if (!config.doneFunction) return [3 /*break*/, 3];
-                            return [4 /*yield*/, config.doneFunction()];
-                        case 2:
-                            result = _a.sent();
-                            _a.label = 3;
-                        case 3:
-                            // Scroll done
-                            resolve(result);
-                            _a.label = 4;
-                        case 4: return [2 /*return*/];
+                            return [2 /*return*/];
                     }
                 });
-            }); });
+            });
         };
         /**
          * Scroll done detecton