aboutsummaryrefslogtreecommitdiffstats
path: root/ui/jquery.ui.dialog.js
diff options
context:
space:
mode:
authorFelix Nagel <info@felixnagel.com>2012-10-12 22:56:45 +0200
committerFelix Nagel <info@felixnagel.com>2012-10-12 22:56:45 +0200
commitc59fbbaad74f7bee73b57985570f689c9a5d9383 (patch)
tree89209c996ac48c84a0ce20e77061eaef04f87d6c /ui/jquery.ui.dialog.js
parentfc729a8c8ebfbe9c05f8b1ebbd6629898f3fc6c0 (diff)
parent94221c4e5b11496ef927889e1541d84b5746fb31 (diff)
downloadjquery-ui-c59fbbaad74f7bee73b57985570f689c9a5d9383.tar.gz
jquery-ui-c59fbbaad74f7bee73b57985570f689c9a5d9383.zip
Merge branch 'master' into selectmenu
Diffstat (limited to 'ui/jquery.ui.dialog.js')
-rw-r--r--ui/jquery.ui.dialog.js6
1 files changed, 3 insertions, 3 deletions
diff --git a/ui/jquery.ui.dialog.js b/ui/jquery.ui.dialog.js
index 77424047c..8593fff85 100644
--- a/ui/jquery.ui.dialog.js
+++ b/ui/jquery.ui.dialog.js
@@ -364,7 +364,7 @@ $.widget("ui.dialog", {
props = $.isFunction( props ) ?
{ click: props, text: name } :
props;
- var button = $( "<button type='button'>" )
+ var button = $( "<button type='button'></button>" )
.attr( props, true )
.unbind( "click" )
.click(function() {
@@ -768,7 +768,7 @@ $.extend( $.ui.dialog.overlay, {
var scrollHeight,
offsetHeight;
// handle IE
- if ( $.browser.msie ) {
+ if ( $.ui.ie ) {
scrollHeight = Math.max(
document.documentElement.scrollHeight,
document.body.scrollHeight
@@ -793,7 +793,7 @@ $.extend( $.ui.dialog.overlay, {
var scrollWidth,
offsetWidth;
// handle IE
- if ( $.browser.msie ) {
+ if ( $.ui.ie ) {
scrollWidth = Math.max(
document.documentElement.scrollWidth,
document.body.scrollWidth