github/jquery-ui
1
1
Fork 0
mirror of https://github.com/jquery/jquery-ui.git synced 2026-02-04 14:15:12 -05:00
Code Issues Packages Projects Releases Wiki Activity

draggable,sortable: fixed containment "document", added containment: "window" (fixes #2936,#2171)

Browse Source
This commit is contained in:
Paul Bakaus
2008-06-07 23:38:03 +00:00
parent 68d37568e0
commit 7539a095f6
2 changed files with 14 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
ui/ui.draggable.js
View File

@@ -103,7 +103,13 @@ $.widget("ui.draggable", $.extend($.ui.mouse, {
if(o.containment) {
if(o.containment == 'parent') o.containment = this.helper[0].parentNode;
if(o.containment == 'document') this.containment = [0,0,$(document).width(), ($(document).height() || document.body.parentNode.scrollHeight)];
if(o.containment == 'document' || o.containment == 'window') this.containment = [
0 - this.offset.relative.left - this.offset.parent.left,
0 - this.offset.relative.top - this.offset.parent.top,
$(o.containment == 'document' ? document : window).width() - this.offset.relative.left - this.offset.parent.left - this.helperProportions.width - this.margins.left - (parseInt(this.element.css("marginRight"),10) || 0),
($(o.containment == 'document' ? document : window).height() || document.body.parentNode.scrollHeight) - this.offset.relative.top - this.offset.parent.top - this.helperProportions.height - this.margins.top - (parseInt(this.element.css("marginBottom"),10) || 0)
];
if(!(/^(document|window|parent)$/).test(o.containment)) {
var ce = $(o.containment)[0];
var co = $(o.containment).offset();

8
ui/ui.sortable.js
View File

@@ -355,7 +355,13 @@ $.widget("ui.sortable", $.extend($.ui.mouse, {
if(o.containment) {
if(o.containment == 'parent') o.containment = this.helper[0].parentNode;
if(o.containment == 'document') this.containment = [0,0,$(document).width(), ($(document).height() || document.body.parentNode.scrollHeight)];
if(o.containment == 'document' || o.containment == 'window') this.containment = [
0 - this.offset.parent.left,
0 - this.offset.parent.top,
$(o.containment == 'document' ? document : window).width() - this.offset.parent.left - this.helperProportions.width - this.margins.left - (parseInt(this.element.css("marginRight"),10) || 0),
($(o.containment == 'document' ? document : window).height() || document.body.parentNode.scrollHeight) - this.offset.parent.top - this.helperProportions.height - this.margins.top - (parseInt(this.element.css("marginBottom"),10) || 0)
];
if(!(/^(document|window|parent)$/).test(o.containment)) {
var ce = $(o.containment)[0];
var co = $(o.containment).offset();