Merge 3286892 into 7b818d8

jquery-archive · May 29, 2014 · f397eb1 · f397eb1
2 parents 7b818d8 + 3286892
commit f397eb1
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 0 deletions.
diff --git a/js/widgets/forms/slider.js b/js/widgets/forms/slider.js
@@ -584,6 +584,8 @@ $.widget( "mobile.slider", $.extend( {
 		this.slider
 			.toggleClass( "ui-state-disabled", value )
 			.attr( "aria-disabled", value );
+
+		this.element.toggleClass( "ui-state-disabled", value );
 	}
 
 }, $.mobile.behaviors.formReset ) );

diff --git a/tests/unit/slider/index.html b/tests/unit/slider/index.html
@@ -128,6 +128,10 @@
 			<input type="range" name="tooltip-test-both" id="tooltip-test-both" value="17" min="0" max="100" data-nstest-popup-enabled="true" data-nstest-show-value="true"/>
 		</label>
 
+		<label>Input slider:
+			<input type="range" name="disable-input-test" id="disable-input-test" value="17" min="0" max="100"/>
+		</label>
+
 	</div>
 
 	<div id="enhancetest">

diff --git a/tests/unit/slider/slider_core.js b/tests/unit/slider/slider_core.js
@@ -114,4 +114,13 @@
 
 		ok( slider.val() === sliderHandle.text(), "slider text should match handle text");
 	});
+
+	test( "slider input is disabled correctly", function() {
+		var slider = $( "#disable-input-test" );
+
+		slider.slider( "disable" );
+
+		ok( slider.hasClass( "ui-state-disabled" ), "disabling slider also disables the input " );
+	});
+
 })( jQuery );