Merge branch 'MDL-61451-master' of git://github.com/cescobedo/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 3 Apr 2018 23:39:36 +0000 (01:39 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 3 Apr 2018 23:39:36 +0000 (01:39 +0200)
lib/amd/build/auto_rows.min.js
lib/amd/src/auto_rows.js

index 5666dc3..edc87d9 100644 (file)
Binary files a/lib/amd/build/auto_rows.min.js and b/lib/amd/build/auto_rows.min.js differ
index ab7a876..644d3a9 100644 (file)
@@ -49,9 +49,6 @@ define(['jquery'], function($) {
         var innerHeight = element.innerHeight();
         var padding = innerHeight - height;
 
-        // Set height to 1ox to force scroll height to calculate correctly.
-        element.height('1px');
-
         var scrollHeight = element[0].scrollHeight;
         var rows = (scrollHeight - padding) / (height / currentRows);