From 31c0b2a346b0dd0462d821a7cec67bbfd96bef6c Mon Sep 17 00:00:00 2001
From: Cory Gackenheimer <cory.gack@gmail.com>
Date: Sat, 9 Aug 2014 21:36:25 -0400
Subject: [PATCH] Slider: input does not get ui-state-disabled class

Fixes gh-7024
Fixes gh-6532
Closes gh-7617

(cherry picked from commit 61bdcd75eed6640fa0b8ae5208dd0a711354b03f)
---
 js/widgets/forms/slider.js       | 2 ++
 tests/unit/slider/index.html     | 4 ++++
 tests/unit/slider/slider_core.js | 9 +++++++++
 3 files changed, 15 insertions(+)

diff --git a/js/widgets/forms/slider.js b/js/widgets/forms/slider.js
index 2f08552c85f..4babe01b891 100644
--- a/js/widgets/forms/slider.js
+++ b/js/widgets/forms/slider.js
@@ -585,6 +585,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
index 764aa59b7ab..226a0cf4835 100644
--- 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
index 16642c3c6c2..88bfa77b7bc 100644
--- 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 );