Button: Corrected default label applied to submit buttons. Fixed #8337: Submit input...

diff --git a/tests/unit/button/button_options.js b/tests/unit/button/button_options.js
index 9ef4a19db81d86dc36c8f0ecf4d158eab7e267be..3dd361ac92e97db3dfd6e8267c63e6c99bb37eba 100644 (file)
--- 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 772ad4d6f3e2542f2e28840aca9879a9e691b994..810191775b103d2965a2c19e23ab1f43bcc023c0 100644 (file)
--- 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