From 1f1613852cb6116cd71a6600d737099fc2d55d2a Mon Sep 17 00:00:00 2001
From: TJ VanToll <tj.vantoll@gmail.com>
Date: Mon, 21 May 2012 21:52:48 -0400
Subject: [PATCH] Button: Corrected default label applied to submit buttons. 
 Fixed #8337: Submit inputs don't automatically set label option.

---
 tests/unit/button/button_options.js | 4 ++++
 ui/jquery.ui.button.js              | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/tests/unit/button/button_options.js b/tests/unit/button/button_options.js
index 9ef4a19db..3dd361ac9 100644
--- a/tests/unit/button/button_options.js
+++ b/tests/unit/button/button_options.js
@@ -53,6 +53,7 @@ test("text false with icon", function() {
 test("label, default", function() {
 	$("#button").button();
 	deepEqual( $("#button").text(), "Label" );
+	deepEqual( $( "#button").button( "option", "label" ), "Label" );
 
 	$("#button").button("destroy");
 });
@@ -62,12 +63,14 @@ test("label", function() {
 		label: "xxx"
 	});
 	deepEqual( $("#button").text(), "xxx" );
+	deepEqual( $("#button").button( "option", "label" ), "xxx" );
 
 	$("#button").button("destroy");
 });
 
 test("label default with input type submit", function() {
 	deepEqual( $("#submit").button().val(), "Label" );
+	deepEqual( $("#submit").button( "option", "label" ), "Label" );
 });
 
 test("label with input type submit", function() {
@@ -75,6 +78,7 @@ test("label with input type submit", function() {
 		label: "xxx"
 	}).val();
 	deepEqual( label, "xxx" );
+	deepEqual( $("#submit").button( "option", "label" ), "xxx" );
 });
 
 test("icons", function() {
diff --git a/ui/jquery.ui.button.js b/ui/jquery.ui.button.js
index 772ad4d6f..810191775 100644
--- a/ui/jquery.ui.button.js
+++ b/ui/jquery.ui.button.js
@@ -73,7 +73,7 @@ $.widget( "ui.button", {
 			focusClass = "ui-state-focus";
 
 		if ( options.label === null ) {
-			options.label = this.buttonElement.html();
+			options.label = (this.type === "input" ? this.buttonElement.val() : this.buttonElement.html());
 		}
 
 		this.buttonElement