Skip to content
Permalink
Browse files

Dialog: Fixed #3389: Non-draggable dialogs shouldn't instantiate drag…

…gables.
  • Loading branch information...
scottgonzalez committed Sep 14, 2008
1 parent 8bd855a commit 608cab6e3bc43475305cddd4bc50cba6e18069a8
Showing with 26 additions and 21 deletions.
  1. +26 −21 ui/ui.dialog.js
@@ -111,26 +111,7 @@ $.widget("ui.dialog", {
$.ui.disableSelection(this);
});

if ($.fn.draggable) {
uiDialog.draggable({
cancel: '.ui-dialog-content',
helper: options.dragHelper,
handle: '.ui-dialog-titlebar',
start: function() {
self._moveToTop();
(options.dragStart && options.dragStart.apply(self.element[0], arguments));
},
drag: function() {
(options.drag && options.drag.apply(self.element[0], arguments));
},
stop: function() {
(options.dragStop && options.dragStop.apply(self.element[0], arguments));
$.ui.dialog.overlay.resize();
}
});
(options.draggable || uiDialog.draggable('disable'));
}

(options.draggable && $.fn.draggable && this._makeDraggable());
(options.resizable && $.fn.resizable && this._makeResizable());

this._createButtons(options.buttons);
@@ -171,14 +152,38 @@ $.widget("ui.dialog", {
});
},

_makeDraggable: function() {
var self = this,
options = this.options;

this.uiDialog.draggable({
cancel: '.ui-dialog-content',
helper: options.dragHelper,
handle: '.ui-dialog-titlebar',
start: function() {
self._moveToTop();
(options.dragStart && options.dragStart.apply(self.element[0], arguments));
},
drag: function() {
(options.drag && options.drag.apply(self.element[0], arguments));
},
stop: function() {
(options.dragStop && options.dragStop.apply(self.element[0], arguments));
$.ui.dialog.overlay.resize();
}
});
},

_setData: function(key, value){
(setDataSwitch[key] && this.uiDialog.data(setDataSwitch[key], value));
switch (key) {
case "buttons":
this._createButtons(value);
break;
case "draggable":
this.uiDialog.draggable(value ? 'enable' : 'disable');
(value
? this._makeDraggable()
: this.uiDialog.draggable('destroy'));
break;
case "height":
this.uiDialog.height(value);

0 comments on commit 608cab6

Please sign in to comment.
You can’t perform that action at this time.