Resizable Visual Test : Resizable option preventDefault false

From a5d5c4f60aff33da4f4aeb030cb0faca4b2aaf94 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Scott=20Gonz=C3=A1lez?= Date: Fri, 13 Feb 2009 03:36:56 +0000 Subject: [PATCH] Resizable: - Fixed destroy method. - Removed preventDefault option (Fixed #4135 - preventDefault should not be an option as there's not use case for false). --- tests/unit/resizable/resizable_defaults.js | 1 - ...resizable_option_preventDefault_false.html | 23 ------------------- .../resizable_option_preventDefault_true.html | 23 ------------------- ui/ui.resizable.js | 18 ++++++++------- 4 files changed, 10 insertions(+), 55 deletions(-) delete mode 100644 tests/visual/resizable/resizable_option_preventDefault_false.html delete mode 100644 tests/visual/resizable/resizable_option_preventDefault_true.html diff --git a/tests/unit/resizable/resizable_defaults.js b/tests/unit/resizable/resizable_defaults.js index 52513924d..f69e5217c 100644 --- a/tests/unit/resizable/resizable_defaults.js +++ b/tests/unit/resizable/resizable_defaults.js @@ -22,7 +22,6 @@ var resizable_defaults = { maxWidth: null, minHeight: 10, minWidth: 10, - preventDefault: true, zIndex: 1000 }; diff --git a/tests/visual/resizable/resizable_option_preventDefault_false.html b/tests/visual/resizable/resizable_option_preventDefault_false.html deleted file mode 100644 index 5d22f6b38..000000000 --- a/tests/visual/resizable/resizable_option_preventDefault_false.html +++ /dev/null @@ -1,23 +0,0 @@ - - - - Resizable Visual Test : Resizable option preventDefault false - - - - - - - - - -

Resizable</texarea>
-
-</body>
-</html>
diff --git a/tests/visual/resizable/resizable_option_preventDefault_true.html b/tests/visual/resizable/resizable_option_preventDefault_true.html
deleted file mode 100644
index 0d153b6e9..000000000
--- a/tests/visual/resizable/resizable_option_preventDefault_true.html
+++ /dev/null
@@ -1,23 +0,0 @@
-<!doctype html>
-<html lang="en">
-<head>
-	<title>Resizable Visual Test : Resizable option preventDefault true</title>
-	<link rel="stylesheet" href="../visual.css" type="text/css" />
-	<link rel="stylesheet" href="../../../themes/base/ui.all.css" type="text/css" />
-	<script type="text/javascript" src="../../../jquery-1.3.1.js"></script>
-	<script type="text/javascript" src="../../../ui/ui.core.js"></script>
-	<script type="text/javascript" src="../../../ui/ui.resizable.js"></script>
-	<script type="text/javascript">
-	$(function() {
-		$("#resizable").resizable({
-			preventDefault: true
-		});
-	});
-	</script>
-</head>
-<body>
-
-<textarea id="resizable">Resizable</texarea>
-
-</body>
-</html>
diff --git a/ui/ui.resizable.js b/ui/ui.resizable.js
index a0503c456..bea9b4de1 100644
--- a/ui/ui.resizable.js
+++ b/ui/ui.resizable.js
@@ -57,7 +57,8 @@ $.widget("ui.resizable", $.extend({}, $.ui.mouse, {
 			this.originalElement.css({ marginLeft: 0, marginTop: 0, marginRight: 0, marginBottom: 0});
 
 			//Prevent Safari textarea resize
-			if ($.browser.safari && o.preventDefault) this.originalElement.css('resize', 'none');
+			this.originalResizeStyle = this.originalElement.css('resize');
+			this.originalElement.css('resize', 'none');
 
 			//Push the actual element to our proportionallyResize internal array
 			this._proportionallyResizeElements.push(this.originalElement.css({ position: 'static', zoom: 1, display: 'block' }));
@@ -183,17 +184,19 @@ $.widget("ui.resizable", $.extend({}, $.ui.mouse, {
 		//TODO: Unwrap at same DOM position
 		if (this.elementIsWrapper) {
 			_destroy(this.element);
-			this.wrapper.parent().append(
+			var wrapper = this.element;
+			wrapper.parent().append(
 				this.originalElement.css({
-					position: this.wrapper.css('position'),
-					width: this.wrapper.outerWidth(),
-					height: this.wrapper.outerHeight(),
-					top: this.wrapper.css('top'),
-					left: this.wrapper.css('left')
+					position: wrapper.css('position'),
+					width: wrapper.outerWidth(),
+					height: wrapper.outerHeight(),
+					top: wrapper.css('top'),
+					left: wrapper.css('left')
 				})
 			).end().remove();
 		}
 
+		this.originalElement.css('resize', this.originalResizeStyle);
 		_destroy(this.originalElement);
 
 	},
@@ -514,7 +517,6 @@ $.extend($.ui.resizable, {
 		maxWidth: null,
 		minHeight: 10,
 		minWidth: 10,
-		preventDefault: true,
 		zIndex: 1000
 	}
 });
-- 
2.39.5