Skip to content

Core: Fix contenteditable detection's regression introduced in #2142 #2235

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 1 commit into from
Nov 18, 2018
Merged

Core: Fix contenteditable detection's regression introduced in #2142 #2235

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
13 changes: 9 additions & 4 deletions src/core.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -125,14 +125,15 @@ $.extend( $.fn, {
// https://jqueryvalidation.org/rules/
rules: function( command, argument ) {
var element = this[ 0 ],
isContentEditable = typeof this.attr( "contenteditable" ) !== "undefined" && this.attr( "contenteditable" ) !== "false",
settings, staticRules, existingRules, data, param, filtered;

// If nothing is selected, return empty object; can't chain anyway
if ( element == null ) {
return;
}

if ( !element.form && element.isContentEditable ) {
if ( !element.form && isContentEditable ) {
element.form = this.closest( "form" )[ 0 ];
element.name = this.attr( "name" );
}
Expand Down Expand Up @@ -393,9 +394,10 @@ $.extend( $.validator, {
} );

function delegate( event ) {
var isContentEditable = typeof $( this ).attr( "contenteditable" ) !== "undefined" && $( this ).attr( "contenteditable" ) !== "false";

// Set form expando on contenteditable
if ( !this.form && this.isContentEditable ) {
if ( !this.form && isContentEditable ) {
this.form = $( this ).closest( "form" )[ 0 ];
this.name = $( this ).attr( "name" );
}
Expand Down Expand Up @@ -629,12 +631,14 @@ $.extend( $.validator, {
.not( this.settings.ignore )
.filter( function() {
var name = this.name || $( this ).attr( "name" ); // For contenteditable
var isContentEditable = typeof $( this ).attr( "contenteditable" ) !== "undefined" && $( this ).attr( "contenteditable" ) !== "false";

if ( !name && validator.settings.debug && window.console ) {
console.error( "%o has no name assigned", this );
}

// Set form expando on contenteditable
if ( this.isContentEditable ) {
if ( isContentEditable ) {
this.form = $( this ).closest( "form" )[ 0 ];
this.name = name;
}
Expand Down Expand Up @@ -689,6 +693,7 @@ $.extend( $.validator, {
elementValue: function( element ) {
var $element = $( element ),
type = element.type,
isContentEditable = typeof $element.attr( "contenteditable" ) !== "undefined" && $element.attr( "contenteditable" ) !== "false",
val, idx;

if ( type === "radio" || type === "checkbox" ) {
Expand All @@ -697,7 +702,7 @@ $.extend( $.validator, {
return element.validity.badInput ? "NaN" : $element.val();
}

if ( element.isContentEditable ) {
if ( isContentEditable ) {
val = $element.text();
} else {
val = $element.val();
Expand Down