diff options
| author | TJ VanToll <tj.vantoll@gmail.com> | 2012-05-21 21:52:48 -0400 |
|---|---|---|
| committer | Scott González <scott.gonzalez@gmail.com> | 2012-05-22 08:43:21 -0400 |
| commit | 1f1613852cb6116cd71a6600d737099fc2d55d2a (patch) | |
| tree | a812bce2c5797fc872cf667520e3ce1bcd6dc7f1 | |
| parent | 286941ef8d325d6c0621eb29714792743871b1a3 (diff) | |
| download | jquery-ui-1f1613852cb6116cd71a6600d737099fc2d55d2a.tar.gz jquery-ui-1f1613852cb6116cd71a6600d737099fc2d55d2a.zip | |
Button: Corrected default label applied to submit buttons. Fixed #8337: Submit inputs don't automatically set label option.
| -rw-r--r-- | tests/unit/button/button_options.js | 4 | ||||
| -rw-r--r-- | ui/jquery.ui.button.js | 2 |
2 files changed, 5 insertions, 1 deletions
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 |