MDL-61135 javascript: fix modal body height resizing when loading

moodle · Feb 2, 2018 · 2328bcc · 2328bcc
1 parent a4f914b
commit 2328bcc
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/lib/amd/build/modal.min.js b/lib/amd/build/modal.min.js
diff --git a/lib/amd/src/modal.js b/lib/amd/src/modal.js
@@ -272,7 +272,12 @@ define(['jquery', 'core/templates', 'core/notification', 'core/key_codes',
             if (value.state() == 'pending') {
                 // We're still waiting for the body promise to resolve so
                 // let's show a loading icon.
-                body.animate({height: '100px'}, 150);
+                var height = body.innerHeight();
+                if (height < 100) {
+                    height = 100;
+                }
+
+                body.animate({height: height + 'px'}, 150);
 
                 body.html('');
                 contentPromise = Templates.render(TEMPLATES.LOADING, {})