github/jquery-ui
1
1
Fork 0
mirror of https://github.com/jquery/jquery-ui.git synced 2026-01-22 19:28:00 -05:00
Code Issues Packages Projects Releases Wiki Activity

Resizable:

Browse Source 
- Fixed destroy method.
  - Removed preventDefault option (Fixed #4135 - preventDefault should not be an option as there's not use case for false).
This commit is contained in:
Scott González
2009-02-13 03:36:56 +00:00
parent 2916159a08
commit a5d5c4f60a
4 changed files with 10 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
tests/unit/resizable/resizable_defaults.js
View File

@@ -22,7 +22,6 @@ var resizable_defaults = {
maxWidth: null,
minHeight: 10,
minWidth: 10,
preventDefault: true,
zIndex: 1000
};

23
tests/visual/resizable/resizable_option_preventDefault_false.html
View File

@@ -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>

23
tests/visual/resizable/resizable_option_preventDefault_true.html
View File

@@ -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>

18
ui/ui.resizable.js
View File

@@ -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
}
});