aboutsummaryrefslogtreecommitdiffstats
path: root/ui/widgets
diff options
context:
space:
mode:
authorAlexander Schmitz <arschmitz@gmail.com>2016-06-01 11:31:41 -0400
committerScott González <scott.gonzalez@gmail.com>2016-06-06 11:34:52 -0400
commitabc2a755f97689145de81000534cca138736a539 (patch)
treea077a52433a2e3f974deb7d4355f314c74c70966 /ui/widgets
parentb7d0c701c79c751f80e2f4058f7a4c3a17262815 (diff)
downloadjquery-ui-abc2a755f97689145de81000534cca138736a539.tar.gz
jquery-ui-abc2a755f97689145de81000534cca138736a539.zip
Checkboxradio: Use new `ui-state-checked` class in checkboxradio
Using `ui-state-highlight` caused a conflict with dialog Fixes #14955 Closes gh-1712 Closes gh-1704
Diffstat (limited to 'ui/widgets')
-rw-r--r--ui/widgets/checkboxradio.js9
1 files changed, 4 insertions, 5 deletions
diff --git a/ui/widgets/checkboxradio.js b/ui/widgets/checkboxradio.js
index 0052b1950..a55e4f033 100644
--- a/ui/widgets/checkboxradio.js
+++ b/ui/widgets/checkboxradio.js
@@ -176,11 +176,10 @@ $.widget( "ui.checkboxradio", [ $.ui.formResetMixin, {
this._toggleClass( this.label, "ui-checkboxradio-checked", "ui-state-active", checked );
if ( this.options.icon && this.type === "checkbox" ) {
-
- // We add ui-state-highlight to change the icon color
- this._toggleClass( this.icon, null, "ui-icon-check ui-state-highlight", checked )
+ this._toggleClass( this.icon, null, "ui-icon-check ui-state-checked", checked )
._toggleClass( this.icon, null, "ui-icon-blank", !checked );
}
+
if ( this.type === "radio" ) {
this._getRadioGroup()
.each( function() {
@@ -233,14 +232,14 @@ $.widget( "ui.checkboxradio", [ $.ui.formResetMixin, {
}
if ( this.type === "checkbox" ) {
- toAdd += checked ? "ui-icon-check ui-state-highlight" : "ui-icon-blank";
+ toAdd += checked ? "ui-icon-check ui-state-checked" : "ui-icon-blank";
this._removeClass( this.icon, null, checked ? "ui-icon-blank" : "ui-icon-check" );
} else {
toAdd += "ui-icon-blank";
}
this._addClass( this.icon, "ui-checkboxradio-icon", toAdd );
if ( !checked ) {
- this._removeClass( this.icon, null, "ui-icon-check ui-state-highlight" );
+ this._removeClass( this.icon, null, "ui-icon-check ui-state-checked" );
}
this.icon.prependTo( this.label ).after( this.iconSpace );
} else if ( this.icon !== undefined ) {