<!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>[22378] trunk: Update Thickbox images for HiDPI.</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, #logmsg > ol { margin-left: 0; 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/22378">22378</a></dd>
<dt>Author</dt> <dd>nacin</dd>
<dt>Date</dt> <dd>2012-11-05 21:00:15 +0000 (Mon, 05 Nov 2012)</dd>
</dl>
<h3>Log Message</h3>
<pre>Update Thickbox images for HiDPI. props lessbloat. see <a href="http://core.trac.wordpress.org/ticket/21019">#21019</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpadminincludesmsphp">trunk/wp-admin/includes/ms.php</a></li>
<li><a href="#trunkwpincludesjsthickboxloadingAnimationgif">trunk/wp-includes/js/thickbox/loadingAnimation.gif</a></li>
<li><a href="#trunkwpincludesjsthickboxthickboxcss">trunk/wp-includes/js/thickbox/thickbox.css</a></li>
<li><a href="#trunkwpincludesjsthickboxthickboxjs">trunk/wp-includes/js/thickbox/thickbox.js</a></li>
<li><a href="#trunkwpincludesscriptloaderphp">trunk/wp-includes/script-loader.php</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkwpincludesjsthickboxtbclose2xpng">trunk/wp-includes/js/thickbox/tb-close-2x.png</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpadminincludesmsphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/includes/ms.php (22377 => 22378)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/ms.php 2012-11-05 20:32:50 UTC (rev 22377)
+++ trunk/wp-admin/includes/ms.php 2012-11-05 21:00:15 UTC (rev 22378)
</span><span class="lines">@@ -773,7 +773,6 @@
</span><span class="cx"> <script type="text/javascript">
</span><span class="cx"> //<![CDATA[
</span><span class="cx"> var tb_pathToImage = "../../wp-includes/js/thickbox/loadingAnimation.gif";
</span><del>-var tb_closeImage = "../../wp-includes/js/thickbox/tb-close.png";
</del><span class="cx"> //]]>
</span><span class="cx"> </script>
</span><span class="cx"> <?php
</span></span></pre></div>
<a id="trunkwpincludesjsthickboxloadingAnimationgif"></a>
<div class="binary"><h4>Modified: trunk/wp-includes/js/thickbox/loadingAnimation.gif</h4>
<pre class="diff"><span>
<span class="cx">(Binary files differ)
</span></span></pre></div>
<a id="trunkwpincludesjsthickboxtbclose2xpng"></a>
<div class="binary"><h4>Added: trunk/wp-includes/js/thickbox/tb-close-2x.png</h4>
<pre class="diff"><span>
<span class="cx">(Binary files differ)
</span></span></pre></div>
<span class="cx">Property changes on: trunk/wp-includes/js/thickbox/tb-close-2x.png
</span><span class="cx">___________________________________________________________________
</span><a id="svnmimetype"></a>
<div class="addfile"><h4>Added: svn:mime-type</h4></div>
<a id="trunkwpincludesjsthickboxthickboxcss"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/js/thickbox/thickbox.css (22377 => 22378)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/js/thickbox/thickbox.css 2012-11-05 20:32:50 UTC (rev 22377)
+++ trunk/wp-includes/js/thickbox/thickbox.css 2012-11-05 21:00:15 UTC (rev 22378)
</span><span class="lines">@@ -160,3 +160,16 @@
</span><span class="cx"> margin-bottom:-1px;
</span><span class="cx"> _margin-bottom:1px;
</span><span class="cx"> }
</span><ins>+
+.tb-close-icon {
+ background: url('tb-close.png') no-repeat;
+ height: 15px;
+ width: 15px;
+}
+
+@media only screen and (-webkit-min-device-pixel-ratio: 1.5) {
+ .tb-close-icon {
+ background: url('tb-close-2x.png') no-repeat;
+ background-size: 15px;
+ }
+}
</ins><span class="cx">\ No newline at end of file
</span></span></pre></div>
<a id="trunkwpincludesjsthickboxthickboxjs"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/js/thickbox/thickbox.js (22377 => 22378)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/js/thickbox/thickbox.js 2012-11-05 20:32:50 UTC (rev 22377)
+++ trunk/wp-includes/js/thickbox/thickbox.js 2012-11-05 21:00:15 UTC (rev 22378)
</span><span class="lines">@@ -8,9 +8,6 @@
</span><span class="cx"> if ( typeof tb_pathToImage != 'string' ) {
</span><span class="cx"> var tb_pathToImage = thickboxL10n.loadingAnimation;
</span><span class="cx"> }
</span><del>-if ( typeof tb_closeImage != 'string' ) {
- var tb_closeImage = thickboxL10n.closeImage;
-}
</del><span class="cx">
</span><span class="cx"> /*!!!!!!!!!!!!!!!!! edit below this line at your own risk !!!!!!!!!!!!!!!!!!!!!!!*/
</span><span class="cx">
</span><span class="lines">@@ -59,7 +56,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if(caption===null){caption="";}
</span><del>- jQuery("body").append("<div id='TB_load'><img src='"+imgLoader.src+"' /></div>");//add loader to the page
</del><ins>+ jQuery("body").append("<div id='TB_load'><img src='"+imgLoader.src+"' width='208' /></div>");//add loader to the page
</ins><span class="cx"> jQuery('#TB_load').show();//show loader
</span><span class="cx">
</span><span class="cx"> var baseURL;
</span><span class="lines">@@ -132,7 +129,7 @@
</span><span class="cx">
</span><span class="cx"> TB_WIDTH = imageWidth + 30;
</span><span class="cx"> TB_HEIGHT = imageHeight + 60;
</span><del>- jQuery("#TB_window").append("<a href='' id='TB_ImageOff' title='"+thickboxL10n.close+"'><img id='TB_Image' src='"+url+"' width='"+imageWidth+"' height='"+imageHeight+"' alt='"+caption+"'/></a>" + "<div id='TB_caption'>"+caption+"<div id='TB_secondLine'>" + TB_imageCount + TB_PrevHTML + TB_NextHTML + "</div></div><div id='TB_closeWindow'><a href='#' id='TB_closeWindowButton' title='"+thickboxL10n.close+"'><img src='" + tb_closeImage + "' /></a></div>");
</del><ins>+ jQuery("#TB_window").append("<a href='' id='TB_ImageOff' title='"+thickboxL10n.close+"'><img id='TB_Image' src='"+url+"' width='"+imageWidth+"' height='"+imageHeight+"' alt='"+caption+"'/></a>" + "<div id='TB_caption'>"+caption+"<div id='TB_secondLine'>" + TB_imageCount + TB_PrevHTML + TB_NextHTML + "</div></div><div id='TB_closeWindow'><a href='#' id='TB_closeWindowButton' title='"+thickboxL10n.close+"'><div class='tb-close-icon'></div></a></div>");
</ins><span class="cx">
</span><span class="cx"> jQuery("#TB_closeWindowButton").click(tb_remove);
</span><span class="cx">
</span><span class="lines">@@ -200,7 +197,7 @@
</span><span class="cx"> urlNoQuery = url.split('TB_');
</span><span class="cx"> jQuery("#TB_iframeContent").remove();
</span><span class="cx"> if(params['modal'] != "true"){//iframe no modal
</span><del>- jQuery("#TB_window").append("<div id='TB_title'><div id='TB_ajaxWindowTitle'>"+caption+"</div><div id='TB_closeAjaxWindow'><a href='#' id='TB_closeWindowButton' title='"+thickboxL10n.close+"'><img src='" + tb_closeImage + "' /></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>+ jQuery("#TB_window").append("<div id='TB_title'><div id='TB_ajaxWindowTitle'>"+caption+"</div><div id='TB_closeAjaxWindow'><a href='#' id='TB_closeWindowButton' title='"+thickboxL10n.close+"'><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>");
</ins><span class="cx"> }else{//iframe modal
</span><span class="cx"> jQuery("#TB_overlay").unbind();
</span><span class="cx"> 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>");
</span><span class="lines">@@ -208,7 +205,7 @@
</span><span class="cx"> }else{// not an iframe, ajax
</span><span class="cx"> if(jQuery("#TB_window").css("visibility") != "visible"){
</span><span class="cx"> if(params['modal'] != "true"){//ajax no modal
</span><del>- jQuery("#TB_window").append("<div id='TB_title'><div id='TB_ajaxWindowTitle'>"+caption+"</div><div id='TB_closeAjaxWindow'><a href='#' id='TB_closeWindowButton'><img src='" + tb_closeImage + "' /></a></div></div><div id='TB_ajaxContent' style='width:"+ajaxContentW+"px;height:"+ajaxContentH+"px'></div>");
</del><ins>+ jQuery("#TB_window").append("<div id='TB_title'><div id='TB_ajaxWindowTitle'>"+caption+"</div><div id='TB_closeAjaxWindow'><a href='#' id='TB_closeWindowButton'><div class='tb-close-icon'></div></a></div></div><div id='TB_ajaxContent' style='width:"+ajaxContentW+"px;height:"+ajaxContentH+"px'></div>");
</ins><span class="cx"> }else{//ajax modal
</span><span class="cx"> jQuery("#TB_overlay").unbind();
</span><span class="cx"> jQuery("#TB_window").append("<div id='TB_ajaxContent' class='TB_modal' style='width:"+ajaxContentW+"px;height:"+ajaxContentH+"px;'></div>");
</span></span></pre></div>
<a id="trunkwpincludesscriptloaderphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/script-loader.php (22377 => 22378)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/script-loader.php 2012-11-05 20:32:50 UTC (rev 22377)
+++ trunk/wp-includes/script-loader.php 2012-11-05 21:00:15 UTC (rev 22378)
</span><span class="lines">@@ -173,7 +173,7 @@
</span><span class="cx"> $scripts->add( 'jquery-touch-punch', "/wp-includes/js/jquery/jquery.ui.touch-punch.js", array('jquery-ui-widget', 'jquery-ui-mouse'), '0.2.2', 1 );
</span><span class="cx"> $scripts->add( 'jquery-masonry', "/wp-includes/js/jquery/jquery.masonry.min.js", array('jquery'), '2.1.05', 1 );
</span><span class="cx">
</span><del>- $scripts->add( 'thickbox', "/wp-includes/js/thickbox/thickbox.js", array('jquery'), '3.1-20111117', 1 );
</del><ins>+ $scripts->add( 'thickbox', "/wp-includes/js/thickbox/thickbox.js", array('jquery'), '3.1-20121105', 1 );
</ins><span class="cx"> did_action( 'init' ) && $scripts->localize( 'thickbox', 'thickboxL10n', array(
</span><span class="cx"> 'next' => __('Next &gt;'),
</span><span class="cx"> 'prev' => __('&lt; Prev'),
</span><span class="lines">@@ -539,7 +539,7 @@
</span><span class="cx">
</span><span class="cx"> $styles->add( 'media', "/wp-admin/css/media$suffix.css" );
</span><span class="cx"> $styles->add( 'install', "/wp-admin/css/install$suffix.css", array('buttons') );
</span><del>- $styles->add( 'thickbox', '/wp-includes/js/thickbox/thickbox.css' );
</del><ins>+ $styles->add( 'thickbox', '/wp-includes/js/thickbox/thickbox.css', array(), '20121105' );
</ins><span class="cx"> $styles->add( 'farbtastic', '/wp-admin/css/farbtastic.css', array(), '1.3u1' );
</span><span class="cx"> $styles->add( 'wp-color-picker', "/wp-admin/css/color-picker$suffix.css" );
</span><span class="cx"> $styles->add( 'jcrop', "/wp-includes/js/jcrop/jquery.Jcrop.min.css", array(), '0.9.10' );
</span></span></pre>
</div>
</div>
</body>
</html>