<!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>[26323] trunk/src/wp-admin/js: Fix thickbox positioning on Manage Themes screen.</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/26323">26323</a></dd>
<dt>Author</dt> <dd>SergeyBiryukov</dd>
<dt>Date</dt> <dd>2013-11-22 08:05:42 +0000 (Fri, 22 Nov 2013)</dd>
</dl>
<h3>Log Message</h3>
<pre>Fix thickbox positioning on Manage Themes screen. Adjust thickbox resizing code on various screens for new toolbar height.
see <a href="http://core.trac.wordpress.org/ticket/26078">#26078</a>. fixes <a href="http://core.trac.wordpress.org/ticket/26140">#26140</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpadminjsmediauploadjs">trunk/src/wp-admin/js/media-upload.js</a></li>
<li><a href="#trunksrcwpadminjsplugininstalljs">trunk/src/wp-admin/js/plugin-install.js</a></li>
<li><a href="#trunksrcwpadminjsthemeinstalljs">trunk/src/wp-admin/js/theme-install.js</a></li>
<li><a href="#trunksrcwpadminjsthemejs">trunk/src/wp-admin/js/theme.js</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcwpadminjsmediauploadjs"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-admin/js/media-upload.js (26322 => 26323)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-admin/js/media-upload.js 2013-11-22 07:35:26 UTC (rev 26322)
+++ trunk/src/wp-admin/js/media-upload.js 2013-11-22 08:05:42 UTC (rev 26323)
</span><span class="lines">@@ -50,17 +50,22 @@
</span><span class="cx"> var tb_position;
</span><span class="cx"> (function($) {
</span><span class="cx"> tb_position = function() {
</span><del>- var tbWindow = $('#TB_window'), width = $(window).width(), H = $(window).height(), W = ( 720 < width ) ? 720 : width, adminbar_height = 0;
</del><ins>+ var tbWindow = $('#TB_window'),
+ width = $(window).width(),
+ H = $(window).height(),
+ W = ( 720 < width ) ? 720 : width,
+ adminbar_height = 0;
</ins><span class="cx">
</span><del>- if ( $('body.admin-bar').length )
- adminbar_height = 28;
</del><ins>+ if ( $('body.admin-bar').length ) {
+ adminbar_height = parseInt( jQuery('#wpadminbar').css('height'), 10 );
+ }
</ins><span class="cx">
</span><span class="cx"> if ( tbWindow.size() ) {
</span><span class="cx"> tbWindow.width( W - 50 ).height( H - 45 - adminbar_height );
</span><span class="cx"> $('#TB_iframeContent').width( W - 50 ).height( H - 75 - adminbar_height );
</span><del>- tbWindow.css({'margin-left': '-' + parseInt((( W - 50 ) / 2),10) + 'px'});
- if ( typeof document.body.style.maxWidth != 'undefined' )
- tbWindow.css({'top': 20 + adminbar_height + 'px','margin-top':'0'});
</del><ins>+ tbWindow.css({'margin-left': '-' + parseInt( ( ( W - 50 ) / 2 ), 10 ) + 'px'});
+ if ( typeof document.body.style.maxWidth !== 'undefined' )
+ tbWindow.css({'top': 20 + adminbar_height + 'px', 'margin-top': '0'});
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> return $('a.thickbox').each( function() {
</span></span></pre></div>
<a id="trunksrcwpadminjsplugininstalljs"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-admin/js/plugin-install.js (26322 => 26323)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-admin/js/plugin-install.js 2013-11-22 07:35:26 UTC (rev 26322)
+++ trunk/src/wp-admin/js/plugin-install.js 2013-11-22 08:05:42 UTC (rev 26323)
</span><span class="lines">@@ -4,17 +4,22 @@
</span><span class="cx"> var tb_position;
</span><span class="cx"> jQuery(document).ready(function($) {
</span><span class="cx"> tb_position = function() {
</span><del>- var tbWindow = $('#TB_window'), width = $(window).width(), H = $(window).height(), W = ( 720 < width ) ? 720 : width, adminbar_height = 0;
</del><ins>+ var tbWindow = $('#TB_window'),
+ width = $(window).width(),
+ H = $(window).height(),
+ W = ( 720 < width ) ? 720 : width,
+ adminbar_height = 0;
</ins><span class="cx">
</span><del>- if ( $('body.admin-bar').length )
- adminbar_height = 28;
</del><ins>+ if ( $('body.admin-bar').length ) {
+ adminbar_height = parseInt( jQuery('#wpadminbar').css('height'), 10 );
+ }
</ins><span class="cx">
</span><span class="cx"> if ( tbWindow.size() ) {
</span><span class="cx"> tbWindow.width( W - 50 ).height( H - 45 - adminbar_height );
</span><span class="cx"> $('#TB_iframeContent').width( W - 50 ).height( H - 75 - adminbar_height );
</span><del>- tbWindow.css({'margin-left': '-' + parseInt((( W - 50 ) / 2),10) + 'px'});
- if ( typeof document.body.style.maxWidth != 'undefined' )
- tbWindow.css({'top': 20 + adminbar_height + 'px','margin-top':'0'});
</del><ins>+ tbWindow.css({'margin-left': '-' + parseInt( ( ( W - 50 ) / 2 ), 10 ) + 'px'});
+ if ( typeof document.body.style.maxWidth !== 'undefined' )
+ tbWindow.css({'top': 20 + adminbar_height + 'px', 'margin-top': '0'});
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> return $('a.thickbox').each( function() {
</span></span></pre></div>
<a id="trunksrcwpadminjsthemeinstalljs"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-admin/js/theme-install.js (26322 => 26323)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-admin/js/theme-install.js 2013-11-22 07:35:26 UTC (rev 26322)
+++ trunk/src/wp-admin/js/theme-install.js 2013-11-22 08:05:42 UTC (rev 26323)
</span><span class="lines">@@ -23,33 +23,6 @@
</span><span class="cx"> });
</span><span class="cx">
</span><span class="cx"> /**
</span><del>- * Theme Browser Thickbox
- *
- * Aligns theme browser thickbox.
- */
-var tb_position;
-jQuery(document).ready( function($) {
- tb_position = function() {
- var tbWindow = $('#TB_window'), width = $(window).width(), H = $(window).height(), W = ( 1040 < width ) ? 1040 : width, adminbar_height = 0;
-
- if ( $('body.admin-bar').length ) {
- adminbar_height = 28;
- }
-
- if ( tbWindow.size() ) {
- tbWindow.width( W - 50 ).height( H - 45 - adminbar_height );
- $('#TB_iframeContent').width( W - 50 ).height( H - 75 - adminbar_height );
- tbWindow.css({'margin-left': '-' + parseInt( ( ( W - 50 ) / 2 ), 10 ) + 'px'});
- if ( typeof document.body.style.maxWidth !== 'undefined' ) {
- tbWindow.css({'top': 20 + adminbar_height + 'px','margin-top':'0'});
- }
- }
- };
-
- $(window).resize(function(){ tb_position(); });
-});
-
-/**
</del><span class="cx"> * Theme Install
</span><span class="cx"> *
</span><span class="cx"> * Displays theme previews on theme install pages.
</span></span></pre></div>
<a id="trunksrcwpadminjsthemejs"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-admin/js/theme.js (26322 => 26323)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-admin/js/theme.js 2013-11-22 07:35:26 UTC (rev 26322)
+++ trunk/src/wp-admin/js/theme.js 2013-11-22 08:05:42 UTC (rev 26323)
</span><span class="lines">@@ -661,3 +661,30 @@
</span><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> })( jQuery );
</span><ins>+
+// Align theme browser thickbox
+var tb_position;
+jQuery(document).ready( function($) {
+ tb_position = function() {
+ var tbWindow = $('#TB_window'),
+ width = $(window).width(),
+ H = $(window).height(),
+ W = ( 1040 < width ) ? 1040 : width,
+ adminbar_height = 0;
+
+ if ( $('body.admin-bar').length ) {
+ adminbar_height = parseInt( jQuery('#wpadminbar').css('height'), 10 );
+ }
+
+ if ( tbWindow.size() ) {
+ tbWindow.width( W - 50 ).height( H - 45 - adminbar_height );
+ $('#TB_iframeContent').width( W - 50 ).height( H - 75 - adminbar_height );
+ tbWindow.css({'margin-left': '-' + parseInt( ( ( W - 50 ) / 2 ), 10 ) + 'px'});
+ if ( typeof document.body.style.maxWidth !== 'undefined' ) {
+ tbWindow.css({'top': 20 + adminbar_height + 'px', 'margin-top': '0'});
+ }
+ }
+ };
+
+ $(window).resize(function(){ tb_position(); });
+});
</ins></span></pre>
</div>
</div>
</body>
</html>