From: Scott González Date: Fri, 10 Dec 2010 18:42:29 +0000 (-0500) Subject: Revert "Dialog: Moved the default value for the position.of option inside the _positi... X-Git-Tag: 1.9m4~112 X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=0e15f573d6f1d5c138ce63d2a462737dbb874faa;p=jquery-ui.git Revert "Dialog: Moved the default value for the position.of option inside the _position() method to avoid a bug in jQuery 1.3.2. Fixes #6030 - ui.dialog with jQuery 1.3.2 causes RangeError." This reverts commit 22671ad4f8e3e2e921c27bd2933fa088950abf2f. --- diff --git a/tests/unit/dialog/dialog_defaults.js b/tests/unit/dialog/dialog_defaults.js index 7c94d3336..612fd58c8 100644 --- a/tests/unit/dialog/dialog_defaults.js +++ b/tests/unit/dialog/dialog_defaults.js @@ -20,6 +20,7 @@ var dialog_defaults = { position: { my: 'center', at: 'center', + of: window, collision: 'fit', using: $.ui.dialog.prototype.options.position.using }, diff --git a/ui/jquery.ui.dialog.js b/ui/jquery.ui.dialog.js index c53169b5b..81df1d19b 100644 --- a/ui/jquery.ui.dialog.js +++ b/ui/jquery.ui.dialog.js @@ -57,6 +57,7 @@ $.widget("ui.dialog", { position: { my: 'center', at: 'center', + of: window, collision: 'fit', // ensure that the titlebar is never outside the document using: function(pos) { @@ -527,7 +528,7 @@ $.widget("ui.dialog", { this.uiDialog // workaround for jQuery bug #5781 http://dev.jquery.com/ticket/5781 .css({ top: 0, left: 0 }) - .position($.extend({ of: window }, position)); + .position(position); if (!isVisible) { this.uiDialog.hide(); }