diff options
author | Samuel Bovée <samycookie2000@yahoo.fr> | 2012-11-16 12:47:22 +0100 |
---|---|---|
committer | Mike Sherov <mike.sherov@gmail.com> | 2012-11-21 19:18:00 -0500 |
commit | cb748b4a6f32aa5748d6777e7871c96f70ad2207 (patch) | |
tree | f04b297e552adaefc255584a75b6d0b408982c80 /ui/jquery.ui.slider.js | |
parent | f13b5dfa7fdb480b818cfbf07e35088460e7b5c9 (diff) | |
download | jquery-ui-cb748b4a6f32aa5748d6777e7871c96f70ad2207.tar.gz jquery-ui-cb748b4a6f32aa5748d6777e7871c96f70ad2207.zip |
Slider: factorize code with Widget method call. Fixed #8772 - Wrong slider UI state when disabled at init
Diffstat (limited to 'ui/jquery.ui.slider.js')
-rw-r--r-- | ui/jquery.ui.slider.js | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/ui/jquery.ui.slider.js b/ui/jquery.ui.slider.js index 90de25316..d9fc1b132 100644 --- a/ui/jquery.ui.slider.js +++ b/ui/jquery.ui.slider.js @@ -54,8 +54,7 @@ $.widget( "ui.slider", $.ui.mouse, { " ui-slider-" + this.orientation + " ui-widget" + " ui-widget-content" + - " ui-corner-all" + - ( o.disabled ? " ui-slider-disabled ui-disabled" : "" ) ); + " ui-corner-all"); this.range = $([]); @@ -116,6 +115,8 @@ $.widget( "ui.slider", $.ui.mouse, { $( this ).data( "ui-slider-handle-index", i ); }); + this._setOption( "disabled", o.disabled ); + this._on( this.handles, { keydown: function( event ) { var allowed, curVal, newVal, step, @@ -205,7 +206,6 @@ $.widget( "ui.slider", $.ui.mouse, { .removeClass( "ui-slider" + " ui-slider-horizontal" + " ui-slider-vertical" + - " ui-slider-disabled" + " ui-widget" + " ui-widget-content" + " ui-corner-all" ); @@ -480,10 +480,8 @@ $.widget( "ui.slider", $.ui.mouse, { this.handles.filter( ".ui-state-focus" ).blur(); this.handles.removeClass( "ui-state-hover" ); this.handles.prop( "disabled", true ); - this.element.addClass( "ui-disabled" ); } else { this.handles.prop( "disabled", false ); - this.element.removeClass( "ui-disabled" ); } break; case "orientation": |