Permalink
Show file tree
Hide file tree
3 comments
on commit
Please
sign in to comment.
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Browse files
Dialog: Switch back to shuffling z-index, but only look at .ui-front …
…siblings. Fixes #9166 - Dialog: moveToTop implementation resets flash/video/iframe/scroll Fixes #9364 - Dialog: Click of element with tooltip scrolls the dialog to the top
- Loading branch information
Showing
4 changed files
with
94 additions
and
5 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
@@ -144,8 +144,8 @@ test("moveToTop", function() { | ||
expect( 5 ); | ||
function order() { | ||
var actual = $( ".ui-dialog" ).map(function() { | ||
return +$( this ).find( ".ui-dialog-content" ).attr( "id" ).replace( /\D+/, "" ); | ||
}).get().reverse(); | ||
return +$( this ).css( "z-index" ); | ||
}).get(); | ||
deepEqual( actual, $.makeArray( arguments ) ); | ||
} | ||
var dialog1, dialog2, | ||
@@ -161,10 +161,23 @@ test("moveToTop", function() { | ||
equal( focusOn, "dialog2" ); | ||
} | ||
}); | ||
order( 2, 1 ); | ||
order( 100, 101 ); | ||
focusOn = "dialog1"; | ||
dialog1.dialog( "moveToTop" ); | ||
order( 1, 2 ); | ||
order( 102, 101 ); | ||
}); | ||
|
||
test( "moveToTop: content scroll stays intact", function() { | ||
expect( 2 ); | ||
var otherDialog = $( "#dialog1" ).dialog(), | ||
scrollDialog = $( "#form-dialog" ).dialog({ | ||
height: 200 | ||
}); | ||
scrollDialog.scrollTop( 50 ); | ||
equal( scrollDialog.scrollTop(), 50 ); | ||
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
dekajp
Contributor
|
||
|
||
otherDialog.dialog( "moveToTop" ); | ||
equal( scrollDialog.scrollTop(), 50 ); | ||
}); | ||
|
||
test("open", function() { | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
@@ -0,0 +1,62 @@ | ||
<!doctype html> | ||
<html lang="en"> | ||
<head> | ||
<meta charset="utf-8"> | ||
<title>Dialog Visual Test</title> | ||
<link rel="stylesheet" href="../../../themes/base/jquery.ui.all.css"> | ||
<script src="../../../jquery-1.10.2.js"></script> | ||
<script src="../../../ui/jquery.ui.core.js"></script> | ||
<script src="../../../ui/jquery.ui.widget.js"></script> | ||
<script src="../../../ui/jquery.ui.mouse.js"></script> | ||
<script src="../../../ui/jquery.ui.draggable.js"></script> | ||
<script src="../../../ui/jquery.ui.position.js"></script> | ||
<script src="../../../ui/jquery.ui.resizable.js"></script> | ||
<script src="../../../ui/jquery.ui.button.js"></script> | ||
<script src="../../../ui/jquery.ui.dialog.js"></script> | ||
|
||
<style> | ||
body { | ||
font-size: 62.5%; | ||
} | ||
</style> | ||
<script> | ||
$(function() { | ||
var iframeDialog = $( "#dialog-iframe" ).dialog({ | ||
position: { | ||
my: "right-90 center" | ||
}, | ||
height: 400 | ||
}), | ||
|
||
scrollingDialog = $( "#dialog-scrolling" ).dialog({ | ||
maxHeight: 200, | ||
position: { | ||
my: "left+90 center" | ||
} | ||
}), | ||
|
||
otherDialog = $( "#dialog-other" ).dialog({ | ||
width: 200, | ||
height: 150 | ||
}); | ||
}); | ||
</script> | ||
</head> | ||
<body> | ||
|
||
<p>WHAT: Two dialogs, one embedding an iframe, one having just scrollable content.</p> | ||
<p>EXPECTED: When focusing on one or the other dialog, it shouldn't affect how the content is displayed on the other dialog. It shouldn't reload the iframe or reset the scroll.</p> | ||
|
||
|
||
<div id="dialog-iframe" title="Dialog that embeds an iframe"> | ||
<iframe src="animated.html" height="400"></iframe> | ||
</div> | ||
|
||
<div id="dialog-scrolling" title="Dialog with scroll"> | ||
<p style="height:600px;background:#eee">a bunch of content</p> | ||
</div> | ||
|
||
<div id="dialog-other" title="placeholder">Just another dialog to test stacking</div> | ||
|
||
</body> | ||
</html> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
3 comments
on commit e263ebd
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Thank you! This is a cause that I confused.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This caused a regression: http://bugs.jqueryui.com/ticket/10138
This fails in all IEs, where the value is sometimes 38, sometimes 40 or whatever it likes. I've now tried to set an explicit height on the dialog content, to make sure its bigger than the dialog and therefore scrollable enough, but that doesn't make any difference. Any ideas what's causing that?