mirror of https://github.com/go-gitea/gitea
Make "cancel" buttons have proper type in modal forms (#25618)
Replace #25446, fix #25438 All "cancel" buttons which do not have "type" should not submit the form, should not be triggered by "Enter". This is a complete fix for all modal dialogs. The major change is "modules/aria/modal.js", "devtest" related code is for demo/test purpose.pull/25637/head^2
parent
2aa6a785cf
commit
45bc180a15
@ -0,0 +1,26 @@ |
||||
import $ from 'jquery'; |
||||
|
||||
const fomanticModalFn = $.fn.modal; |
||||
|
||||
// use our own `$.fn.modal` to patch Fomantic's modal module
|
||||
export function initAriaModalPatch() { |
||||
if ($.fn.modal === ariaModalFn) throw new Error('initAriaModalPatch could only be called once'); |
||||
$.fn.modal = ariaModalFn; |
||||
ariaModalFn.settings = fomanticModalFn.settings; |
||||
} |
||||
|
||||
// the patched `$.fn.modal` modal function
|
||||
// * it does the one-time attaching on the first call
|
||||
function ariaModalFn(...args) { |
||||
const ret = fomanticModalFn.apply(this, args); |
||||
if (args[0] === 'show' || args[0]?.autoShow) { |
||||
for (const el of this) { |
||||
// If there is a form in the modal, there might be a "cancel" button before "ok" button (all buttons are "type=submit" by default).
|
||||
// In such case, the "Enter" key will trigger the "cancel" button instead of "ok" button, then the dialog will be closed.
|
||||
// It breaks the user experience - the "Enter" key should confirm the dialog and submit the form.
|
||||
// So, all "cancel" buttons without "[type]" must be marked as "type=button".
|
||||
$(el).find('form button.cancel:not([type])').attr('type', 'button'); |
||||
} |
||||
} |
||||
return ret; |
||||
} |
Loading…
Reference in new issue