mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-07-24 15:51:56 +02:00
Code Issues Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Ryan Wyllie
2018-02-02 03:23:17 +00:00
parent a4f914b54d
commit 2328bcccde
2 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lib/amd/build/modal.min.js vendored
View File

File diff suppressed because one or more lines are too long

7
lib/amd/src/modal.js
View File

@@ -272,7 +272,12 @@ define(['jquery', 'core/templates', 'core/notification', 'core/key_codes',
if (value.state() == 'pending') { if (value.state() == 'pending') {
// We're still waiting for the body promise to resolve so // We're still waiting for the body promise to resolve so
// let's show a loading icon. // 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(''); body.html('');
contentPromise = Templates.render(TEMPLATES.LOADING, {}) contentPromise = Templates.render(TEMPLATES.LOADING, {})