Skip to content

Commit a5d5c4f

Browse files
committed
Resizable:
- Fixed destroy method. - Removed preventDefault option (Fixed #4135 - preventDefault should not be an option as there's not use case for false).
1 parent 2916159 commit a5d5c4f

File tree

4 files changed

+10
-55
lines changed

4 files changed

+10
-55
lines changed

tests/unit/resizable/resizable_defaults.js

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@ var resizable_defaults = {
2222
maxWidth: null,
2323
minHeight: 10,
2424
minWidth: 10,
25-
preventDefault: true,
2625
zIndex: 1000
2726
};
2827

tests/visual/resizable/resizable_option_preventDefault_false.html

Lines changed: 0 additions & 23 deletions
This file was deleted.

tests/visual/resizable/resizable_option_preventDefault_true.html

Lines changed: 0 additions & 23 deletions
This file was deleted.

ui/ui.resizable.js

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,8 @@ $.widget("ui.resizable", $.extend({}, $.ui.mouse, {
5757
this.originalElement.css({ marginLeft: 0, marginTop: 0, marginRight: 0, marginBottom: 0});
5858

5959
//Prevent Safari textarea resize
60-
if ($.browser.safari && o.preventDefault) this.originalElement.css('resize', 'none');
60+
this.originalResizeStyle = this.originalElement.css('resize');
61+
this.originalElement.css('resize', 'none');
6162

6263
//Push the actual element to our proportionallyResize internal array
6364
this._proportionallyResizeElements.push(this.originalElement.css({ position: 'static', zoom: 1, display: 'block' }));
@@ -183,17 +184,19 @@ $.widget("ui.resizable", $.extend({}, $.ui.mouse, {
183184
//TODO: Unwrap at same DOM position
184185
if (this.elementIsWrapper) {
185186
_destroy(this.element);
186-
this.wrapper.parent().append(
187+
var wrapper = this.element;
188+
wrapper.parent().append(
187189
this.originalElement.css({
188-
position: this.wrapper.css('position'),
189-
width: this.wrapper.outerWidth(),
190-
height: this.wrapper.outerHeight(),
191-
top: this.wrapper.css('top'),
192-
left: this.wrapper.css('left')
190+
position: wrapper.css('position'),
191+
width: wrapper.outerWidth(),
192+
height: wrapper.outerHeight(),
193+
top: wrapper.css('top'),
194+
left: wrapper.css('left')
193195
})
194196
).end().remove();
195197
}
196198

199+
this.originalElement.css('resize', this.originalResizeStyle);
197200
_destroy(this.originalElement);
198201

199202
},
@@ -514,7 +517,6 @@ $.extend($.ui.resizable, {
514517
maxWidth: null,
515518
minHeight: 10,
516519
minWidth: 10,
517-
preventDefault: true,
518520
zIndex: 1000
519521
}
520522
});

0 commit comments

Comments
 (0)