Permalink
Browse files
core: hasScroll now checks for overflow hidden, since then the users …
…wants scroll to be hidden
draggable: containment respects overflow hidden (fixes #3328)
- Loading branch information
Showing
with
7 additions
and
2 deletions.
-
+4
−0
ui/ui.core.js
-
+3
−2
ui/ui.draggable.js
|
|
@@ -283,6 +283,10 @@ $.ui = { |
|
|
.unbind('selectstart.ui'); |
|
|
}, |
|
|
hasScroll: function(e, a) { |
|
|
|
|
|
//If overflow is hidden, the element might have extra content, but the user wants to hide it |
|
|
if ($(e).css('overflow') == 'hidden') { return false; } |
|
|
|
|
|
var scroll = (a && a == 'left') ? 'scrollLeft' : 'scrollTop', |
|
|
has = false; |
|
|
|
|
|
|
|
|
@@ -196,12 +196,13 @@ $.widget("ui.draggable", $.extend({}, $.ui.mouse, { |
|
|
if(!(/^(document|window|parent)$/).test(o.containment)) { |
|
|
var ce = $(o.containment)[0]; |
|
|
var co = $(o.containment).offset(); |
|
|
var over = ($(ce).css("overflow") != 'hidden'); |
|
|
|
|
|
this.containment = [ |
|
|
co.left + (parseInt($(ce).css("borderLeftWidth"),10) || 0) - this.offset.relative.left - this.offset.parent.left, |
|
|
co.top + (parseInt($(ce).css("borderTopWidth"),10) || 0) - this.offset.relative.top - this.offset.parent.top, |
|
|
co.left+Math.max(ce.scrollWidth,ce.offsetWidth) - (parseInt($(ce).css("borderLeftWidth"),10) || 0) - this.offset.relative.left - this.offset.parent.left - this.helperProportions.width - this.margins.left - (parseInt(this.element.css("marginRight"),10) || 0), |
|
|
co.top+Math.max(ce.scrollHeight,ce.offsetHeight) - (parseInt($(ce).css("borderTopWidth"),10) || 0) - this.offset.relative.top - this.offset.parent.top - this.helperProportions.height - this.margins.top - (parseInt(this.element.css("marginBottom"),10) || 0) |
|
|
co.left+(over ? Math.max(ce.scrollWidth,ce.offsetWidth) : ce.offsetWidth) - (parseInt($(ce).css("borderLeftWidth"),10) || 0) - this.offset.relative.left - this.offset.parent.left - this.helperProportions.width - this.margins.left - (parseInt(this.element.css("marginRight"),10) || 0), |
|
|
co.top+(over ? Math.max(ce.scrollHeight,ce.offsetHeight) : ce.offsetHeight) - (parseInt($(ce).css("borderTopWidth"),10) || 0) - this.offset.relative.top - this.offset.parent.top - this.helperProportions.height - this.margins.top - (parseInt(this.element.css("marginBottom"),10) || 0) |
|
|
]; |
|
|
} |
|
|
|
|
|
|