aboutsummaryrefslogtreecommitdiffstats
path: root/ui
diff options
context:
space:
mode:
authorJay Merrifield <fracmak@gmail.com>2011-05-26 23:30:56 -0400
committerScott González <scott.gonzalez@gmail.com>2011-05-26 23:30:56 -0400
commite34dbfeef013313dead74e39bea8adaa848310d4 (patch)
tree92adfccfd9f0b52ff664d4cfdaf70484fabced0c /ui
parentc7eae7b264112919462cb1b8b7ce115d3b24265d (diff)
downloadjquery-ui-e34dbfeef013313dead74e39bea8adaa848310d4.tar.gz
jquery-ui-e34dbfeef013313dead74e39bea8adaa848310d4.zip
Dialog: Removed the height() tinkering which stops the dialog from shrinking. Fixes #5916 - Dialog: shrinks on drag in IE in standards mode, worse in quirksmode.
Diffstat (limited to 'ui')
-rw-r--r--ui/jquery.ui.dialog.js8
1 files changed, 2 insertions, 6 deletions
diff --git a/ui/jquery.ui.dialog.js b/ui/jquery.ui.dialog.js
index 8d5f4f56f..84b2dd3b3 100644
--- a/ui/jquery.ui.dialog.js
+++ b/ui/jquery.ui.dialog.js
@@ -373,8 +373,7 @@ $.widget("ui.dialog", {
_makeDraggable: function() {
var self = this,
options = self.options,
- doc = $( document ),
- heightBeforeDrag;
+ doc = $( document );
function filteredUi( ui ) {
return {
@@ -388,9 +387,7 @@ $.widget("ui.dialog", {
handle: ".ui-dialog-titlebar",
containment: "document",
start: function( event, ui ) {
- heightBeforeDrag = options.height === "auto" ? "auto" : $( this ).height();
$( this )
- .height( $( this ).height() )
.addClass( "ui-dialog-dragging" );
self._trigger( "dragStart", event, filteredUi( ui ) );
},
@@ -403,8 +400,7 @@ $.widget("ui.dialog", {
ui.position.top - doc.scrollTop()
];
$( this )
- .removeClass( "ui-dialog-dragging" )
- .height( heightBeforeDrag );
+ .removeClass( "ui-dialog-dragging" );
self._trigger( "dragStop", event, filteredUi( ui ) );
$.ui.dialog.overlay.resize();
}