library-mirrors/jquery-ui
1
0
Fork 0
mirror of https://github.com/jquery/jquery-ui.git synced 2025-01-07 20:34:24 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Dialog: Fixed #3076: Proper sizing of overlays in Opera 9.51.

Browse Source
This commit is contained in:
Scott González 2008-07-14 00:50:01 +00:00
parent 30952e6b3f
commit dad128d84f
1 changed files with 17 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
ui/ui.dialog.js
View File

@ -113,7 +113,7 @@ $.widget("ui.dialog", {
uiDialogTitlebar.find("*").add(uiDialogTitlebar).each(function() { uiDialogTitlebar.find("*").add(uiDialogTitlebar).each(function() {
$.ui.disableSelection(this); $.ui.disableSelection(this);
}); });
if ($.fn.draggable) { if ($.fn.draggable) {
uiDialog.draggable({ uiDialog.draggable({
cancel: '.ui-dialog-content', cancel: '.ui-dialog-content',
@ -433,6 +433,7 @@ $.extend($.ui.dialog.overlay, {
}, },
height: function() { height: function() {
// handle IE 6
if ($.browser.msie && $.browser.version < 7) { if ($.browser.msie && $.browser.version < 7) {
var scrollHeight = Math.max( var scrollHeight = Math.max(
document.documentElement.scrollHeight, document.documentElement.scrollHeight,
@ -448,12 +449,20 @@ $.extend($.ui.dialog.overlay, {
} else { } else {
return scrollHeight + 'px'; return scrollHeight + 'px';
} }
// handle Opera
} else if ($.browser.opera) {
return Math.max(
window.innerHeight,
$(document).height()
) + 'px';
// handle "good" browsers
} else { } else {
return $(document).height() + 'px'; return $(document).height() + 'px';
} }
}, },
width: function() { width: function() {
// handle IE 6
if ($.browser.msie && $.browser.version < 7) { if ($.browser.msie && $.browser.version < 7) {
var scrollWidth = Math.max( var scrollWidth = Math.max(
document.documentElement.scrollWidth, document.documentElement.scrollWidth,
@ -469,6 +478,13 @@ $.extend($.ui.dialog.overlay, {
} else { } else {
return scrollWidth + 'px'; return scrollWidth + 'px';
} }
// handle Opera
} else if ($.browser.opera) {
return Math.max(
window.innerWidth,
$(document).width()
) + 'px';
// handle "good" browsers
} else { } else {
return $(document).width() + 'px'; return $(document).width() + 'px';
} }