diff options
| author | Scott González <scott.gonzalez@gmail.com> | 2011-05-13 13:36:09 -0700 |
|---|---|---|
| committer | Scott González <scott.gonzalez@gmail.com> | 2011-05-13 13:36:09 -0700 |
| commit | c9e187cd9d3cecdb39ecfb0ab0389614973a40c3 (patch) | |
| tree | f2a714decdca3e9542fa9d5bc335f1186cbe06ff | |
| parent | 2adfc03efee811f455a55e26eab9fff2a70a8093 (diff) | |
| parent | 331c4602a9a54d9bfa21c660feadeaa995537446 (diff) | |
| download | jquery-ui-c9e187cd9d3cecdb39ecfb0ab0389614973a40c3.tar.gz jquery-ui-c9e187cd9d3cecdb39ecfb0ab0389614973a40c3.zip | |
Merge pull request #263 from kborchers/bug_4995
Dialog: Create modal overlay after dialog is shown and check scrollHeight and offsetHeight in all IE versions. Fixed #4995 - Modal Dialog's overlay dissapears in IE when content is tall
| -rw-r--r-- | ui/jquery.ui.dialog.js | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/ui/jquery.ui.dialog.js b/ui/jquery.ui.dialog.js index 2138a9a58..496118761 100644 --- a/ui/jquery.ui.dialog.js +++ b/ui/jquery.ui.dialog.js @@ -281,10 +281,10 @@ $.widget("ui.dialog", { options = self.options, uiDialog = self.uiDialog; - self.overlay = options.modal ? new $.ui.dialog.overlay( self ) : null; self._size(); self._position( options.position ); uiDialog.show( options.show ); + self.overlay = options.modal ? new $.ui.dialog.overlay( self ) : null; self.moveToTop( true ); // prevent tabbing out of modal dialogs @@ -755,8 +755,8 @@ $.extend( $.ui.dialog.overlay, { height: function() { var scrollHeight, offsetHeight; - // handle IE 6 - if ( $.browser.msie && $.browser.version < 7 ) { + // handle IE + if ( $.browser.msie ) { scrollHeight = Math.max( document.documentElement.scrollHeight, document.body.scrollHeight |