diff options
| author | Scott González <scott.gonzalez@gmail.com> | 2009-02-13 03:36:56 +0000 |
|---|---|---|
| committer | Scott González <scott.gonzalez@gmail.com> | 2009-02-13 03:36:56 +0000 |
| commit | a5d5c4f60aff33da4f4aeb030cb0faca4b2aaf94 (patch) | |
| tree | 2027665e6e01fbef165dff7a434cc8445e4e7726 | |
| parent | 2916159a088f20eb33602d69c97b79792dd5c037 (diff) | |
| download | jquery-ui-a5d5c4f60aff33da4f4aeb030cb0faca4b2aaf94.tar.gz jquery-ui-a5d5c4f60aff33da4f4aeb030cb0faca4b2aaf94.zip | |
Resizable:
- Fixed destroy method.
- Removed preventDefault option (Fixed #4135 - preventDefault should not be an option as there's not use case for false).
| -rw-r--r-- | tests/unit/resizable/resizable_defaults.js | 1 | ||||
| -rw-r--r-- | tests/visual/resizable/resizable_option_preventDefault_false.html | 23 | ||||
| -rw-r--r-- | tests/visual/resizable/resizable_option_preventDefault_true.html | 23 | ||||
| -rw-r--r-- | ui/ui.resizable.js | 18 |
4 files changed, 10 insertions, 55 deletions
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 @@ -<!doctype html> -<html lang="en"> -<head> - <title>Resizable Visual Test : Resizable option preventDefault false</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: false - }); - }); - </script> -</head> -<body> - -<textarea id="resizable">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 } }); |