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

…gables.
jquery · Sep 14, 2008 · 608cab6 · 608cab6
1 parent 8bd855a
commit 608cab6
Showing 1 changed file with 26 additions and 21 deletions.
diff --git a/ui/ui.dialog.js b/ui/ui.dialog.js
@@ -111,26 +111,7 @@ $.widget("ui.dialog", {
 			$.ui.disableSelection(this);
 		});
 
-		if ($.fn.draggable) {
+		(options.draggable && $.fn.draggable && this._makeDraggable());
-			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.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);