Skip to content

support custom validity message #1144

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 13 commits into from
Apr 28, 2023
Merged

support custom validity message #1144

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
66f50d1
support custom validity message
AbdiTolesa Apr 6, 2023
78fd352
bind custom validity message on row add
AbdiTolesa Apr 7, 2023
4c00271
support custom validity message in repeaters
AbdiTolesa Apr 7, 2023
375aa1b
reduce repeated code
AbdiTolesa Apr 7, 2023
8e541a3
change eslint version
AbdiTolesa Apr 7, 2023
f3ca753
update eslint-plugin-jsx-a11y version
AbdiTolesa Apr 7, 2023
275b330
add exception to camelcase, move variable declaration to top
AbdiTolesa Apr 7, 2023
9439a6c
add camelcase rule ignore comments
AbdiTolesa Apr 7, 2023
813134a
avoid template literals
AbdiTolesa Apr 11, 2023
984816d
remove let declarations
AbdiTolesa Apr 12, 2023
22b2156
Merge branch 'master' into issue_4150
Crabcyborg Apr 25, 2023
855f8cb
Try a more optimized version of issue 4150
Crabcyborg Apr 25, 2023
a848ec4
Merge pull request #1176 from Strategy11/optimize_issue_4150
Crabcyborg Apr 27, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
71 changes: 55 additions & 16 deletions js/formidable.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ function frmFrontFormJS() {
* @since 5.4
*/
function maybeAddPolyfills() {
var i;
if ( ! Element.prototype.matches ) {
// IE9 supports matches but as msMatchesSelector instead.
Element.prototype.matches = Element.prototype.msMatchesSelector;
Expand All @@ -41,7 +42,7 @@ function frmFrontFormJS() {
if ( window.NodeList && ! NodeList.prototype.forEach ) {
NodeList.prototype.forEach = function( callback, thisArg ) {
thisArg = thisArg || window;
for ( var i = 0; i < this.length; i++ ) {
for ( i = 0; i < this.length; i++ ) {
callback.call( thisArg, this[ i ], i, this );
}
};
Expand Down Expand Up @@ -585,7 +586,7 @@ function frmFrontFormJS() {
fieldset = jQuery( object ).find( '.frm_form_field' );
fieldset.addClass( 'frm_doing_ajax' );

data = jQuery( object ).serialize() + '&action=frm_entries_' + action + '&nonce=' + frm_js.nonce;
data = jQuery( object ).serialize() + '&action=frm_entries_' + action + '&nonce=' + frm_js.nonce; // eslint-disable-line camelcase
shouldTriggerEvent = object.classList.contains( 'frm_trigger_event_on_submit' );

success = function( response ) {
Expand Down Expand Up @@ -626,7 +627,7 @@ function frmFrontFormJS() {
}

removeSubmitLoading( jQuery( object ) );
if ( frm_js.offset != -1 ) {
if ( frm_js.offset != -1 ) { // eslint-disable-line camelcase
frmFrontForm.scrollMsg( jQuery( object ), false );
}

Expand Down Expand Up @@ -746,7 +747,7 @@ function frmFrontFormJS() {
function postToAjaxUrl( form, data, success, error ) {
var ajaxUrl, action, ajaxParams;

ajaxUrl = frm_js.ajax_url;
ajaxUrl = frm_js.ajax_url; // eslint-disable-line camelcase
action = form.getAttribute( 'action' );

if ( 'string' === typeof action && -1 !== action.indexOf( '?action=frm_forms_preview' ) ) {
Expand Down Expand Up @@ -849,7 +850,7 @@ function frmFrontFormJS() {
jsErrors[key]
);
} else {
roleString = frm_js.include_alert_role ? 'role="alert"' : '';
roleString = frm_js.include_alert_role ? 'role="alert"' : ''; // eslint-disable-line camelcase
$fieldCont.append( '<div class="frm_error" ' + roleString + ' id="' + id + '">' + jsErrors[key] + '</div>' );
}

Expand Down Expand Up @@ -997,12 +998,12 @@ function frmFrontFormJS() {

jQuery.ajax({
type: 'POST',
url: frm_js.ajax_url,
url: frm_js.ajax_url, // eslint-disable-line camelcase
data: {
action: 'frm_entries_send_email',
entry_id: entryId,
form_id: formId,
nonce: frm_js.nonce
nonce: frm_js.nonce // eslint-disable-line camelcase
},
success: function( msg ) {
var admin = document.getElementById( 'wpbody' );
Expand Down Expand Up @@ -1153,7 +1154,7 @@ function frmFrontFormJS() {
function checkForErrorsAndMaybeSetFocus() {
var errors, element, timeoutCallback;

if ( ! frm_js.focus_first_error ) {
if ( ! frm_js.focus_first_error ) { // eslint-disable-line camelcase
return;
}

Expand Down Expand Up @@ -1347,6 +1348,41 @@ function frmFrontFormJS() {
});
}

function setCustomValidityMessage() {
var forms, length, index;

forms = document.getElementsByClassName( 'frm-show-form' );
length = forms.length;

for ( index = 0; index < length; ++index ) {
forms[ index ].addEventListener(
'invalid',
function( event ) {
var target = event.target;

if ( 'INPUT' !== target.nodeName ) {
return;
}

if ( ! target.dataset.invmsg ) {
return;
}

if ( 'text' !== target.getAttribute( 'type' ) ) {
return;
}

if ( target.classList.contains( 'frm_verify' ) ) {
return;
}

target.setCustomValidity( target.dataset.invmsg );
},
true
);
}
}

return {
init: function() {
maybeAddPolyfills();
Expand Down Expand Up @@ -1384,6 +1420,9 @@ function frmFrontFormJS() {
addFilterFallbackForIE(); // Filter is not supported in any version of IE.

initFloatingLabels();

jQuery( document ).on( 'frmAfterAddRow', setCustomValidityMessage );
setCustomValidityMessage();
},

getFieldId: function( field, fullID ) {
Expand Down Expand Up @@ -1589,10 +1628,10 @@ function frmFrontFormJS() {

jQuery( scrollObj ).trigger( 'focus' );
newPos = scrollObj.offset().top;
if ( ! newPos || frm_js.offset === '-1' ) {
if ( ! newPos || frm_js.offset === '-1' ) { // eslint-disable-line camelcase
return;
}
newPos = newPos - frm_js.offset;
newPos = newPos - frm_js.offset; // eslint-disable-line camelcase

m = jQuery( 'html' ).css( 'margin-top' );
b = jQuery( 'body' ).css( 'margin-top' );
Expand Down Expand Up @@ -1722,13 +1761,13 @@ function frmUpdateField( entryId, fieldId, value, message, num ) {
jQuery( document.getElementById( 'frm_update_field_' + entryId + '_' + fieldId + '_' + num ) ).html( '<span class="frm-loading-img"></span>' );
jQuery.ajax({
type: 'POST',
url: frm_js.ajax_url,
url: frm_js.ajax_url, // eslint-disable-line camelcase
data: {
action: 'frm_entries_update_field_ajax',
entry_id: entryId,
field_id: fieldId,
value: value,
nonce: frm_js.nonce
nonce: frm_js.nonce // eslint-disable-line camelcase
},
success: function() {
if ( message.replace( /^\s+|\s+$/g, '' ) === '' ) {
Expand All @@ -1745,11 +1784,11 @@ function frmDeleteEntry( entryId, prefix ) {
jQuery( document.getElementById( 'frm_delete_' + entryId ) ).replaceWith( '<span class="frm-loading-img" id="frm_delete_' + entryId + '"></span>' );
jQuery.ajax({
type: 'POST',
url: frm_js.ajax_url,
url: frm_js.ajax_url, // eslint-disable-line camelcase
data: {
action: 'frm_entries_destroy',
entry: entryId,
nonce: frm_js.nonce
nonce: frm_js.nonce // eslint-disable-line camelcase
},
success: function( html ) {
if ( html.replace( /^\s+|\s+$/g, '' ) === 'success' ) {
Expand All @@ -1772,12 +1811,12 @@ function frm_resend_email( entryId, formId ) { // eslint-disable-line camelcase
$link.append( '<span class="spinner" style="display:inline"></span>' );
jQuery.ajax({
type: 'POST',
url: frm_js.ajax_url,
url: frm_js.ajax_url, // eslint-disable-line camelcase
data: {
action: 'frm_entries_send_email',
entry_id: entryId,
form_id: formId,
nonce: frm_js.nonce
nonce: frm_js.nonce // eslint-disable-line camelcase
},
success: function( msg ) {
$link.replaceWith( msg );
Expand Down
Loading