@wizishop/img-manager 0.2.75 → 0.2.76

package/bundles/wizishop-img-manager.umd.js

@@ -1984,6 +1984,10 @@
                 return;
             }
             this.isLoading = true;
+            if (!this.isImgModified && !this.isNameModified) {
+                this.isLoading = false;
+                this.onEditClosed();
+            }
             var obsReplaceImg = this.imgManagerService.replaceImg(this.currentCroppedImage, this.imgToEdit.id_file);
             var obsChangeImgName = this.imgManagerService.changeImgName(this.imgToEdit.display_name, this.imgToEdit.id_file);
             if (this.isImgModified && this.isNameModified) {
@@ -2059,7 +2063,7 @@
         ImgEditorComponent = __decorate([
             core.Component({
                 selector: 'img-editor',
-                template: "<div class=\"img-editor\" [@easeInOut]=\"'in'\">\n\n    <ng-scrollbar\n        #scrollable\n        [visibility]=\"'native'\"\n        class=\"img-editor__scroll\"\n        [ngClass]=\"{\n            'img-editor__scroll--full': stateDisplayed === 'full',\n            'img-editor__scroll--smallDisplay': stateDisplayed === 'small',\n            'img-editor__scroll--window': stateDisplayed === 'window'\n        }\"\n    >\n    <div class=\"columns\">\n        <!-- Left section -->\n        <div class=\"column is-one-third img-editor__infoSection\">\n\n            <info-section\n              [imgToEdit]=\"imgToEdit\"\n              [(isNameModified)]=\"isNameModified\"\n              >\n            </info-section>\n\n            <!-- Button Action Section -->\n\n            <div class=\"img-editor__infoSection__actions\">\n                <div>\n                    <button\n                      class=\"button img-editor__infoSection__actions__cancel\"\n                      (click)=\"onCancel()\"\n                      [disabled]=\"isLoading\"\n                    >\n                        {{ 'ImgManager.ImgLib.cancel' | translate }}\n                    </button>\n                    <div\n                        class=\"button danger button img-editor__infoSection__actions__save\"\n                        [ngClass]=\"{'img-editor__infoSection__actions__save--disable': isLoading}\"\n                        (click)=\"onSave()\"\n                    >\n                        {{ 'ImgManager.ImgEditor.saveBtn' | translate }}\n                        <span btnLoadingAnim *ngIf=\"isLoading\" class=\"btnLoadingAnnimation\"></span>\n                    </div>\n\n                </div>\n            </div>\n        </div>\n\n\n        <!-- Right section -->\n        <div class=\"column img-editor__container\">\n            <cropper\n              [imgToEdit]=\"imgToEdit\"\n              [(isImgModified)]=\"isImgModified\"\n              (currentCroppedImageChange)=\"onImgCropped($event)\"\n              (editClosed)=\"onEditClosed($event)\">\n            </cropper>\n        </div>\n    </div>\n    </ng-scrollbar>\n</div>\n",
+                template: "<div class=\"img-editor\" [@easeInOut]=\"'in'\">\n\n    <ng-scrollbar\n        #scrollable\n        [visibility]=\"'native'\"\n        class=\"img-editor__scroll\"\n        [ngClass]=\"{\n            'img-editor__scroll--full': stateDisplayed === 'full',\n            'img-editor__scroll--smallDisplay': stateDisplayed === 'small',\n            'img-editor__scroll--window': stateDisplayed === 'window'\n        }\"\n    >\n    <div class=\"columns\">\n        <!-- Left section -->\n        <div class=\"column is-one-third img-editor__infoSection\">\n\n            <info-section\n              [imgToEdit]=\"imgToEdit\"\n              [(isNameModified)]=\"isNameModified\"\n              >\n            </info-section>\n\n            <!-- Button Action Section -->\n\n            <div class=\"img-editor__infoSection__actions\">\n                <div>\n                    <button\n                      class=\"button img-editor__infoSection__actions__cancel\"\n                      (click)=\"onCancel()\"\n                      [disabled]=\"isLoading || (!isImgModified  && !isNameModified)\"\n                    >\n                        {{ 'ImgManager.ImgLib.cancel' | translate }}\n                    </button>\n                    <div\n                        class=\"button danger button img-editor__infoSection__actions__save\"\n                        [ngClass]=\"{'img-editor__infoSection__actions__save--disable': isLoading}\"\n                        (click)=\"onSave()\"\n                    >\n                        {{ 'ImgManager.ImgEditor.saveBtn' | translate }}\n                        <span btnLoadingAnim *ngIf=\"isLoading\" class=\"btnLoadingAnnimation\"></span>\n                    </div>\n\n                </div>\n            </div>\n        </div>\n\n\n        <!-- Right section -->\n        <div class=\"column img-editor__container\">\n            <cropper\n              [imgToEdit]=\"imgToEdit\"\n              [(isImgModified)]=\"isImgModified\"\n              (currentCroppedImageChange)=\"onImgCropped($event)\"\n              (editClosed)=\"onEditClosed($event)\">\n            </cropper>\n        </div>\n    </div>\n    </ng-scrollbar>\n</div>\n",
                 animations: [
                     easeInOut
                 ]
@@ -3183,8 +3187,8 @@
             var _this = this;
             this.isLoading = true;
             this.displayPexelsResults = false;
-            this.isTotalRetieved = false;
             this.setParams();
+            this.refreshTotalImgList();
             this.imgManager.getShopImgList(this.params).pipe(operators.take(1)).subscribe(function (data) {
                 _this.initVariables(true);
                 var nbImgDisplayed = data.data.length;
@@ -3202,7 +3206,6 @@
                 if (data.totalRecords === 0) {
                     _this.displayPexelsLib();
                 }
-                _this.refreshTotalImgList();
             }, function (error) {
                 _this.alertService.openAlert(_this.errorGetAllImg);
                 _this.initVariables(false);
@@ -3210,12 +3213,19 @@
         };
         ImagesViewComponent.prototype.refreshTotalImgList = function () {
             var _this = this;
+            var searchValue = this.tableFilters.searchValue;
+            if (this.isTotalRetieved && searchValue === this.previousSearchValue) {
+                // Keep current total result
+                return;
+            }
+            this.isTotalRetieved = false;
             this.imgManager.getShopTotalImgList(this.params).pipe(operators.take(1)).subscribe(function (data) {
+                _this.previousSearchValue = searchValue;
                 _this.isTotalRetieved = true;
                 _this.length = data.totalRecords;
                 _this.tableFilters.totalItems = data.totalRecords;
             }, function (error) {
-                _this.alertService.openAlert(_this.errorGetTotalImg);
+                //this.alertService.openAlert(this.errorGetTotalImg);
                 _this.initVariables(false);
             });
         };