Merge branch 'MDL-60621-master-1' of git://github.com/mihailges/moodle

moodle · Jun 30, 2020 · 1b771b1 · 1b771b1
2 parents c11e251 + 8ee9fbc
commit 1b771b1
Show file tree

Hide file tree

Showing 10 changed files with 33 additions and 6 deletions.
diff --git a/course/amd/build/activitychooser.min.js b/course/amd/build/activitychooser.min.js
diff --git a/course/amd/build/activitychooser.min.js.map b/course/amd/build/activitychooser.min.js.map
diff --git a/course/amd/src/activitychooser.js b/course/amd/src/activitychooser.js
@@ -248,6 +248,7 @@ const buildModal = (bodyPromise, footer) => {
         body: bodyPromise,
         footer: footer.customfootertemplate,
         large: true,
+        scrollable: false,
         templateContext: {
             classes: 'modchooser'
         }