<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[29346] trunk/src: Disable background page scrolling when modals are open.</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://core.trac.wordpress.org/changeset/29346">29346</a></dd>
<dt>Author</dt> <dd>ocean90</dd>
<dt>Date</dt> <dd>2014-08-01 20:14:43 +0000 (Fri, 01 Aug 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Disable background page scrolling when modals are open.
props celloexpressions.
fixes <a href="http://core.trac.wordpress.org/ticket/29074">#29074</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpadmincsscommoncss">trunk/src/wp-admin/css/common.css</a></li>
<li><a href="#trunksrcwpadmincssthemescss">trunk/src/wp-admin/css/themes.css</a></li>
<li><a href="#trunksrcwpadminjsthemejs">trunk/src/wp-admin/js/theme.js</a></li>
<li><a href="#trunksrcwpincludesjsmediaviewsjs">trunk/src/wp-includes/js/media-views.js</a></li>
<li><a href="#trunksrcwpincludesjsthickboxthickboxjs">trunk/src/wp-includes/js/thickbox/thickbox.js</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcwpadmincsscommoncss"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-admin/css/common.css (29345 => 29346)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-admin/css/common.css 2014-08-01 18:42:46 UTC (rev 29345)
+++ trunk/src/wp-admin/css/common.css 2014-08-01 20:14:43 UTC (rev 29346)
</span><span class="lines">@@ -218,6 +218,10 @@
</span><span class="cx"> padding-top: 1px;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+body.modal-open {
+ overflow: hidden;
+}
+
</ins><span class="cx"> iframe,
</span><span class="cx"> img {
</span><span class="cx"> border: 0;
</span></span></pre></div>
<a id="trunksrcwpadmincssthemescss"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-admin/css/themes.css (29345 => 29346)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-admin/css/themes.css 2014-08-01 18:42:46 UTC (rev 29345)
+++ trunk/src/wp-admin/css/themes.css 2014-08-01 20:14:43 UTC (rev 29346)
</span><span class="lines">@@ -409,10 +409,6 @@
</span><span class="cx"> z-index: 10;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-body.theme-overlay-open {
- overflow: hidden;
-}
-
</del><span class="cx"> .theme-overlay .theme-header {
</span><span class="cx"> position: absolute;
</span><span class="cx"> top: 0;
</span></span></pre></div>
<a id="trunksrcwpadminjsthemejs"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-admin/js/theme.js (29345 => 29346)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-admin/js/theme.js 2014-08-01 18:42:46 UTC (rev 29345)
+++ trunk/src/wp-admin/js/theme.js 2014-08-01 20:14:43 UTC (rev 29346)
</span><span class="lines">@@ -701,7 +701,7 @@
</span><span class="cx"> // Performs the actions to effectively close
</span><span class="cx"> // the theme details overlay
</span><span class="cx"> closeOverlay: function() {
</span><del>- $( 'body' ).removeClass( 'theme-overlay-open' );
</del><ins>+ $( 'body' ).removeClass( 'modal-open' );
</ins><span class="cx"> this.remove();
</span><span class="cx"> this.unbind();
</span><span class="cx"> this.trigger( 'theme:collapse' );
</span><span class="lines">@@ -1000,7 +1000,7 @@
</span><span class="cx">
</span><span class="cx"> // Sets this.view to 'detail'
</span><span class="cx"> this.setView( 'detail' );
</span><del>- $( 'body' ).addClass( 'theme-overlay-open' );
</del><ins>+ $( 'body' ).addClass( 'modal-open' );
</ins><span class="cx">
</span><span class="cx"> // Set up the theme details view
</span><span class="cx"> this.overlay = new themes.view.Details({
</span></span></pre></div>
<a id="trunksrcwpincludesjsmediaviewsjs"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-includes/js/media-views.js (29345 => 29346)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-includes/js/media-views.js 2014-08-01 18:42:46 UTC (rev 29345)
+++ trunk/src/wp-includes/js/media-views.js 2014-08-01 20:14:43 UTC (rev 29346)
</span><span class="lines">@@ -3228,6 +3228,9 @@
</span><span class="cx"> };
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ // Disable page scrolling.
+ $( 'body' ).addClass( 'modal-open' );
+
</ins><span class="cx"> $el.show().find( '.media-modal-close' ).focus();
</span><span class="cx"> return this.propagate('open');
</span><span class="cx"> },
</span><span class="lines">@@ -3243,6 +3246,9 @@
</span><span class="cx"> return this;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ // Enable page scrolling.
+ $( 'body' ).removeClass( 'modal-open' );
+
</ins><span class="cx"> // Hide modal and remove restricted media modal tab focus once it's closed
</span><span class="cx"> this.$el.hide().undelegate( 'keydown' );
</span><span class="cx">
</span></span></pre></div>
<a id="trunksrcwpincludesjsthickboxthickboxjs"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-includes/js/thickbox/thickbox.js (29345 => 29346)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-includes/js/thickbox/thickbox.js 2014-08-01 18:42:46 UTC (rev 29345)
+++ trunk/src/wp-includes/js/thickbox/thickbox.js 2014-08-01 20:14:43 UTC (rev 29346)
</span><span class="lines">@@ -46,6 +46,7 @@
</span><span class="cx"> if(document.getElementById("TB_overlay") === null){
</span><span class="cx"> jQuery("body").append("<div id='TB_overlay'></div><div id='TB_window'></div>");
</span><span class="cx"> jQuery("#TB_overlay").click(tb_remove);
</span><ins>+ jQuery( 'body' ).addClass( 'modal-open' );
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -264,6 +265,7 @@
</span><span class="cx"> jQuery("#TB_imageOff").unbind("click");
</span><span class="cx"> jQuery("#TB_closeWindowButton").unbind("click");
</span><span class="cx"> jQuery("#TB_window").fadeOut("fast",function(){jQuery('#TB_window,#TB_overlay,#TB_HideSelect').trigger("tb_unload").unbind().remove();});
</span><ins>+ jQuery( 'body' ).removeClass( 'modal-open' );
</ins><span class="cx"> jQuery("#TB_load").remove();
</span><span class="cx"> if (typeof document.body.style.maxHeight == "undefined") {//if IE 6
</span><span class="cx"> jQuery("body","html").css({height: "auto", width: "auto"});
</span></span></pre>
</div>
</div>
</body>
</html>