<!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" /><style type="text/css"><!--
#msg dl { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer { 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 #fc0 solid; padding: 6px; }
#msg ul, pre { overflow: auto; }
#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>
<title>[14030] trunk: TB_iframe fixes for stuff that broke in r14015.</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/14030">14030</a></dd>
<dt>Author</dt> <dd>markjaquith</dd>
<dt>Date</dt> <dd>2010-04-07 13:52:12 +0000 (Wed, 07 Apr 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>TB_iframe fixes for stuff that broke in r14015. props scribu. fixes <a href="http://trac.wordpress.org/ticket/12878">#12878</a>. see <a href="http://trac.wordpress.org/ticket/12792">#12792</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpadminjsplugininstalldevjs">trunk/wp-admin/js/plugin-install.dev.js</a></li>
<li><a href="#trunkwpadminjsplugininstalljs">trunk/wp-admin/js/plugin-install.js</a></li>
<li><a href="#trunkwpadminjsthemepreviewdevjs">trunk/wp-admin/js/theme-preview.dev.js</a></li>
<li><a href="#trunkwpadminjsthemepreviewjs">trunk/wp-admin/js/theme-preview.js</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>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpadminjsplugininstalldevjs"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/js/plugin-install.dev.js (14029 => 14030)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/js/plugin-install.dev.js 2010-04-07 13:49:41 UTC (rev 14029)
+++ trunk/wp-admin/js/plugin-install.dev.js 2010-04-07 13:52:12 UTC (rev 14030)
</span><span class="lines">@@ -22,6 +22,8 @@
</span><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> thickDims().click( function() {
</span><ins>+ tb_click.call(this);
+
</ins><span class="cx"> $('#TB_title').css({'background-color':'#222','color':'#cfcfcf'});
</span><span class="cx"> $('#TB_ajaxWindowTitle').html('<strong>' + plugininstallL10n.plugin_information + '</strong>&nbsp;' + $(this).attr('title') );
</span><span class="cx"> return false;
</span></span></pre></div>
<a id="trunkwpadminjsplugininstalljs"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/js/plugin-install.js (14029 => 14030)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/js/plugin-install.js 2010-04-07 13:49:41 UTC (rev 14029)
+++ trunk/wp-admin/js/plugin-install.js 2010-04-07 13:52:12 UTC (rev 14030)
</span><span class="lines">@@ -1 +1 @@
</span><del>-jQuery(document).ready(function(b){var a=function(){var f=b("#TB_window"),e=b(window).width(),d=b(window).height(),c=(720<e)?720:e;if(f.size()){f.width(c-50).height(d-45);b("#TB_iframeContent").width(c-50).height(d-75);f.css({"margin-left":"-"+parseInt(((c-50)/2),10)+"px"});if(!(b.browser.msie&&b.browser.version.substr(0,1)<7)){f.css({top:"20px","margin-top":"0"})}}return b("#dashboard_plugins a.thickbox, .plugins a.thickbox").each(function(){var g=b(this).attr("href");if(!g){return}g=g.replace(/&width=[0-9]+/g,"");g=g.replace(/&height=[0-9]+/g,"");b(this).attr("href",g+"&width="+(c-80)+"&height="+(d-85))})};a().click(function(){b("#TB_title").css({"background-color":"#222",color:"#cfcfcf"});b("#TB_ajaxWindowTitle").html("<strong>"+plugininstallL10n.plugin_information+"</strong>&nbsp;"+b(this).attr("title"));return false});b("#plugin-information #sidemenu a").click(function(){var c=b(this).attr("name");b("#plugin-information-header a.current").removeClass("current");b(this).addClass("current");b("#section-holder div.section").hide();b("#section-"+c).show();return false});b('#install-plugins .action-links .install-now').click(function(){return confirm( plugininstallL10n.ays);});});
</del><span class="cx">\ No newline at end of file
</span><ins>+jQuery(document).ready(function($){var thickDims=function(){var tbWindow=$("#TB_window"),width=$(window).width(),H=$(window).height(),W=(720<width)?720:width;if(tbWindow.size()){tbWindow.width(W-50).height(H-45);$("#TB_iframeContent").width(W-50).height(H-75);tbWindow.css({"margin-left":"-"+parseInt(((W-50)/2),10)+"px"});if(!($.browser.msie&&$.browser.version.substr(0,1)<7)){tbWindow.css({top:"20px","margin-top":"0"})}}return $("#dashboard_plugins a.thickbox, .plugins a.thickbox").each(function(){var href=$(this).attr("href");if(!href){return}href=href.replace(/&width=[0-9]+/g,"");href=href.replace(/&height=[0-9]+/g,"");$(this).attr("href",href+"&width="+(W-80)+"&height="+(H-85))})};thickDims().click(function(){tb_click.call(this);$("#TB_title").css({"background-color":"#222",color:"#cfcfcf"});$("#TB_ajaxWindowTitle").html("<strong>"+plugininstallL10n.plugin_information+"</strong>&nbsp;"+$(this).attr("title"));return false});$("#plugin-information #sidemenu a").click(function(){var tab=$(this).attr("name");$("#plugin-information-header a.current").removeClass("current");$(this).addClass("current");$("#section-holder div.section").hide();$("#section-"+tab).show();return false});$("#install-plugins .action-links .install-now").click(function(){return confirm(plugininstallL10n.ays)})});
</ins><span class="cx">\ No newline at end of file
</span></span></pre></div>
<a id="trunkwpadminjsthemepreviewdevjs"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/js/theme-preview.dev.js (14029 => 14030)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/js/theme-preview.dev.js 2010-04-07 13:49:41 UTC (rev 14029)
+++ trunk/wp-admin/js/theme-preview.dev.js 2010-04-07 13:52:12 UTC (rev 14030)
</span><span class="lines">@@ -21,6 +21,8 @@
</span><span class="cx"> $(window).resize( function() { thickDims() } );
</span><span class="cx">
</span><span class="cx"> $('a.thickbox-preview').click( function() {
</span><ins>+ tb_click.call(this);
+
</ins><span class="cx"> var alink = $(this).parents('.available-theme').find('.activatelink'), link = '', href = $(this).attr('href'), url, text;
</span><span class="cx">
</span><span class="cx"> if ( tbWidth = href.match(/&tbWidth=[0-9]+/) )
</span><span class="lines">@@ -48,6 +50,7 @@
</span><span class="cx">
</span><span class="cx"> $('#TB_iframeContent').width('100%');
</span><span class="cx"> thickDims();
</span><ins>+
</ins><span class="cx"> return false;
</span><span class="cx"> } );
</span><span class="cx">
</span></span></pre></div>
<a id="trunkwpadminjsthemepreviewjs"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/js/theme-preview.js (14029 => 14030)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/js/theme-preview.js 2010-04-07 13:49:41 UTC (rev 14029)
+++ trunk/wp-admin/js/theme-preview.js 2010-04-07 13:52:12 UTC (rev 14030)
</span><span class="lines">@@ -1 +1 @@
</span><del>-var thickDims,tbWidth,tbHeight;jQuery(document).ready(function(a){thickDims=function(){var f=a("#TB_window"),d=a(window).height(),b=a(window).width(),c,e;c=(tbWidth&&tbWidth<b-90)?tbWidth:b-90;e=(tbHeight&&tbHeight<d-60)?tbHeight:d-60;if(f.size()){f.width(c).height(e);a("#TB_iframeContent").width(c).height(e-27);f.css({"margin-left":"-"+parseInt((c/2),10)+"px"});if(typeof document.body.style.maxWidth!="undefined"){f.css({top:"30px","margin-top":"0"})}}};thickDims();a(window).resize(function(){thickDims()});a("a.thickbox-preview").click(function(){var d=a(this).parents(".available-theme").find(".activatelink"),e="",b=a(this).attr("href"),c,f;if(tbWidth=b.match(/&tbWidth=[0-9]+/)){tbWidth=parseInt(tbWidth[0].replace(/[^0-9]+/g,""),10)}else{tbWidth=a(window).width()-90}if(tbHeight=b.match(/&tbHeight=[0-9]+/)){tbHeight=parseInt(tbHeight[0].replace(/[^0-9]+/g,""),10)}else{tbHeight=a(window).height()-60}if(d.length){c=d.attr("href")||"";f=d.attr("title")||"";e='&nbsp; <a href="'+c+'" target="_top" class="tb-theme-preview-link">'+f+"</a>"}else{f=a(this).attr("title")||"";e='&nbsp; <span class="tb-theme-preview-link">'+f+"</span>"}a("#TB_title").css({"background-color":"#222",color:"#dfdfdf"});a("#TB_closeAjaxWindow").css({"float":"left"});a("#TB_ajaxWindowTitle").css({"float":"right"}).html(e);a("#TB_iframeContent").width("100%");thickDims();return false});a(".theme-detail").click(function(){a(this).siblings(".themedetaildiv").toggle();return false})});
</del><span class="cx">\ No newline at end of file
</span><ins>+var thickDims,tbWidth,tbHeight;jQuery(document).ready(function($){thickDims=function(){var tbWindow=$("#TB_window"),H=$(window).height(),W=$(window).width(),w,h;w=(tbWidth&&tbWidth<W-90)?tbWidth:W-90;h=(tbHeight&&tbHeight<H-60)?tbHeight:H-60;if(tbWindow.size()){tbWindow.width(w).height(h);$("#TB_iframeContent").width(w).height(h-27);tbWindow.css({"margin-left":"-"+parseInt((w/2),10)+"px"});if(typeof document.body.style.maxWidth!="undefined"){tbWindow.css({top:"30px","margin-top":"0"})}}};thickDims();$(window).resize(function(){thickDims()});$("a.thickbox-preview").click(function(){tb_click.call(this);var alink=$(this).parents(".available-theme").find(".activatelink"),link="",href=$(this).attr("href"),url,text;if(tbWidth=href.match(/&tbWidth=[0-9]+/)){tbWidth=parseInt(tbWidth[0].replace(/[^0-9]+/g,""),10)}else{tbWidth=$(window).width()-90}if(tbHeight=href.match(/&tbHeight=[0-9]+/)){tbHeight=parseInt(tbHeight[0].replace(/[^0-9]+/g,""),10)}else{tbHeight=$(window).height()-60}if(alink.length){url=alink.attr("href")||"";text=alink.attr("title")||"";link='&nbsp; <a href="'+url+'" target="_top" class="tb-theme-preview-link">'+text+"</a>"}else{text=$(this).attr("title")||"";link='&nbsp; <span class="tb-theme-preview-link">'+text+"</span>"}$("#TB_title").css({"background-color":"#222",color:"#dfdfdf"});$("#TB_closeAjaxWindow").css({"float":"left"});$("#TB_ajaxWindowTitle").css({"float":"right"}).html(link);$("#TB_iframeContent").width("100%");thickDims();return false});$(".theme-detail").click(function(){$(this).siblings(".themedetaildiv").toggle();return false})});
</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 (14029 => 14030)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/js/thickbox/thickbox.js 2010-04-07 13:49:41 UTC (rev 14029)
+++ trunk/wp-includes/js/thickbox/thickbox.js 2010-04-07 13:52:12 UTC (rev 14030)
</span><span class="lines">@@ -23,14 +23,16 @@
</span><span class="cx">
</span><span class="cx"> //add thickbox to href & area elements that have a class of .thickbox
</span><span class="cx"> function tb_init(domChunk){
</span><del>- jQuery(domChunk).live('click', function(){
</del><ins>+ jQuery(domChunk).live('click', tb_click);
+}
+
+function tb_click(){
</ins><span class="cx"> var t = this.title || this.name || null;
</span><span class="cx"> var a = this.href || this.alt;
</span><span class="cx"> var g = this.rel || false;
</span><span class="cx"> tb_show(t,a,g);
</span><span class="cx"> this.blur();
</span><span class="cx"> return false;
</span><del>- });
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> function tb_show(caption, url, imageGroup) {//function called when the user clicks on a thickbox link
</span></span></pre></div>
<a id="trunkwpincludesscriptloaderphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/script-loader.php (14029 => 14030)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/script-loader.php 2010-04-07 13:49:41 UTC (rev 14029)
+++ trunk/wp-includes/script-loader.php 2010-04-07 13:52:12 UTC (rev 14030)
</span><span class="lines">@@ -167,7 +167,7 @@
</span><span class="cx"> $scripts->add( 'jquery-autocomplete', "/wp-includes/js/jquery/autocomplete$suffix.js", array('jquery'), '1.1' );
</span><span class="cx"> $scripts->add_data( 'jquery-autocomplete', 'group', 1 );
</span><span class="cx">
</span><del>- $scripts->add( 'thickbox', "/wp-includes/js/thickbox/thickbox.js", array('jquery'), '3.1-20104104');
</del><ins>+ $scripts->add( 'thickbox', "/wp-includes/js/thickbox/thickbox.js", array('jquery'), '3.1-20100407');
</ins><span class="cx"> $scripts->add_data( 'thickbox', 'group', 1 );
</span><span class="cx"> $scripts->localize( 'thickbox', 'thickboxL10n', array(
</span><span class="cx"> 'next' => __('Next &gt;'),
</span><span class="lines">@@ -337,7 +337,7 @@
</span><span class="cx"> 'l10n_print_after' => 'try{convertEntities(wordCountL10n);}catch(e){};'
</span><span class="cx"> ));
</span><span class="cx">
</span><del>- $scripts->add( 'theme-preview', "/wp-admin/js/theme-preview$suffix.js", array( 'thickbox', 'jquery' ), '20090319' );
</del><ins>+ $scripts->add( 'theme-preview', "/wp-admin/js/theme-preview$suffix.js", array( 'thickbox', 'jquery' ), '20100407' );
</ins><span class="cx"> $scripts->add_data( 'theme-preview', 'group', 1 );
</span><span class="cx">
</span><span class="cx"> $scripts->add( 'inline-edit-post', "/wp-admin/js/inline-edit-post$suffix.js", array( 'jquery', 'suggest' ), '20091202' );
</span><span class="lines">@@ -356,7 +356,7 @@
</span><span class="cx"> 'l10n_print_after' => 'try{convertEntities(inlineEditL10n);}catch(e){};'
</span><span class="cx"> ) );
</span><span class="cx">
</span><del>- $scripts->add( 'plugin-install', "/wp-admin/js/plugin-install$suffix.js", array( 'jquery' ), '20100402' );
</del><ins>+ $scripts->add( 'plugin-install', "/wp-admin/js/plugin-install$suffix.js", array( 'jquery', 'thickbox' ), '20100407' );
</ins><span class="cx"> $scripts->add_data( 'plugin-install', 'group', 1 );
</span><span class="cx"> $scripts->localize( 'plugin-install', 'plugininstallL10n', array(
</span><span class="cx"> 'plugin_information' => __('Plugin Information:'),
</span></span></pre>
</div>
</div>
</body>
</html>