Dialog: Don't call draggable.destroy if we're not currently draggable…

…. Fixes #6069 - DIALOG windows 1.8.5 draggapble problem.
jquery · Sep 20, 2010 · 98a98a0 · 98a98a0
1 parent 82b1595
commit 98a98a0
Showing 1 changed file with 7 additions and 4 deletions.
diff --git a/ui/jquery.ui.dialog.js b/ui/jquery.ui.dialog.js
@@ -521,7 +521,8 @@ $.widget("ui.dialog", {
 	_setOption: function(key, value){
 		var self = this,
 			uiDialog = self.uiDialog,
-			isResizable = uiDialog.is(':data(resizable)'),
+			isDraggable = uiDialog.is( ":data(draggable)" ),
+			isResizable = uiDialog.is( ":data(resizable)" ),
 			resize = false;
 
 		switch (key) {
@@ -552,10 +553,12 @@ $.widget("ui.dialog", {
 				}
 				break;
 			case "draggable":
-				if (value) {
+				if ( isDraggable && !value ) {
+					uiDialog.draggable( "destroy" );
+				}
+
+				if ( !isDraggable && value ) {
 					self._makeDraggable();
-				} else {
-					uiDialog.draggable('destroy');
 				}
 				break;
 			case "height":