Permalink
Browse files

Checkboxradio: Fix label handling with jQuery 3.x

Fixes #15006
Closes gh-1720
  • Loading branch information...
1 parent 21f7f25 commit 55cd9488ccd897bb9b75450852c100d13cf0df02 @scottgonzalez scottgonzalez committed Jul 11, 2016
Showing with 10 additions and 2 deletions.
  1. +10 −2 ui/widgets/checkboxradio.js
@@ -69,7 +69,7 @@ $.widget( "ui.checkboxradio", [ $.ui.formResetMixin, {
// We need to get the label text but this may also need to make sure it does not contain the
// input itself.
- this.label.contents().not( this.element ).each( function() {
+ this.label.contents().not( this.element[ 0 ] ).each( function() {
// The label contents could be text, html, or a mix. We concat each element to get a
// string representation of the label, without the input as part of it.
@@ -252,7 +252,15 @@ $.widget( "ui.checkboxradio", [ $.ui.formResetMixin, {
_updateLabel: function() {
// Remove the contents of the label ( minus the icon, icon space, and input )
- this.label.contents().not( this.element.add( this.icon ).add( this.iconSpace ) ).remove();
+ var contents = this.label.contents().not( this.element[ 0 ] );
+ if ( this.icon ) {
+ contents = contents.not( this.icon[ 0 ] );
+ }
+ if ( this.iconSpace ) {
+ contents = contents.not( this.iconSpace[ 0 ] );
+ }
+ contents.remove();
+
this.label.append( this.options.label );
},

0 comments on commit 55cd948

Please sign in to comment.