Permalink
Browse files

Resizable: Fix size/position changes in resize event

Fixes #10351
Closes gh-1292
  • Loading branch information...
1 parent 9bb51d3 commit 5beae72e7773d35d46195a4359cb8f845dfb0f4f @scottgonzalez scottgonzalez committed Jul 24, 2014
Showing with 58 additions and 23 deletions.
  1. +21 −0 tests/unit/resizable/resizable_events.js
  2. +37 −23 ui/resizable.js
@@ -146,6 +146,27 @@ test("resize (grid)", function() {
});
+test( "resize, custom adjustment", function() {
+ expect( 4 );
+
+ var handle = ".ui-resizable-se",
+ element = $( "#resizable1" ).resizable({
+ resize: function( event, ui ) {
+ ui.size.width = 100;
+ ui.size.height = 200;
+ ui.position.left = 300;
+ ui.position.top = 400;
+ }
+ });
+
+ TestHelpers.resizable.drag( handle, 50, 50 );
+
+ equal( element.width(), 100, "resize event can control width" );
+ equal( element.height(), 200, "resize event can control height" );
+ equal( element.position().left, 300, "resize event can control left" );
+ equal( element.position().top, 400, "resize event can control top" );
+});
+
test("stop", function() {
expect(5);
View
@@ -321,22 +321,14 @@ $.widget("ui.resizable", $.ui.mouse, {
_mouseDrag: function(event) {
- var data,
- el = this.helper, props = {},
+ var data, props,
smp = this.originalMousePosition,
a = this.axis,
dx = (event.pageX-smp.left)||0,
dy = (event.pageY-smp.top)||0,
trigger = this._change[a];
- this.prevPosition = {
- top: this.position.top,
- left: this.position.left
- };
- this.prevSize = {
- width: this.size.width,
- height: this.size.height
- };
+ this._updatePrevProperties();
if (!trigger) {
return false;
@@ -355,26 +347,16 @@ $.widget("ui.resizable", $.ui.mouse, {
this._propagate("resize", event);
- if ( this.position.top !== this.prevPosition.top ) {
- props.top = this.position.top + "px";
- }
- if ( this.position.left !== this.prevPosition.left ) {
- props.left = this.position.left + "px";
- }
- if ( this.size.width !== this.prevSize.width ) {
- props.width = this.size.width + "px";
- }
- if ( this.size.height !== this.prevSize.height ) {
- props.height = this.size.height + "px";
- }
- el.css( props );
+ props = this._applyChanges();
if ( !this._helper && this._proportionallyResizeElements.length ) {
this._proportionallyResize();
}
if ( !$.isEmptyObject( props ) ) {
+ this._updatePrevProperties();
this._trigger( "resize", event, this.ui() );
+ this._applyChanges();
}
return false;
@@ -423,6 +405,38 @@ $.widget("ui.resizable", $.ui.mouse, {
},
+ _updatePrevProperties: function() {
+ this.prevPosition = {
+ top: this.position.top,
+ left: this.position.left
+ };
+ this.prevSize = {
+ width: this.size.width,
+ height: this.size.height
+ };
+ },
+
+ _applyChanges: function() {
+ var props = {};
+
+ if ( this.position.top !== this.prevPosition.top ) {
+ props.top = this.position.top + "px";
+ }
+ if ( this.position.left !== this.prevPosition.left ) {
+ props.left = this.position.left + "px";
+ }
+ if ( this.size.width !== this.prevSize.width ) {
+ props.width = this.size.width + "px";
+ }
+ if ( this.size.height !== this.prevSize.height ) {
+ props.height = this.size.height + "px";
+ }
+
+ this.helper.css( props );
+
+ return props;
+ },
+
_updateVirtualBoundaries: function(forceAspectRatio) {
var pMinWidth, pMaxWidth, pMinHeight, pMaxHeight, b,
o = this.options;

0 comments on commit 5beae72

Please sign in to comment.