diff options
| -rw-r--r-- | tests/unit/draggable/draggable_options.js | 9 | ||||
| -rw-r--r-- | ui/jquery.ui.draggable.js | 2 |
2 files changed, 9 insertions, 2 deletions
diff --git a/tests/unit/draggable/draggable_options.js b/tests/unit/draggable/draggable_options.js index f50359f99..0e728f8dc 100644 --- a/tests/unit/draggable/draggable_options.js +++ b/tests/unit/draggable/draggable_options.js @@ -375,15 +375,20 @@ test( "containment, account for border", 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" ); element.draggable( "option", "containment", "parent" ).css({ top: 0, left: 0 }); 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 ); TestHelpers.draggable.testDrag( element, element, -100, -100, -100, -100, "containment: false as option" ); }); diff --git a/ui/jquery.ui.draggable.js b/ui/jquery.ui.draggable.js index 5cbe92fce..2de1d0162 100644 --- a/ui/jquery.ui.draggable.js +++ b/ui/jquery.ui.draggable.js @@ -420,6 +420,8 @@ $.widget("ui.draggable", $.ui.mouse, { o = this.options, document = this.document[ 0 ]; + this.relative_container = null; + if ( !o.containment ) { this.containment = null; return; |