diff options
author | Jörn Zaefferer <joern.zaefferer@gmail.com> | 2010-03-05 17:47:06 +0000 |
---|---|---|
committer | Jörn Zaefferer <joern.zaefferer@gmail.com> | 2010-03-05 17:47:06 +0000 |
commit | eaeb580d829ee54f609b17abb0974a5f688a6855 (patch) | |
tree | 5528e0fefa6ab4c8560cd8d6a2d862275512081d /ui/jquery.ui.dialog.js | |
parent | bf7f1352fd90be953277fcb194bbbaf666f728a9 (diff) | |
download | jquery-ui-eaeb580d829ee54f609b17abb0974a5f688a6855.tar.gz jquery-ui-eaeb580d829ee54f609b17abb0974a5f688a6855.zip |
Pass through resizable and draggable ui objects in dialog - partial fix for #5291
Diffstat (limited to 'ui/jquery.ui.dialog.js')
-rw-r--r-- | ui/jquery.ui.dialog.js | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/ui/jquery.ui.dialog.js b/ui/jquery.ui.dialog.js index 12db06ded..216f1e68c 100644 --- a/ui/jquery.ui.dialog.js +++ b/ui/jquery.ui.dialog.js @@ -331,19 +331,19 @@ $.widget("ui.dialog", { cancel: '.ui-dialog-content, .ui-dialog-titlebar-close', handle: '.ui-dialog-titlebar', containment: 'document', - start: function(event) { + start: function(event, ui) { heightBeforeDrag = options.height === "auto" ? "auto" : $(this).height(); $(this).height($(this).height()).addClass("ui-dialog-dragging"); - self._trigger('dragStart', event); + self._trigger('dragStart', event, ui); }, - drag: function(event) { - self._trigger('drag', event); + drag: function(event, ui) { + self._trigger('drag', event, ui); }, stop: function(event, ui) { options.position = [ui.position.left - doc.scrollLeft(), ui.position.top - doc.scrollTop()]; $(this).removeClass("ui-dialog-dragging").height(heightBeforeDrag); - self._trigger('dragStop', event); + self._trigger('dragStop', event, ui); $.ui.dialog.overlay.resize(); } }); @@ -369,18 +369,18 @@ $.widget("ui.dialog", { minWidth: options.minWidth, minHeight: self._minHeight(), handles: resizeHandles, - start: function(event) { + start: function(event, ui) { $(this).addClass("ui-dialog-resizing"); - self._trigger('resizeStart', event); + self._trigger('resizeStart', event, ui); }, - resize: function(event) { - self._trigger('resize', event); + resize: function(event, ui) { + self._trigger('resize', event, ui); }, - stop: function(event) { + stop: function(event, ui) { $(this).removeClass("ui-dialog-resizing"); options.height = $(this).height(); options.width = $(this).width(); - self._trigger('resizeStop', event); + self._trigger('resizeStop', event, ui); $.ui.dialog.overlay.resize(); } }) |