aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMike Sherov <mike.sherov@gmail.com>2012-11-17 01:29:39 -0500
committerMike Sherov <mike.sherov@gmail.com>2012-11-17 01:29:39 -0500
commita1b32b59d57c2171af9ba0ed6b35ccde28794e3b (patch)
tree757d4f5a68e5bbe28966c205c28fbbbe95f9cd62
parent9eaa572de189434521cf5cb307e37c2e65fb1f9f (diff)
downloadjquery-ui-a1b32b59d57c2171af9ba0ed6b35ccde28794e3b.tar.gz
jquery-ui-a1b32b59d57c2171af9ba0ed6b35ccde28794e3b.zip
Resizable: use css() instead of position() for absolute placement. Fixes #3815 - Resizable: absolutely positioned element inside scrollable element is repositioned when resized
-rw-r--r--tests/unit/resizable/resizable_core.js23
-rw-r--r--ui/jquery.ui.resizable.js5
2 files changed, 25 insertions, 3 deletions
diff --git a/tests/unit/resizable/resizable_core.js b/tests/unit/resizable/resizable_core.js
index 447499f05..13da26ece 100644
--- a/tests/unit/resizable/resizable_core.js
+++ b/tests/unit/resizable/resizable_core.js
@@ -162,7 +162,7 @@ test("handle with complex markup (#8756)", function() {
);
var handle = '.ui-resizable-w div', target = $('#resizable1').resizable({ handles: 'all' });
-
+
TestHelpers.resizable.drag(handle, -50);
equal( target.width(), 150, "compare width" );
@@ -170,4 +170,25 @@ test("handle with complex markup (#8756)", function() {
equal( target.width(), 100, "compare width" );
});
+test("resizable accounts for scroll position correctly (#3815)", function() {
+ expect( 3 );
+
+ var position, top, left,
+ container = $("<div style='overflow:scroll;height:300px;width:300px;position:relative;'></div>").appendTo("#qunit-fixture"),
+ overflowed = $("<div style='width: 1000px; height: 1000px;'></div>").appendTo( container ),
+ el = $("<div style='height:100px;width:100px;position:absolute;top:10px;left:10px;'></div>").appendTo( overflowed ).resizable({ handles: 'all' }),
+ handle = ".ui-resizable-e";
+
+ container.scrollLeft( 100 ).scrollTop( 100 );
+
+ position = el.position();
+ left = el.css("left");
+ top = el.css("top");
+
+ TestHelpers.resizable.drag(handle, 50, 50);
+ deepEqual( el.position(), position, "position stays the same when resized" );
+ equal( el.css("left"), left, "css('left') stays the same when resized" );
+ equal( el.css("top"), top, "css('top') stays the same when resized" );
+});
+
})(jQuery);
diff --git a/ui/jquery.ui.resizable.js b/ui/jquery.ui.resizable.js
index 50cc19e47..41f3c03c0 100644
--- a/ui/jquery.ui.resizable.js
+++ b/ui/jquery.ui.resizable.js
@@ -266,10 +266,11 @@ $.widget("ui.resizable", $.ui.mouse, {
el = this.element;
this.resizing = true;
- this.documentScroll = { top: $(document).scrollTop(), left: $(document).scrollLeft() };
// bugfix for http://dev.jquery.com/ticket/1749
- if (el.is('.ui-draggable') || (/absolute/).test(el.css('position'))) {
+ if ( (/absolute/).test( el.css('position') ) ) {
+ el.css({ position: 'absolute', top: el.css('top'), left: el.css('left') });
+ } else if (el.is('.ui-draggable')) {
el.css({ position: 'absolute', top: iniPos.top, left: iniPos.left });
}