fixed lazy loading issues #214

psolom · Aug 6, 2017 · 71f08ab · 71f08ab · forumarji · Aug 11, 2017
1 parent 601e9c2
commit 71f08ab
Show file tree

Hide file tree

Showing 2 changed files with 33 additions and 18 deletions.
diff --git a/scripts/filemanager.js b/scripts/filemanager.js
@@ -428,6 +428,8 @@ $.richFilemanagerPlugin = function(element, pluginOptions)
 		fmModel = new FmModel();
 		ko.applyBindings(fmModel);
 
+        fmModel.itemsModel.initiateLazyLoad();
+
 		ko.bindingHandlers.toggleNodeVisibility = {
 			init: function (element, valueAccessor) {
 				var node = valueAccessor();
@@ -1433,21 +1435,6 @@ $.richFilemanagerPlugin = function(element, pluginOptions)
             this.descriptivePanel = new RenderModel();
             this.lazyLoad = null;
 
-            if (config.viewer.image.lazyLoad) {
-                this.lazyLoad = new LazyLoad({
-                    container: $fileinfo[0], // work only for default scrollbar
-                    callback_load: function (element) {
-                        fm.log("LOADED", element.getAttribute('data-original'));
-                    },
-                    callback_set: function (element) {
-                        fm.log("SET", element.getAttribute('data-original'));
-                    },
-                    callback_processed: function (elementsLeft) {
-                        fm.log("PROCESSED", elementsLeft + " images left");
-                    }
-                });
-			}
-
 			this.isSelecting.subscribe(function(state) {
 				if(!state) {
 				    // means selection lasso has been dropped
@@ -1607,6 +1594,27 @@ $.richFilemanagerPlugin = function(element, pluginOptions)
 				}
 			};
 
+            this.initiateLazyLoad = function() {
+            	// not configured or already initiated
+                if (config.viewer.image.lazyLoad !== true || items_model.lazyLoad) {
+                	return;
+				}
+
+                items_model.lazyLoad = new LazyLoad({
+                    container: $fileinfo[0], // work only for default scrollbar
+                    callback_load: function (element) {
+                        fm.log("LOADED", element.getAttribute('data-original'));
+                    },
+                    callback_set: function (element) {
+                        console.log(element);
+                        fm.log("SET", element.getAttribute('data-original'));
+                    },
+                    callback_processed: function (elementsLeft) {
+                        fm.log("PROCESSED", elementsLeft + " images left");
+                    }
+                });
+            };
+
 			this.objects.subscribe(function(items) {
 				var totalNumber = 0,
 					totalSize = 0;
@@ -1623,7 +1631,14 @@ $.richFilemanagerPlugin = function(element, pluginOptions)
 				items_model.objectsNumber(totalNumber);
 				items_model.objectsSize(formatBytes(totalSize));
 
-				// context menu
+				// update
+                if (items_model.lazyLoad) {
+                    setTimeout(function() {
+                        items_model.lazyLoad.update();
+                    }, 50);
+                }
+
+                // context menu
 				$viewItems.contextMenu({
 					selector: '.file, .directory',
 					zIndex: 100,