Skip to content
Permalink
Browse files

Draggable: Fix border containment. Fixed #5569 - Draggable: Containme…

…nt incorrectly calculates padding and border
  • Loading branch information...
tjvantoll committed Jan 26, 2013
1 parent 5b2da7c commit 6358695df18722d8c7e99437365db42cf4957626
Showing with 33 additions and 2 deletions.
  1. +31 −0 tests/unit/draggable/draggable_options.js
  2. +2 −2 ui/jquery.ui.draggable.js
@@ -346,6 +346,37 @@ test( "{ containment: 'parent' }, absolute", function() {
deepEqual( offsetAfter, expected, "compare offset to parent" );
});

test( "containment, account for border", function() {
expect( 2 );

var el = $("#draggable1").appendTo("#main"),
parent = el.parent().css({
height: "100px",
width: "100px",
borderStyle: "solid",
borderWidth: "5px 10px 15px 20px"
}),
parentBottom = parent.offset().top + parent.outerHeight(),
parentRight = parent.offset().left + parent.outerWidth(),
parentBorderBottom = TestHelpers.draggable.border( parent, "bottom" ),
parentBorderRight = TestHelpers.draggable.border( parent, "right" );

el.css({
height: "5px",
width: "5px"
}).draggable({ containment: "parent" });

el.simulate( "drag", {
dx: 100,
dy: 100
});

equal( el.offset().top, parentBottom - parentBorderBottom - el.height(),
"The draggable should be on top of its parent's bottom border" );
equal( el.offset().left, parentRight - parentBorderRight - el.width(),
"The draggable should be to the right of its parent's right border" );
});

test( "containment, default, switching after initialization", function() {
expect( 2 );

@@ -421,8 +421,8 @@ $.widget("ui.draggable", $.ui.mouse, {
this.containment = [
(parseInt($(ce).css("borderLeftWidth"),10) || 0) + (parseInt($(ce).css("paddingLeft"),10) || 0),
(parseInt($(ce).css("borderTopWidth"),10) || 0) + (parseInt($(ce).css("paddingTop"),10) || 0),
(over ? Math.max(ce.scrollWidth,ce.offsetWidth) : ce.offsetWidth) - (parseInt($(ce).css("borderLeftWidth"),10) || 0) - (parseInt($(ce).css("paddingRight"),10) || 0) - this.helperProportions.width - this.margins.left - this.margins.right,
(over ? Math.max(ce.scrollHeight,ce.offsetHeight) : ce.offsetHeight) - (parseInt($(ce).css("borderTopWidth"),10) || 0) - (parseInt($(ce).css("paddingBottom"),10) || 0) - this.helperProportions.height - this.margins.top - this.margins.bottom
(over ? Math.max(ce.scrollWidth,ce.offsetWidth) : ce.offsetWidth) - (parseInt($(ce).css("borderRightWidth"),10) || 0) - (parseInt($(ce).css("paddingRight"),10) || 0) - this.helperProportions.width - this.margins.left - this.margins.right,
(over ? Math.max(ce.scrollHeight,ce.offsetHeight) : ce.offsetHeight) - (parseInt($(ce).css("borderBottomWidth"),10) || 0) - (parseInt($(ce).css("paddingBottom"),10) || 0) - this.helperProportions.height - this.margins.top - this.margins.bottom
];
this.relative_container = c;

0 comments on commit 6358695

Please sign in to comment.
You can’t perform that action at this time.