Merge branch 'MDL-61451-master' of git://github.com/cescobedo/moodle

diff --git a/lib/amd/build/auto_rows.min.js b/lib/amd/build/auto_rows.min.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

diff --git a/lib/amd/src/auto_rows.js b/lib/amd/src/auto_rows.js
index ab7a876..644d3a9 100644 (file)
--- a/lib/amd/src/auto_rows.js
+++ b/lib/amd/src/auto_rows.js
@@ -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);