Merge branch 'MDL-53988-master' of https://github.com/xow/moodle

andelacruz · May 19, 2016 · 367c85d · 367c85d
2 parents a1643e6 + 811d9ff
commit 367c85d
Show file tree

Hide file tree

Showing 30 changed files with 841 additions and 213 deletions.
diff --git a/lib/amd/build/notification.min.js b/lib/amd/build/notification.min.js
diff --git a/lib/amd/src/notification.js b/lib/amd/src/notification.js
@@ -137,7 +137,7 @@ function(Y, $, log) {
             });
         },
 
-        confirm: function(title, question, yesLabel, noLabel, callback) {
+        confirm: function(title, question, yesLabel, noLabel, yesCallback, noCallback) {
             // Here we are wrapping YUI. This allows us to start transitioning, but
             // wait for a good alternative without having inconsistent dialogues.
             Y.use('moodle-core-notification-confirm', function () {
@@ -149,8 +149,13 @@ function(Y, $, log) {
                 });
 
                 modal.on('complete-yes', function() {
-                    callback();
+                    yesCallback();
                 });
+                if (noCallback) {
+                    modal.on('complete-no', function() {
+                        noCallback();
+                    });
+                }
                 modal.show();
             });
         },
@@ -225,7 +230,8 @@ function(Y, $, log) {
          * @param {string} question
          * @param {string} yesLabel
          * @param {string} noLabel
-         * @param {function} callback
+         * @param {function} yesCallback
+         * @param {function} noCallback Optional parameter to be called if the user presses cancel.
          */
         confirm: notificationModule.confirm,
 

diff --git a/mod/lti/amd/build/external_registration.min.js b/mod/lti/amd/build/external_registration.min.js