<!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>[35418] trunk/src: Thickbox: spinner should disappear when loading is done.</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" style="font-size: 105%">
<dt style="float: left; width: 6em; font-weight: bold">Revision</dt> <dd><a style="font-weight: bold" href="https://core.trac.wordpress.org/changeset/35418">35418</a><script type="application/ld+json">{"@context":"http://schema.org","@type":"EmailMessage","description":"Review this Commit","action":{"@type":"ViewAction","url":"https://core.trac.wordpress.org/changeset/35418","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>wonderboymusic</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2015-10-28 18:18:42 +0000 (Wed, 28 Oct 2015)</dd>
</dl>
<pre style='padding-left: 1em; margin: 2em 0; border-left: 2px solid #ccc; line-height: 1.25; font-size: 105%; font-family: sans-serif'>Thickbox: spinner should disappear when loading is done.
Props niklasbr, afercia.
Fixes <a href="https://core.trac.wordpress.org/ticket/33311">#33311</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpadmincsscommoncss">trunk/src/wp-admin/css/common.css</a></li>
<li><a href="#trunksrcwpincludesjsthickboxthickboxcss">trunk/src/wp-includes/js/thickbox/thickbox.css</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 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-admin/css/common.css</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/css/common.css 2015-10-28 18:17:27 UTC (rev 35417)
+++ trunk/src/wp-admin/css/common.css 2015-10-28 18:18:42 UTC (rev 35418)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2694,21 +2694,50 @@
</span><span class="cx" style="display: block; padding: 0 10px"> body.plugins-php #TB_window,
</span><span class="cx" style="display: block; padding: 0 10px"> body.update-core-php #TB_window,
</span><span class="cx" style="display: block; padding: 0 10px"> body.index-php #TB_window {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- background: #fcfcfc url( ../images/spinner.gif ) no-repeat center;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ background: #fcfcfc;
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+/* IE 8 needs a change in the pseudo element content */
+.ie8 body.plugin-install-php #TB_window:before,
+.ie8 body.import-php #TB_window:before,
+.ie8 body.plugins-php #TB_window:before,
+.ie8 body.update-core-php #TB_window:before,
+.ie8 body.index-php #TB_window:before {
+ content: " ";
+ background: none;
+}
+
+body.plugin-install-php #TB_window.thickbox-loading:before,
+body.import-php #TB_window.thickbox-loading:before,
+body.plugins-php #TB_window.thickbox-loading:before,
+body.update-core-php #TB_window.thickbox-loading:before,
+body.index-php #TB_window.thickbox-loading:before {
+ content: "";
+ display: block;
+ width: 20px;
+ height: 20px;
+ position: absolute;
+ left: 50%;
+ top: 50%;
+ z-index: -1;
+ margin: -10px 0 0 -10px;
+ background: #fcfcfc url(../images/spinner.gif) no-repeat center;
+ -webkit-background-size: 20px 20px;
+ background-size: 20px 20px;
+ -webkit-transform: translateZ(0);
+ transform: translateZ(0);
+}
+
</ins><span class="cx" style="display: block; padding: 0 10px"> @media print,
</span><span class="cx" style="display: block; padding: 0 10px"> (-webkit-min-device-pixel-ratio: 1.25),
</span><span class="cx" style="display: block; padding: 0 10px"> (min-resolution: 120dpi) {
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- body.plugin-install-php #TB_window,
- body.import-php #TB_window,
- body.plugins-php #TB_window,
- body.update-core-php #TB_window,
- body.index-php #TB_window {
- background: #fcfcfc url( ../images/spinner-2x.gif ) no-repeat center;
- -webkit-background-size: 20px 20px;
- background-size: 20px 20px;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ body.plugin-install-php #TB_window.thickbox-loading:before,
+ body.import-php #TB_window.thickbox-loading:before,
+ body.plugins-php #TB_window.thickbox-loading:before,
+ body.update-core-php #TB_window.thickbox-loading:before,
+ body.index-php #TB_window.thickbox-loading:before {
+ background: #fcfcfc url(../images/spinner-2x.gif) no-repeat center;
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span></span></pre></div>
<a id="trunksrcwpincludesjsthickboxthickboxcss"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/js/thickbox/thickbox.css</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/js/thickbox/thickbox.css 2015-10-28 18:17:27 UTC (rev 35417)
+++ trunk/src/wp-includes/js/thickbox/thickbox.css 2015-10-28 18:18:42 UTC (rev 35418)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -12,7 +12,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> #TB_window {
</span><span class="cx" style="display: block; padding: 0 10px"> position: fixed;
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- background: #fff;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ background-color: #fff;
</ins><span class="cx" style="display: block; padding: 0 10px"> z-index: 100050; /* Above DFW. */
</span><span class="cx" style="display: block; padding: 0 10px"> visibility: hidden;
</span><span class="cx" style="display: block; padding: 0 10px"> text-align: left;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -55,7 +55,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> float: left;
</span><span class="cx" style="display: block; padding: 0 10px"> font-weight: 600;
</span><span class="cx" style="display: block; padding: 0 10px"> line-height: 29px;
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- overflow: hidden;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ overflow: hidden;
</ins><span class="cx" style="display: block; padding: 0 10px"> padding: 0 29px 0 10px;
</span><span class="cx" style="display: block; padding: 0 10px"> text-overflow: ellipsis;
</span><span class="cx" style="display: block; padding: 0 10px"> white-space: nowrap;
</span></span></pre></div>
<a id="trunksrcwpincludesjsthickboxthickboxjs"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/js/thickbox/thickbox.js</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/js/thickbox/thickbox.js 2015-10-28 18:17:27 UTC (rev 35417)
+++ trunk/src/wp-includes/js/thickbox/thickbox.js 2015-10-28 18:18:42 UTC (rev 35418)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -18,9 +18,16 @@
</span><span class="cx" style="display: block; padding: 0 10px"> imgLoader.src = tb_pathToImage;
</span><span class="cx" style="display: block; padding: 0 10px"> });
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-//add thickbox to href & area elements that have a class of .thickbox
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+/*
+ * Add thickbox to href & area elements that have a class of .thickbox.
+ * Remove the loading indicator when content in an iframe has loaded.
+ */
</ins><span class="cx" style="display: block; padding: 0 10px"> function tb_init(domChunk){
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- jQuery('body').on('click', domChunk, tb_click);
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ jQuery( 'body' )
+ .on( 'click', domChunk, tb_click )
+ .on( 'thickbox:iframe:loaded', function() {
+ jQuery( '#TB_window' ).removeClass( 'thickbox-loading' );
+ });
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> function tb_click(){
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -39,12 +46,12 @@
</span><span class="cx" style="display: block; padding: 0 10px"> jQuery("body","html").css({height: "100%", width: "100%"});
</span><span class="cx" style="display: block; padding: 0 10px"> jQuery("html").css("overflow","hidden");
</span><span class="cx" style="display: block; padding: 0 10px"> if (document.getElementById("TB_HideSelect") === null) {//iframe to hide select elements in ie6
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- jQuery("body").append("<iframe id='TB_HideSelect'>"+thickboxL10n.noiframes+"</iframe><div id='TB_overlay'></div><div id='TB_window'></div>");
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ jQuery("body").append("<iframe id='TB_HideSelect'>"+thickboxL10n.noiframes+"</iframe><div id='TB_overlay'></div><div id='TB_window' class='thickbox-loading'></div>");
</ins><span class="cx" style="display: block; padding: 0 10px"> jQuery("#TB_overlay").click(tb_remove);
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> }else{//all others
</span><span class="cx" style="display: block; padding: 0 10px"> if(document.getElementById("TB_overlay") === null){
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- jQuery("body").append("<div id='TB_overlay'></div><div id='TB_window'></div>");
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ jQuery("body").append("<div id='TB_overlay'></div><div id='TB_window' class='thickbox-loading'></div>");
</ins><span class="cx" style="display: block; padding: 0 10px"> jQuery("#TB_overlay").click(tb_remove);
</span><span class="cx" style="display: block; padding: 0 10px"> jQuery( 'body' ).addClass( 'modal-open' );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -195,10 +202,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> urlNoQuery = url.split('TB_');
</span><span class="cx" style="display: block; padding: 0 10px"> jQuery("#TB_iframeContent").remove();
</span><span class="cx" style="display: block; padding: 0 10px"> if(params['modal'] != "true"){//iframe no modal
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- jQuery("#TB_window").append("<div id='TB_title'><div id='TB_ajaxWindowTitle'>"+caption+"</div><div id='TB_closeAjaxWindow'><a href='#' id='TB_closeWindowButton'><span class='screen-reader-text'>"+thickboxL10n.close+"</span><div class='tb-close-icon'></div></a></div></div><iframe frameborder='0' hspace='0' src='"+urlNoQuery[0]+"' id='TB_iframeContent' name='TB_iframeContent"+Math.round(Math.random()*1000)+"' onload='tb_showIframe()' style='width:"+(ajaxContentW + 29)+"px;height:"+(ajaxContentH + 17)+"px;' >"+thickboxL10n.noiframes+"</iframe>");
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ jQuery("#TB_window").append("<div id='TB_title'><div id='TB_ajaxWindowTitle'>"+caption+"</div><div id='TB_closeAjaxWindow'><a href='#' id='TB_closeWindowButton'><span class='screen-reader-text'>"+thickboxL10n.close+"</span><div class='tb-close-icon'></div></a></div></div><iframe frameborder='0' hspace='0' allowTransparency='true' src='"+urlNoQuery[0]+"' id='TB_iframeContent' name='TB_iframeContent"+Math.round(Math.random()*1000)+"' onload='tb_showIframe()' style='width:"+(ajaxContentW + 29)+"px;height:"+(ajaxContentH + 17)+"px;' >"+thickboxL10n.noiframes+"</iframe>");
</ins><span class="cx" style="display: block; padding: 0 10px"> }else{//iframe modal
</span><span class="cx" style="display: block; padding: 0 10px"> jQuery("#TB_overlay").unbind();
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- jQuery("#TB_window").append("<iframe frameborder='0' hspace='0' src='"+urlNoQuery[0]+"' id='TB_iframeContent' name='TB_iframeContent"+Math.round(Math.random()*1000)+"' onload='tb_showIframe()' style='width:"+(ajaxContentW + 29)+"px;height:"+(ajaxContentH + 17)+"px;'>"+thickboxL10n.noiframes+"</iframe>");
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ jQuery("#TB_window").append("<iframe frameborder='0' hspace='0' allowTransparency='true' src='"+urlNoQuery[0]+"' id='TB_iframeContent' name='TB_iframeContent"+Math.round(Math.random()*1000)+"' onload='tb_showIframe()' style='width:"+(ajaxContentW + 29)+"px;height:"+(ajaxContentH + 17)+"px;'>"+thickboxL10n.noiframes+"</iframe>");
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> }else{// not an iframe, ajax
</span><span class="cx" style="display: block; padding: 0 10px"> if(jQuery("#TB_window").css("visibility") != "visible"){
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -260,7 +267,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> //helper functions below
</span><span class="cx" style="display: block; padding: 0 10px"> function tb_showIframe(){
</span><span class="cx" style="display: block; padding: 0 10px"> jQuery("#TB_load").remove();
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- jQuery("#TB_window").css({'visibility':'visible'});
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ jQuery("#TB_window").css({'visibility':'visible'}).trigger( 'thickbox:iframe:loaded' );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> function tb_remove() {
</span></span></pre>
</div>
</div>
</body>
</html>