Skip to content
Browse files

Merge branch 'MDL-30660' of git://github.com/timhunt/moodle

  • Loading branch information...
2 parents 55dae3a + b25acd2 commit 1921ff62f249febbdf75e0463ca617bfa6a25efc @samhemelryk samhemelryk committed
Showing with 16 additions and 3 deletions.
  1. +16 −3 lib/javascript-static.js
View
19 lib/javascript-static.js
@@ -263,15 +263,28 @@ M.util.show_confirm_dialog = function(e, args) {
if (target.test('a')) {
window.location = target.get('href');
+
} else if ((targetancestor = target.ancestor('a')) !== null) {
window.location = targetancestor.get('href');
+
} else if (target.test('input')) {
targetform = target.ancestor('form');
- if (targetform && targetform.submit) {
- targetform.submit();
+ if (!targetform) {
+ return;
}
+ if (target.get('name') && target.get('value')) {
+ targetform.append('<input type="hidden" name="' + target.get('name') +
+ '" value="' + target.get('value') + '">');
+ }
+ targetform.submit();
+
+ } else if (target.get('tagName').toLowerCase() == 'form') {
+ // We cannot use target.test('form') on the previous line because of
+ // http://yuilibrary.com/projects/yui3/ticket/2531561
+ target.submit();
+
} else if (M.cfg.developerdebug) {
- alert("Element of type " + target.get('tagName') + " is not supported by the M.util.show_confirm_dialog function. Use A or INPUT");
+ alert("Element of type " + target.get('tagName') + " is not supported by the M.util.show_confirm_dialog function. Use A, INPUT or FORM");
}
};

0 comments on commit 1921ff6

Please sign in to comment.
Something went wrong with that request. Please try again.