Resizable: Only resize/reposition if size is greater than specified grid

Fixes #9611 Closes gh-1132 (cherry picked from commit 20c1648)
jquery · Jan 15, 2014 · 20b44cc · 20b44cc
1 parent b6f8ad6
commit 20b44cc
Show file tree

Hide file tree

Showing 2 changed files with 37 additions and 4 deletions.
diff --git a/tests/unit/resizable/resizable_options.js b/tests/unit/resizable/resizable_options.js
@@ -180,6 +180,29 @@ test("grid (wrapped)", function() {
 	equal( target.height(), 120, "compare height");
 });
 
+test( "grid - Resizable: can be moved when grid option is set (#9611)", function() {
+	expect( 6 );
+
+	var oldPosition,
+		handle = ".ui-resizable-nw",
+		target = $( "#resizable1" ).resizable({
+			handles: "all",
+			grid: 50
+		});
+
+	TestHelpers.resizable.drag( handle, 50, 50 );
+	equal( target.width(), 50, "compare width" );
+	equal( target.height(), 50, "compare height" );
+
+	oldPosition = target.position();
+
+	TestHelpers.resizable.drag( handle, 50, 50 );
+	equal( target.width(), 50, "compare width" );
+	equal( target.height(), 50, "compare height" );
+	equal( target.position().top, oldPosition.top, "compare top" );
+	equal( target.position().left, oldPosition.left, "compare left" );
+});
+
 test("ui-resizable-se { handles: 'all', minWidth: 60, minHeight: 60, maxWidth: 100, maxHeight: 100 }", function() {
 	expect(4);
 

diff --git a/ui/jquery.ui.resizable.js b/ui/jquery.ui.resizable.js
@@ -956,10 +956,20 @@ $.ui.plugin.add("resizable", "grid", {
 			that.size.height = newHeight;
 			that.position.left = op.left - ox;
 		} else {
-			that.size.width = newWidth;
-			that.size.height = newHeight;
-			that.position.top = op.top - oy;
-			that.position.left = op.left - ox;
+			if ( newHeight - gridY > 0 ) {
+				that.size.height = newHeight;
+				that.position.top = op.top - oy;
+			} else {
+				that.size.height = gridY;
+				that.position.top = op.top + os.height - gridY;
+			}
+			if ( newWidth - gridX > 0 ) {
+				that.size.width = newWidth;
+				that.position.left = op.left - ox;
+			} else {
+				that.size.width = gridX;
+				that.position.left = op.left + os.width - gridX;
+			}
 		}
 	}