Merge pull request #12515 from nextcloud/papercut/12295/grid-view-laz…

…y-loading Make number of file list entries depending on the width for grid view
nextcloud · Nov 19, 2018 · ea46c11 · ea46c11
2 parents a9e7b65 + eb03960
commit ea46c11
Showing 1 changed file with 8 additions and 1 deletion.
diff --git a/apps/files/js/filelist.js b/apps/files/js/filelist.js
@@ -99,7 +99,14 @@
 		 * @return {int} page size
 		 */
 		pageSize: function() {
-			return Math.max(Math.ceil(this.$container.height() / 50), 1);
+			var isGridView = this.$showGridView.is(':checked');
+			var columns = 1;
+			var rows = Math.ceil(this.$container.height() / 50);
+			if (isGridView) {
+				columns = Math.ceil(this.$container.width() / 160);
+				rows = Math.ceil(this.$container.height() / 160);
+			}
+			return Math.max(columns*rows, columns);
 		},
 
 		/**