From 39c83ccf0d1034de194b1676670f9fddf6d1b12e Mon Sep 17 00:00:00 2001
From: TJ VanToll <tj.vantoll@gmail.com>
Date: Sat, 9 May 2015 17:38:13 -0400
Subject: [PATCH] Selectmenu: Handle form resets

Fixes #12236
---
 tests/unit/selectmenu/core.js         | 18 ++++++++++++++++++
 tests/unit/selectmenu/selectmenu.html |  4 ++--
 ui/selectmenu.js                      | 12 ++++++++++++
 3 files changed, 32 insertions(+), 2 deletions(-)

diff --git a/tests/unit/selectmenu/core.js b/tests/unit/selectmenu/core.js
index e5807817ee4..8917932740c 100644
--- a/tests/unit/selectmenu/core.js
+++ b/tests/unit/selectmenu/core.js
@@ -327,6 +327,24 @@ $.each([
 			start();
 		});
 	});
+
+	asyncTest( "Selectmenu should reset when its parent form resets", function() {
+		expect( 2 );
+
+		var element = $( "#speed" ).selectmenu(),
+			widget = element.selectmenu( "widget" ),
+			initialValue = element.val(),
+			form = element.closest( "form" );
+
+		element.val( "Slower" );
+		element.selectmenu( "refresh" );
+		equal( widget.text(), "Slower" );
+		form[ 0 ].reset();
+		setTimeout(function() {
+			equal( widget.text(), initialValue );
+			start();
+		});
+	});
 });
 
 } );
diff --git a/tests/unit/selectmenu/selectmenu.html b/tests/unit/selectmenu/selectmenu.html
index 16e0f15a7ce..64b3f48ae6e 100644
--- a/tests/unit/selectmenu/selectmenu.html
+++ b/tests/unit/selectmenu/selectmenu.html
@@ -14,7 +14,7 @@
 <div id="qunit-fixture">
 	<div id="selectmenu-wrap1" class="selectmenu-wrap"></div>
 
-	<div id="selectmenu-wrap2" class="selectmenu-wrap">
+	<form id="selectmenu-wrap2" class="selectmenu-wrap">
 		<label for="speed">Select a speed:</label>
 		<select name="speed" id="speed">
 			<option value="Slower">Slower</option>
@@ -23,7 +23,7 @@
 			<option value="Fast">Fast</option>
 			<option value="Faster">Faster</option>
 		</select>
-	</div>
+	</form>
 
 	<label for="number">Select a number:</label>
 	<select name="number" id="number">
diff --git a/ui/selectmenu.js b/ui/selectmenu.js
index db2cea712aa..93844d4da50 100644
--- a/ui/selectmenu.js
+++ b/ui/selectmenu.js
@@ -72,6 +72,7 @@ return $.widget( "ui.selectmenu", {
 
 		this._drawButton();
 		this._drawMenu();
+		this._handleFormReset();
 
 		this._rendered = false;
 		this.menuItems = $();
@@ -204,6 +205,17 @@ return $.widget( "ui.selectmenu", {
 		};
 	},
 
+	_handleFormReset: function() {
+		var that = this;
+		this._on( this.element.closest( "form" ), {
+			reset: function() {
+				setTimeout( function() {
+					that.refresh();
+				} );
+			}
+		} );
+	},
+
 	refresh: function() {
 		this._refreshMenu();
 		this.buttonItem.replaceWith(