library-mirrors/jquery-ui
1
0
Fork 0
mirror of https://github.com/jquery/jquery-ui.git synced 2024-11-21 11:04:24 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Draggable: fix changing containment

Browse Source 
If containment was set such that relative_container is set by
_setContainment, and then containment changes to e.g. "document",
"window", or an array, relative_container would not be unset, causing
incorrect containment of the draggable.

Add a unittest to check that containment with an array works after
previously being set to "parent".

Fixes #9733
Closes gh-1176
This commit is contained in:
Ben Higgins 2014-01-13 14:51:06 -08:00 committed by TJ VanToll
parent 998d04d55d
commit 0bb807bb42
2 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
tests/unit/draggable/draggable_options.js
View File

@ -375,15 +375,20 @@ test( "containment, account for border", function() {
}); });
test( "containment, default, switching after initialization", function() { test( "containment, default, switching after initialization", function() {
expect( 6 ); expect( 8 );
var element = $( "#draggable1" ).draggable({ containment: false, scroll: false }); var element = $( "#draggable1" ).draggable({ containment: false, scroll: false }),
po = element.parent().offset(),
containment = [ po.left - 100, po.top - 100, po.left + 500, po.top + 500 ];
TestHelpers.draggable.testDrag( element, element, -100, -100, -100, -100, "containment: default" ); TestHelpers.draggable.testDrag( element, element, -100, -100, -100, -100, "containment: default" );
element.draggable( "option", "containment", "parent" ).css({ top: 0, left: 0 }); element.draggable( "option", "containment", "parent" ).css({ top: 0, left: 0 });
TestHelpers.draggable.testDrag( element, element, -100, -100, 0, 0, "containment: parent as option" ); TestHelpers.draggable.testDrag( element, element, -100, -100, 0, 0, "containment: parent as option" );
element.draggable( "option", "containment", containment ).css({ top: 0, left: 0 });
TestHelpers.draggable.testDrag( element, element, -100, -100, -100, -100, "containment: array as option" );
element.draggable( "option", "containment", false ); element.draggable( "option", "containment", false );
TestHelpers.draggable.testDrag( element, element, -100, -100, -100, -100, "containment: false as option" ); TestHelpers.draggable.testDrag( element, element, -100, -100, -100, -100, "containment: false as option" );
}); });

2
ui/jquery.ui.draggable.js vendored
View File

@ -420,6 +420,8 @@ $.widget("ui.draggable", $.ui.mouse, {
o = this.options, o = this.options,
document = this.document[ 0 ]; document = this.document[ 0 ];
this.relative_container = null;
if ( !o.containment ) { if ( !o.containment ) {
this.containment = null; this.containment = null;
return; return;