<!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>[12677] trunk/wp-includes:
Show error message in TB when iframes support is turned off in the browser
, props nacin, fixes #10939</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/12677">12677</a></dd>
<dt>Author</dt> <dd>azaozz</dd>
<dt>Date</dt> <dd>2010-01-09 01:17:45 +0000 (Sat, 09 Jan 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>Show error message in TB when iframes support is turned off in the browser, props nacin, fixes <a href="http://trac.wordpress.org/ticket/10939">#10939</a></pre>
<h3>Modified Paths</h3>
<ul>
<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="trunkwpincludesjsthickboxthickboxjs"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/js/thickbox/thickbox.js (12676 => 12677)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/js/thickbox/thickbox.js 2010-01-09 00:20:05 UTC (rev 12676)
+++ trunk/wp-includes/js/thickbox/thickbox.js 2010-01-09 01:17:45 UTC (rev 12677)
</span><span class="lines">@@ -40,7 +40,7 @@
</span><span class="cx"> jQuery("body","html").css({height: "100%", width: "100%"});
</span><span class="cx"> jQuery("html").css("overflow","hidden");
</span><span class="cx"> if (document.getElementById("TB_HideSelect") === null) {//iframe to hide select elements in ie6
</span><del>- jQuery("body").append("<iframe id='TB_HideSelect'></iframe><div id='TB_overlay'></div><div id='TB_window'></div>");
</del><ins>+ jQuery("body").append("<iframe id='TB_HideSelect'>"+thickboxL10n.noiframes+"</iframe><div id='TB_overlay'></div><div id='TB_window'></div>");
</ins><span class="cx"> jQuery("#TB_overlay").click(tb_remove);
</span><span class="cx"> }
</span><span class="cx"> }else{//all others
</span><span class="lines">@@ -198,10 +198,10 @@
</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;' > </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+"'><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>");
</ins><span class="cx"> }else{//iframe modal
</span><span class="cx"> jQuery("#TB_overlay").unbind();
</span><del>- 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;'> </iframe>");
</del><ins>+ 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>");
</ins><span class="cx"> }
</span><span class="cx"> }else{// not an iframe, ajax
</span><span class="cx"> if(jQuery("#TB_window").css("display") != "block"){
</span></span></pre></div>
<a id="trunkwpincludesscriptloaderphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/script-loader.php (12676 => 12677)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/script-loader.php 2010-01-09 00:20:05 UTC (rev 12676)
+++ trunk/wp-includes/script-loader.php 2010-01-09 01:17:45 UTC (rev 12677)
</span><span class="lines">@@ -165,7 +165,7 @@
</span><span class="cx"> $scripts->add( 'jquery-table-hotkeys', "/wp-includes/js/jquery/jquery.table-hotkeys$suffix.js", array('jquery', 'jquery-hotkeys'), '20090102' );
</span><span class="cx"> $scripts->add_data( 'jquery-table-hotkeys', 'group', 1 );
</span><span class="cx">
</span><del>- $scripts->add( 'thickbox', "/wp-includes/js/thickbox/thickbox.js", array('jquery'), '3.1-20091124');
</del><ins>+ $scripts->add( 'thickbox', "/wp-includes/js/thickbox/thickbox.js", array('jquery'), '3.1-20100108');
</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">@@ -173,6 +173,7 @@
</span><span class="cx"> 'image' => __('Image'),
</span><span class="cx"> 'of' => __('of'),
</span><span class="cx"> 'close' => __('Close'),
</span><ins>+ 'noiframes' => __('This feature requires inline frames. You have iframes disabled or your browser does not support them.'),
</ins><span class="cx"> 'l10n_print_after' => 'try{convertEntities(thickboxL10n);}catch(e){};'
</span><span class="cx"> ) );
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>