8000 Adding support for containment by fglueck · Pull Request #1988 · jquery/jquery-ui · GitHub
[go: up one dir, main page]
Skip to content

Adding support for containment #1988

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 8 commits into
base: main
Choose a base branch
from
Open

Adding support for containment #1988

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
73dd781
Adding support for containment
fglueck Sep 29, 2021
b0aafb4
Unittest for #1988
fglueck Dec 6, 2021
6df435a
Update options.js
fglueck Dec 7, 2021
dd03747
Update options.js
fglueck Dec 7, 2021
335a3cc
Update options.js
fglueck Jan 10, 2022
a38631f
Update options.js
fglueck Jan 10, 2022
a5751c6
Update options.js
fglueck Jan 10, 2022
6c67052
Adding support for containment
fglueck Aug 25, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 18 additions & 0 deletions tests/unit/dialog/options.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -569,4 +569,22 @@ QUnit.test( "Open followed by close during show effect", function( assert ) {
}, 100 );
} );

QUnit.test( "Dialog can't break out containment", function( assert ) {
assert.expect( 1 );
var box = $( '<div></div>' ).css( {
height: "500px", border: "0px", margin: "0px", width: "500px", position: "absolute", bottom: "0px", right: "0px", left: "50px", top: "50px"
} ).appendTo( "body" ),
element = $( "<div>X</div>" ).dialog( { containment: box, position: { at: "left top", of: box } } ), // open on left top corner
dlg = element.dialog( "widget" ),
offsetAfter,
expected = box.offset();

testHelper.drag( element, ".ui-dialog-titlebar", -200, -200 ); // try to move out
offsetAfter = dlg.offset(); // should be the same
assert.deepEqual( offsetAfter, expected, "compare offset" );
setTimeout( function() {
element.dialog( "close" );
box.remove();
}, 100 );
} );
} );
5 changes: 3 additions & 2 deletions ui/widgets/dialog.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,8 @@ $.widget( "ui.dialog", {
open: null,
resize: null,
resizeStart: null,
resizeStop: null
resizeStop: null,
containment: "document"
},

sizeRelatedOptions: {
Expand Down Expand Up @@ -547,7 +548,7 @@ $.widget( "ui.dialog", {
this.uiDialog.draggable( {
cancel: ".ui-dialog-content, .ui-dialog-titlebar-close",
handle: ".ui-dialog-titlebar",
containment: "document",
containment: options.containment,
start: function( event, ui ) {
that._addClass( $( this ), "ui-dialog-dragging" );
that._blockFrames();
Expand Down
0