From 7a342871f7a1244246b71e28358476d63d25b1fc Mon Sep 17 00:00:00 2001 From: JamesKhoury Date: Mon, 5 Sep 2011 15:30:17 +1000 Subject: [PATCH 1/2] Dialog: modified the dialog._size()to use outerHeight in calculating the nonContentHeight. Fixed #7692 - dialog: dialog height bug is incorrect when .ui-dialog padding set --- ui/jquery.ui.dialog.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ui/jquery.ui.dialog.js b/ui/jquery.ui.dialog.js index 065d640fb31..6393278378c 100644 --- a/ui/jquery.ui.dialog.js +++ b/ui/jquery.ui.dialog.js @@ -626,7 +626,7 @@ $.widget("ui.dialog", { height: "auto", width: options.width }) - .height(); + .outerHeight(); minContentHeight = Math.max( 0, options.minHeight - nonContentHeight ); if ( options.height === "auto" ) { From 8f3df6402c26a75fd9716325d803e2959a2070d6 Mon Sep 17 00:00:00 2001 From: James Khoury Date: Tue, 6 Sep 2011 12:50:14 +1000 Subject: [PATCH 2/2] "Button: modified the _create function to add a click event to any image elements inside the button. Fixed #5979 - Radio Button with image inside doesn't work when image is clicked. --- ui/jquery.ui.button.js | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/ui/jquery.ui.button.js b/ui/jquery.ui.button.js index 89c52d007ee..6e2af595802 100644 --- a/ui/jquery.ui.button.js +++ b/ui/jquery.ui.button.js @@ -204,6 +204,10 @@ $.widget( "ui.button", { } }); } + + this.buttonElement.find("img").click(function() { + self.buttonElement.click(); + }); } // TODO: pull out $.Widget's handling for the disabled option into