Merge branch 'MDL-59784-master' of git://github.com/andrewnicols/moodle

diff --git a/lib/amd/build/modal.min.js b/lib/amd/build/modal.min.js
index 7566ff4..3560618 100644 (file)
Binary files a/lib/amd/build/modal.min.js and b/lib/amd/build/modal.min.js differ

diff --git a/lib/amd/src/modal.js b/lib/amd/src/modal.js
index fbc7d9a..a49fb8f 100644 (file)
--- a/lib/amd/src/modal.js
+++ b/lib/amd/src/modal.js
@@ -608,7 +608,7 @@ define(['jquery', 'core/templates', 'core/notification', 'core/key_codes',
      */
     Modal.prototype.asyncSet = function(value, setFunction) {
         var p = value;
-        if (typeof value === 'string') {
+        if (typeof value !== 'object' || !value.hasOwnProperty('then')) {
             p = $.Deferred();
             p.resolve(value);
         }