Dialog: Use proper position data after drag and resize. Fixes #9351 - Dialog: Incorre...

diff --git a/ui/jquery.ui.dialog.js b/ui/jquery.ui.dialog.js
index 16095292cf101bebcfe32ac3e3c301843938180c..b9475750552d96d8c2c5d2758320ec2acd529834 100644 (file)
--- a/ui/jquery.ui.dialog.js
+++ b/ui/jquery.ui.dialog.js
@@ -454,10 +454,15 @@ $.widget( "ui.dialog", {
                                that._trigger( "drag", event, filteredUi( ui ) );
                        },
                        stop: function( event, ui ) {
-                               options.position = [
-                                       ui.position.left - that.document.scrollLeft(),
-                                       ui.position.top - that.document.scrollTop()
-                               ];
+                               var left = ui.offset.left - that.document.scrollLeft(),
+                                       top = ui.offset.top - that.document.scrollTop();
+
+                               options.position = {
+                                       my: "left top",
+                                       at: "left" + (left >= 0 ? "+" : "") + left + " " +
+                                               "top" + (top >= 0 ? "+" : "") + top,
+                                       of: that.window
+                               };
                                $( this ).removeClass("ui-dialog-dragging");
                                that._unblockFrames();
                                that._trigger( "dragStop", event, filteredUi( ui ) );
@@ -503,8 +508,18 @@ $.widget( "ui.dialog", {
                                that._trigger( "resize", event, filteredUi( ui ) );
                        },
                        stop: function( event, ui ) {
-                               options.height = $( this ).height();
-                               options.width = $( this ).width();
+                               var offset = that.uiDialog.offset(),
+                                       left = offset.left - that.document.scrollLeft(),
+                                       top = offset.top - that.document.scrollTop();
+
+                               options.height = that.uiDialog.height();
+                               options.width = that.uiDialog.width();
+                               options.position = {
+                                       my: "left top",
+                                       at: "left" + (left >= 0 ? "+" : "") + left + " " +
+                                               "top" + (top >= 0 ? "+" : "") + top,
+                                       of: that.window
+                               };
                                $( this ).removeClass("ui-dialog-resizing");
                                that._unblockFrames();
                                that._trigger( "resizeStop", event, filteredUi( ui ) );