From d0fc381d6b69fe732152626232296887c213a842 Mon Sep 17 00:00:00 2001 From: Mat Marquis Date: Fri, 14 Oct 2011 17:15:41 -0400 Subject: [PATCH] =?UTF-8?q?Fixes=20#2541=20=E2=80=94=20Properly=20applies?= =?UTF-8?q?=20=E2=80=9Cdisabled=E2=80=9D=20styling=20and=20logic=20to=20fl?= =?UTF-8?q?ip=20switches,=20sliders,=20and=20custom=20selects=20based=20on?= =?UTF-8?q?=20disabled=20attribute=20in=20underlying=20input=20markup.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- js/jquery.mobile.forms.select.js | 2 +- js/jquery.mobile.forms.slider.js | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/js/jquery.mobile.forms.select.js b/js/jquery.mobile.forms.select.js index 3354e45d1ac..9202be1c808 100644 --- a/js/jquery.mobile.forms.select.js +++ b/js/jquery.mobile.forms.select.js @@ -122,7 +122,7 @@ $.widget( "mobile.selectmenu", $.mobile.widget, { } // Disable if specified - if ( options.disabled ) { + if ( options.disabled || this.element.attr('disabled')) { this.disable(); } diff --git a/js/jquery.mobile.forms.slider.js b/js/jquery.mobile.forms.slider.js index eb0537895a7..7c29013f812 100644 --- a/js/jquery.mobile.forms.slider.js +++ b/js/jquery.mobile.forms.slider.js @@ -215,7 +215,11 @@ $.widget( "mobile.slider", $.mobile.widget, { }, refresh: function( val, isfromControl, preventInputUpdate ) { - if ( this.options.disabled ) { return; } + + if ( this.options.disabled || this.element.attr('disabled')) { + this.slider.addClass('ui-disabled'); + return; + } var control = this.element, percent, cType = control[0].nodeName.toLowerCase(),