<!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>[16671] trunk:
Prevent double Thickbox caption line for Dashboard QuickPress uploads.</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/16671">16671</a></dd>
<dt>Author</dt> <dd>markjaquith</dd>
<dt>Date</dt> <dd>2010-12-01 20:48:52 +0000 (Wed, 01 Dec 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>Prevent double Thickbox caption line for Dashboard QuickPress uploads. props ocean90. fixes <a href="http://trac.wordpress.org/ticket/15169">#15169</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpadminjsdashboarddevjs">trunk/wp-admin/js/dashboard.dev.js</a></li>
<li><a href="#trunkwpadminjsdashboardjs">trunk/wp-admin/js/dashboard.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="trunkwpadminjsdashboarddevjs"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/js/dashboard.dev.js (16670 => 16671)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/js/dashboard.dev.js 2010-12-01 20:43:39 UTC (rev 16670)
+++ trunk/wp-admin/js/dashboard.dev.js 2010-12-01 20:48:52 UTC (rev 16671)
</span><span class="lines">@@ -19,12 +19,8 @@
</span><span class="cx"> p.load( ajaxurl.replace( '/admin-ajax.php', '' ) + '/index-extra.php?jax=' + id, '', function() {
</span><span class="cx"> p.hide().slideDown('normal', function(){
</span><span class="cx"> $(this).css('display', '');
</span><del>- if ( 'dashboard_plugins' == id && $.isFunction(tb_init) )
- tb_init('#dashboard_plugins a.thickbox');
- if ( 'dashboard_quick_press' == id && $.isFunction(tb_init) ) {
- tb_init('#dashboard_quick_press a.thickbox');
</del><ins>+ if ( 'dashboard_quick_press' == id )
</ins><span class="cx"> quickPressLoad();
</span><del>- }
</del><span class="cx"> });
</span><span class="cx"> });
</span><span class="cx"> }, i * 500 );
</span><span class="lines">@@ -62,7 +58,6 @@
</span><span class="cx"> $('#dashboard_quick_press ul').find('li').each( function() {
</span><span class="cx"> $('#dashboard_recent_drafts ul').prepend( this );
</span><span class="cx"> } ).end().remove();
</span><del>- tb_init('a.thickbox');
</del><span class="cx"> quickPressLoad();
</span><span class="cx"> } );
</span><span class="cx"> return false;
</span></span></pre></div>
<a id="trunkwpadminjsdashboardjs"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/js/dashboard.js (16670 => 16671)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/js/dashboard.js 2010-12-01 20:43:39 UTC (rev 16670)
+++ trunk/wp-admin/js/dashboard.js 2010-12-01 20:48:52 UTC (rev 16671)
</span><span class="lines">@@ -1 +1 @@
</span><del>-var ajaxWidgets,ajaxPopulateWidgets,quickPressLoad;jQuery(document).ready(function(a){ajaxWidgets=["dashboard_incoming_links","dashboard_primary","dashboard_secondary","dashboard_plugins","dashboard_quick_press"];ajaxPopulateWidgets=function(b){show=function(g,c){var f,d=a("#"+g+" div.inside:visible").find(".widget-loading");if(d.length){f=d.parent();setTimeout(function(){f.load(ajaxurl.replace("/admin-ajax.php","")+"/index-extra.php?jax="+g,"",function(){f.hide().slideDown("normal",function(){a(this).css("display","");if("dashboard_plugins"==g&&a.isFunction(tb_init)){tb_init("#dashboard_plugins a.thickbox")}if("dashboard_quick_press"==g&&a.isFunction(tb_init)){tb_init("#dashboard_quick_press a.thickbox");quickPressLoad()}})})},c*500)}};if(b){b=b.toString();if(a.inArray(b,ajaxWidgets)!=-1){show(b,0)}}else{a.each(ajaxWidgets,function(c){show(this,c)})}};ajaxPopulateWidgets();postboxes.add_postbox_toggles(pagenow,{pbshow:ajaxPopulateWidgets});quickPressLoad=function(){var b=a("#quickpost-action"),c;c=a("#quick-press").submit(function(){a("#dashboard_quick_press #publishing-action img.waiting").css("visibility","visible");a('#quick-press .submit input[type="submit"], #quick-press .submit input[type="reset"]').attr("disabled","disabled");if("post"==b.val()){b.val("post-quickpress-publish")}a("#dashboard_quick_press div.inside").load(c.attr("action"),c.serializeArray(),function(){a("#dashboard_quick_press #publishing-action img.waiting").css("visibility","hidden");a('#quick-press .submit input[type="submit"], #quick-press .submit input[type="reset"]').attr("disabled","");a("#dashboard_quick_press ul").next("p").remove();a("#dashboard_quick_press ul").find("li").each(function(){a("#dashboard_recent_drafts ul").prepend(this)}).end().remove();tb_init("a.thickbox");quickPressLoad()});return false});a("#publish").click(function(){b.val("post-quickpress-publish")})}});
</del><span class="cx">\ No newline at end of file
</span><ins>+var ajaxWidgets,ajaxPopulateWidgets,quickPressLoad;jQuery(document).ready(function($){ajaxWidgets=["dashboard_incoming_links","dashboard_primary","dashboard_secondary","dashboard_plugins","dashboard_quick_press"];ajaxPopulateWidgets=function(el){show=function(id,i){var p,e=$("#"+id+" div.inside:visible").find(".widget-loading");if(e.length){p=e.parent();setTimeout(function(){p.load(ajaxurl.replace("/admin-ajax.php","")+"/index-extra.php?jax="+id,"",function(){p.hide().slideDown("normal",function(){$(this).css("display","");if("dashboard_quick_press"==id){quickPressLoad()}})})},i*500)}};if(el){el=el.toString();if($.inArray(el,ajaxWidgets)!=-1){show(el,0)}}else{$.each(ajaxWidgets,function(i){show(this,i)})}};ajaxPopulateWidgets();postboxes.add_postbox_toggles(pagenow,{pbshow:ajaxPopulateWidgets});quickPressLoad=function(){var act=$("#quickpost-action"),t;t=$("#quick-press").submit(function(){$("#dashboard_quick_press #publishing-action img.waiting").css("visibility","visible");$('#quick-press .submit input[type="submit"], #quick-press .submit input[type="reset"]').attr("disabled","disabled");if("post"==act.val()){act.val("post-quickpress-publish")}$("#dashboard_quick_press div.inside").load(t.attr("action"),t.serializeArray(),function(){$("#dashboard_quick_press #publishing-action img.waiting").css("visibility","hidden");$('#quick-press .submit input[type="submit"], #quick-press .submit input[type="reset"]').attr("disabled","");$("#dashboard_quick_press ul").next("p").remove();$("#dashboard_quick_press ul").find("li").each(function(){$("#dashboard_recent_drafts ul").prepend(this)}).end().remove();quickPressLoad()});return false});$("#publish").click(function(){act.val("post-quickpress-publish")})}});
</ins><span class="cx">\ No newline at end of file
</span></span></pre></div>
<a id="trunkwpincludesscriptloaderphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/script-loader.php (16670 => 16671)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/script-loader.php 2010-12-01 20:43:39 UTC (rev 16670)
+++ trunk/wp-includes/script-loader.php 2010-12-01 20:48:52 UTC (rev 16671)
</span><span class="lines">@@ -414,7 +414,7 @@
</span><span class="cx">
</span><span class="cx"> $scripts->add( 'farbtastic', '/wp-admin/js/farbtastic.js', array('jquery'), '1.2' );
</span><span class="cx">
</span><del>- $scripts->add( 'dashboard', "/wp-admin/js/dashboard$suffix.js", array( 'jquery', 'admin-comments', 'postbox' ), '20100819' );
</del><ins>+ $scripts->add( 'dashboard', "/wp-admin/js/dashboard$suffix.js", array( 'jquery', 'admin-comments', 'postbox' ), '20101201' );
</ins><span class="cx"> $scripts->add_data( 'dashboard', 'group', 1 );
</span><span class="cx">
</span><span class="cx"> $scripts->add( 'hoverIntent', "/wp-includes/js/hoverIntent$suffix.js", array('jquery'), '20090102' );
</span></span></pre>
</div>
</div>
</body>
</html>