From 999617343f7b813dc1c8d9c9048489e4d99d0470 Mon Sep 17 00:00:00 2001 From: Jörn Zaefferer Date: Fri, 16 Nov 2012 19:26:22 +0100 Subject: Dialog: Pass through icons and showText (as 'text') options to button. Fixes #6830 - Allow Icons to be specified for Dialog buttons. --- tests/unit/dialog/dialog_options.js | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) (limited to 'tests/unit/dialog') diff --git a/tests/unit/dialog/dialog_options.js b/tests/unit/dialog/dialog_options.js index 0be8c2b7f..beb60a642 100644 --- a/tests/unit/dialog/dialog_options.js +++ b/tests/unit/dialog/dialog_options.js @@ -81,7 +81,7 @@ test("buttons", function() { }); test("buttons - advanced", function() { - expect(5); + expect( 7 ); var buttons, el = $("
").dialog({ @@ -92,7 +92,11 @@ test("buttons - advanced", function() { id: "my-button-id", click: function() { equal(this, el[0], "correct context"); - } + }, + icons: { + primary: "ui-icon-cancel" + }, + showText: false } ] }); @@ -102,6 +106,8 @@ test("buttons - advanced", function() { equal(buttons.attr("id"), "my-button-id", "correct id"); equal(buttons.text(), "a button", "correct label"); ok(buttons.hasClass("additional-class"), "additional classes added"); + deepEqual( buttons.button("option", "icons"), { primary: "ui-icon-cancel", secondary: null } ); + equal( buttons.button( "option", "text" ), false ); buttons.click(); el.remove(); -- cgit v1.2.3