aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMike Sherov <mike.sherov@gmail.com>2015-01-27 22:08:05 -0500
committerMike Sherov <mike.sherov@gmail.com>2015-01-27 22:08:05 -0500
commit9493839f23b6ff71aacb9cb8fe8fde6c8d0ecd61 (patch)
treefb5792653713809de74c514db9bab4fe64071b31
parent337e4110b0cb60c73bb27be2e2b855a75a0c4b2e (diff)
downloadjquery-ui-9493839f23b6ff71aacb9cb8fe8fde6c8d0ecd61.tar.gz
jquery-ui-9493839f23b6ff71aacb9cb8fe8fde6c8d0ecd61.zip
Resizable: correct width when grid approaches zero
Fixes #10590
-rw-r--r--tests/unit/resizable/resizable_options.js4
-rw-r--r--ui/resizable.js2
2 files changed, 3 insertions, 3 deletions
diff --git a/tests/unit/resizable/resizable_options.js b/tests/unit/resizable/resizable_options.js
index c2d031fe7..cacebf05c 100644
--- a/tests/unit/resizable/resizable_options.js
+++ b/tests/unit/resizable/resizable_options.js
@@ -310,12 +310,12 @@ test( "grid - maintains grid with padding and border when approaching no dimensi
height: 80
}).resizable({
handles: "all",
- grid: 50
+ grid: [ 50, 12 ]
});
TestHelpers.resizable.drag( handle, 50, 50 );
equal( target.outerWidth(), 50, "compare width" );
- equal( target.outerHeight(), 50, "compare height" );
+ equal( target.outerHeight(), 52, "compare height" );
});
test("ui-resizable-se { handles: 'all', minWidth: 60, minHeight: 60, maxWidth: 100, maxHeight: 100 }", function() {
diff --git a/ui/resizable.js b/ui/resizable.js
index d1f7f50f6..c167508b3 100644
--- a/ui/resizable.js
+++ b/ui/resizable.js
@@ -1170,7 +1170,7 @@ $.ui.plugin.add("resizable", "grid", {
that.size.width = newWidth;
that.position.left = op.left - ox;
} else {
- newWidth = gridY - outerDimensions.height;
+ newWidth = gridX - outerDimensions.width;
that.size.width = newWidth;
that.position.left = op.left + os.width - newWidth;
}