Datepicker: No longer dependent on dialog in order to close datepicker when dialog...

diff --git a/ui/jquery.ui.datepicker.js b/ui/jquery.ui.datepicker.js
index 38de5bc9d94632dad47f7451ebe36b822a7211e0..c0d8533b15451775d1cf3ce9eaa285218cfdca11 100644 (file)
--- a/ui/jquery.ui.datepicker.js
+++ b/ui/jquery.ui.datepicker.js
@@ -652,10 +652,6 @@ $.extend(Datepicker.prototype, {
                        if (inst.input.is(':visible') && !inst.input.is(':disabled'))
                                inst.input[0].focus();
                        $.datepicker._curInst = inst;
-                       
-                       // find the dialog wrapping the input, if any, and bind to close event
-                       inst._dialog = $(input).closest('.ui-dialog-content')
-                                                               .bind('dialogclose.datepicker', function() { $.datepicker._hideDatepicker(input); });
                }
        },
 
@@ -780,9 +776,6 @@ $.extend(Datepicker.prototype, {
                                }
                        }
                        this._inDialog = false;
-                       
-                       if (inst._dialog)
-                               inst._dialog.unbind('dialogclose.datepicker');
                }
        },
 

diff --git a/ui/jquery.ui.dialog.js b/ui/jquery.ui.dialog.js
index 7d4b3c8cdfa6e961f3e10ac9a7ac98748371157e..752f3ac2f7ba378eb5b275c0999648c1539d25f3 100644 (file)
--- a/ui/jquery.ui.dialog.js
+++ b/ui/jquery.ui.dialog.js
@@ -114,9 +114,6 @@ $.widget("ui.dialog", {
                                .blur(function() {
                                        uiDialogTitlebarClose.removeClass('ui-state-focus');
                                })
-                               .mousedown(function(ev) {
-                                       ev.stopPropagation();
-                               })
                                .click(function(event) {
                                        self.close(event);
                                        return false;
@@ -327,7 +324,7 @@ $.widget("ui.dialog", {
                        heightBeforeDrag;
 
                self.uiDialog.draggable({
-                       cancel: '.ui-dialog-content',
+                       cancel: '.ui-dialog-content, .ui-dialog-titlebar-close',
                        handle: '.ui-dialog-titlebar',
                        containment: 'document',
                        start: function(event) {