<!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>[19225] trunk: Revert [19223] and only stop showing the checkbox, props nacin, see #19174</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/19225">19225</a></dd>
<dt>Author</dt> <dd>azaozz</dd>
<dt>Date</dt> <dd>2011-11-08 22:34:09 +0000 (Tue, 08 Nov 2011)</dd>
</dl>

<h3>Log Message</h3>
<pre>Revert <a href="http://core.trac.wordpress.org/changeset/19223">[19223]</a> and only stop showing the checkbox, props nacin, see <a href="http://core.trac.wordpress.org/ticket/19174">#19174</a></pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpadminincludesfilephp">trunk/wp-admin/includes/file.php</a></li>
<li><a href="#trunkwpincludesjspluploadhandlersdevjs">trunk/wp-includes/js/plupload/handlers.dev.js</a></li>
<li><a href="#trunkwpincludesjspluploadhandlersjs">trunk/wp-includes/js/plupload/handlers.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="trunkwpadminincludesfilephp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/includes/file.php (19224 => 19225)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/file.php        2011-11-08 22:26:49 UTC (rev 19224)
+++ trunk/wp-admin/includes/file.php        2011-11-08 22:34:09 UTC (rev 19225)
</span><span class="lines">@@ -329,6 +329,20 @@
</span><span class="cx">         if ( false === @ move_uploaded_file( $file['tmp_name'], $tmp_file ) )
</span><span class="cx">                 return $upload_error_handler( $file, sprintf( __('The uploaded file could not be moved to %s.' ), $uploads['path'] ) );
</span><span class="cx"> 
</span><ins>+        // If a resize was requested, perform the resize.
+        $image_resize = isset( $_POST['image_resize'] ) &amp;&amp; 'true' == $_POST['image_resize'];
+        $do_resize = apply_filters( 'wp_upload_resize', $image_resize );
+        $size = @getimagesize( $tmp_file );
+        if ( $do_resize &amp;&amp; $size ) {
+                $old_temp = $tmp_file;
+                $tmp_file = image_resize( $tmp_file, (int) get_option('large_size_w'), (int) get_option('large_size_h'), 0, 'resized');
+                if ( ! is_wp_error($tmp_file) ) {
+                        unlink($old_temp);
+                } else {
+                        $tmp_file = $old_temp;
+                }
+        }
+
</ins><span class="cx">         // Copy the temporary file into its destination
</span><span class="cx">         $new_file = $uploads['path'] . &quot;/$filename&quot;;
</span><span class="cx">         copy( $tmp_file, $new_file );
</span></span></pre></div>
<a id="trunkwpincludesjspluploadhandlersdevjs"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/js/plupload/handlers.dev.js (19224 => 19225)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/js/plupload/handlers.dev.js        2011-11-08 22:26:49 UTC (rev 19224)
+++ trunk/wp-includes/js/plupload/handlers.dev.js        2011-11-08 22:34:09 UTC (rev 19225)
</span><span class="lines">@@ -78,6 +78,18 @@
</span><span class="cx">                 jQuery('#attachments-count').text(1 * jQuery('#attachments-count').text() + 1);
</span><span class="cx"> }
</span><span class="cx"> 
</span><ins>+function setResize(arg) {
+        if ( arg ) {
+                if ( uploader.features.jpgresize )
+                        uploader.settings['resize'] = { width: resize_width, height: resize_height, quality: 100 };
+                else
+                        uploader.settings.multipart_params.image_resize = true;
+        } else {
+                delete(uploader.settings.resize);
+                delete(uploader.settings.multipart_params.image_resize);
+        }
+}
+
</ins><span class="cx"> function prepareMediaItem(fileObj, serverData) {
</span><span class="cx">         var f = ( typeof shortform == 'undefined' ) ? 1 : 2, item = jQuery('#media-item-' + fileObj.id);
</span><span class="cx">         // Move the progress bar to 100%
</span><span class="lines">@@ -340,7 +352,20 @@
</span><span class="cx">         uploader_init = function() {
</span><span class="cx">                 uploader = new plupload.Uploader(wpUploaderInit);
</span><span class="cx"> 
</span><ins>+                $('#image_resize').bind('change', function() {
+                        var arg = $(this).prop('checked');
+
+                        setResize( arg );
+
+                        if ( arg )
+                                setUserSetting('upload_resize', '1');
+                        else
+                                deleteUserSetting('upload_resize');
+                });
+
</ins><span class="cx">                 uploader.bind('Init', function(up) {
</span><ins>+                        setResize( getUserSetting('upload_resize', false) );
+
</ins><span class="cx">                         if ( up.features.dragdrop ) {
</span><span class="cx">                                 $('#plupload-upload-ui').addClass('drag-drop');
</span><span class="cx">                                 $('#drag-drop-area').bind('dragover.wp-uploader', function(){ // dragenter doesn't fire right :(
</span></span></pre></div>
<a id="trunkwpincludesjspluploadhandlersjs"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/js/plupload/handlers.js (19224 => 19225)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/js/plupload/handlers.js        2011-11-08 22:26:49 UTC (rev 19224)
+++ trunk/wp-includes/js/plupload/handlers.js        2011-11-08 22:34:09 UTC (rev 19225)
</span><span class="lines">@@ -1 +1 @@
</span><del>-var topWin=window.dialogArguments||opener||parent||top,uploader,uploader_init;function fileDialogStart(){jQuery(&quot;#media-upload-error&quot;).empty()}function fileQueued(a){jQuery(&quot;.media-blank&quot;).remove();if(jQuery(&quot;form.type-form #media-items&quot;).children().length==1&amp;&amp;jQuery(&quot;.hidden&quot;,&quot;#media-items&quot;).length&gt;0){jQuery(&quot;.describe-toggle-on&quot;).show();jQuery(&quot;.describe-toggle-off&quot;).hide();jQuery(&quot;.slidetoggle&quot;).slideUp(200).siblings().removeClass(&quot;hidden&quot;)}jQuery(&quot;#media-items&quot;).append('&lt;div id=&quot;media-item-'+a.id+'&quot; class=&quot;media-item child-of-'+post_id+'&quot;&gt;&lt;div class=&quot;progress&quot;&gt;&lt;div class=&quot;bar&quot;&gt;&lt;/div&gt;&lt;/div&gt;&lt;div class=&quot;filename original&quot;&gt;&lt;span class=&quot;percent&quot;&gt;&lt;/span&gt; '+a.name+&quot;&lt;/div&gt;&lt;/div&gt;&quot;);jQuery(&quot;.progress&quot;,&quot;#media-item-&qu
 ot;+a.id).show();jQuery(&quot;#insert-gallery&quot;).prop(&quot;disabled&quot;,true)}function uploadStart(a){try{if(typeof topWin.tb_remove!=&quot;undefined&quot;){topWin.jQuery(&quot;#TB_overlay&quot;).unbind(&quot;click&quot;,topWin.tb_remove)}}catch(b){}return true}function uploadProgress(e,b,d){var a=jQuery(&quot;#media-items&quot;).width()-2,c=jQuery(&quot;#media-item-&quot;+e.id);jQuery(&quot;.bar&quot;,c).width(a*b/d);jQuery(&quot;.percent&quot;,c).html(Math.ceil(b/d*100)+&quot;%&quot;);if(b==d){jQuery(&quot;.bar&quot;,c).html('&lt;strong class=&quot;crunching&quot;&gt;'+pluploadL10n.crunching+&quot;&lt;/strong&gt;&quot;)}}function updateMediaForm(){var b=jQuery(&quot;form.type-form #media-items&quot;).children(),a=jQuery(&quot;#media-items&quot;).children();if(b.length==1){jQuery(&quot;.slidetoggle&quot;,b).slideDown(500).siblings().addClass(&quot;hidden&quot;).filter(&quot;.toggle&quot;).toggle()}if(a.not(&quot;.media-blank&quot;).length&gt;0){jQuery(&quot;.savebutt
 on&quot;).show()}else{jQuery(&quot;.savebutton&quot;).hide()}if(a.length&gt;1){jQuery(&quot;.insert-gallery&quot;).show()}else{jQuery(&quot;.insert-gallery&quot;).hide()}}function uploadSuccess(b,a){if(a.match(&quot;media-upload-error&quot;)){jQuery(&quot;#media-item-&quot;+b.id).html(a);return}prepareMediaItem(b,a);updateMediaForm();if(jQuery(&quot;#media-item-&quot;+b.id).hasClass(&quot;child-of-&quot;+post_id)){jQuery(&quot;#attachments-count&quot;).text(1*jQuery(&quot;#attachments-count&quot;).text()+1)}}function prepareMediaItem(c,a){var d=(typeof shortform==&quot;undefined&quot;)?1:2,b=jQuery(&quot;#media-item-&quot;+c.id);jQuery(&quot;.bar&quot;,b).remove();jQuery(&quot;.progress&quot;,b).hide();try{if(typeof topWin.tb_remove!=&quot;undefined&quot;){topWin.jQuery(&quot;#TB_overlay&quot;).click(topWin.tb_remove)}}catch(g){}if(isNaN(a)||!a){b.append(a);prepareMediaItemInit(c)}else{b.load(&quot;async-upload.php&quot;,{attachment_id:a,fetch:d},function(){prepareMediaItemI
 nit(c);updateMediaForm()})}}function prepareMediaItemInit(b){var a=jQuery(&quot;#media-item-&quot;+b.id);jQuery(&quot;.thumbnail&quot;,a).clone().attr(&quot;class&quot;,&quot;pinkynail toggle&quot;).prependTo(a);jQuery(&quot;.filename.original&quot;,a).replaceWith(jQuery(&quot;.filename.new&quot;,a));jQuery(&quot;a.toggle&quot;,a).click(function(){jQuery(this).siblings(&quot;.slidetoggle&quot;).slideToggle(350,function(){var d=jQuery(window).height(),e=jQuery(this).offset().top,f=jQuery(this).height(),c;if(d&amp;&amp;e&amp;&amp;f){c=e+f;if(c&gt;d&amp;&amp;(f+48)&lt;d){window.scrollBy(0,c-d+13)}else{if(c&gt;d){window.scrollTo(0,e-36)}}}});jQuery(this).siblings(&quot;.toggle&quot;).andSelf().toggle();jQuery(this).siblings(&quot;a.toggle&quot;).focus();return false});jQuery(&quot;a.delete&quot;,a).click(function(){jQuery.ajax({url:&quot;admin-ajax.php&quot;,type:&quot;post&quot;,success:deleteSuccess,error:deleteError,id:b.id,data:{id:this.id.replace(/[^0-9]/g,&quot;&quot;),act
 ion:&quot;trash-post&quot;,_ajax_nonce:this.href.replace(/^.*wpnonce=/,&quot;&quot;)}});return false});jQuery(&quot;a.undo&quot;,a).click(function(){jQuery.ajax({url:&quot;admin-ajax.php&quot;,type:&quot;post&quot;,id:b.id,data:{id:this.id.replace(/[^0-9]/g,&quot;&quot;),action:&quot;untrash-post&quot;,_ajax_nonce:this.href.replace(/^.*wpnonce=/,&quot;&quot;)},success:function(d,e){var c=jQuery(&quot;#media-item-&quot;+b.id);if(type=jQuery(&quot;#type-of-&quot;+b.id).val()){jQuery(&quot;#&quot;+type+&quot;-counter&quot;).text(jQuery(&quot;#&quot;+type+&quot;-counter&quot;).text()-0+1)}if(c.hasClass(&quot;child-of-&quot;+post_id)){jQuery(&quot;#attachments-count&quot;).text(jQuery(&quot;#attachments-count&quot;).text()-0+1)}jQuery(&quot;.filename .trashnotice&quot;,c).remove();jQuery(&quot;.filename .title&quot;,c).css(&quot;font-weight&quot;,&quot;normal&quot;);jQuery(&quot;a.undo&quot;,c).addClass(&quot;hidden&quot;);jQuery(&quot;a.describe-toggle-on, .menu_order_input&quot
 ;,c).show();c.css({backgroundColor:&quot;#ceb&quot;}).animate({backgroundColor:&quot;#fff&quot;},{queue:false,duration:500,complete:function(){jQuery(this).css({backgroundColor:&quot;&quot;})}}).removeClass(&quot;undo&quot;)}});return false});jQuery(&quot;#media-item-&quot;+b.id+&quot;.startopen&quot;).removeClass(&quot;startopen&quot;).slideToggle(500).siblings(&quot;.toggle&quot;).toggle()}function wpQueueError(a){jQuery(&quot;#media-upload-error&quot;).show().html('&lt;div class=&quot;error&quot;&gt;&lt;p&gt;'+a+&quot;&lt;/p&gt;&lt;/div&gt;&quot;)}function wpFileError(d,c){var b=jQuery(&quot;#media-item-&quot;+d.id),a=jQuery(&quot;.filename&quot;,b).text();b.html('&lt;div class=&quot;error-div&quot;&gt;&lt;a class=&quot;dismiss&quot; href=&quot;#&quot;&gt;'+pluploadL10n.dismiss+&quot;&lt;/a&gt;&lt;strong&gt;&quot;+pluploadL10n.error_uploading.replace(&quot;%s&quot;,a)+&quot;&lt;/strong&gt;&lt;br /&gt;&quot;+c+&quot;&lt;/div&gt;&quot;);b.find(&quot;a.dismiss&quot;).click(f
 unction(){jQuery(this).parents(&quot;.media-item&quot;).slideUp(200,function(){jQuery(this).remove()})})}function itemAjaxError(d,b){var c=jQuery(&quot;#media-item-&quot;+d),a=jQuery(&quot;.filename&quot;,c).text();c.html('&lt;div class=&quot;error-div&quot;&gt;&lt;a class=&quot;dismiss&quot; href=&quot;#&quot;&gt;'+pluploadL10n.dismiss+&quot;&lt;/a&gt;&lt;strong&gt;&quot;+pluploadL10n.error_uploading.replace(&quot;%s&quot;,a)+&quot;&lt;/strong&gt;&lt;br /&gt;&quot;+b+&quot;&lt;/div&gt;&quot;);c.find(&quot;a.dismiss&quot;).click(function(){jQuery(this).parents(&quot;.media-item&quot;).slideUp(200,function(){jQuery(this).remove()})})}function deleteSuccess(b,d){if(b==&quot;-1&quot;){return itemAjaxError(this.id,&quot;You do not have permission. Has your session expired?&quot;)}if(b==&quot;0&quot;){return itemAjaxError(this.id,&quot;Could not be deleted. Has it been deleted already?&quot;)}var c=this.id,a=jQuery(&quot;#media-item-&quot;+c);if(type=jQuery(&quot;#type-of-&quot;+
 c).val()){jQuery(&quot;#&quot;+type+&quot;-counter&quot;).text(jQuery(&quot;#&quot;+type+&quot;-counter&quot;).text()-1)}if(a.hasClass(&quot;child-of-&quot;+post_id)){jQuery(&quot;#attachments-count&quot;).text(jQuery(&quot;#attachments-count&quot;).text()-1)}if(jQuery(&quot;form.type-form #media-items&quot;).children().length==1&amp;&amp;jQuery(&quot;.hidden&quot;,&quot;#media-items&quot;).length&gt;0){jQuery(&quot;.toggle&quot;).toggle();jQuery(&quot;.slidetoggle&quot;).slideUp(200).siblings().removeClass(&quot;hidden&quot;)}jQuery(&quot;.toggle&quot;,a).toggle();jQuery(&quot;.slidetoggle&quot;,a).slideUp(200).siblings().removeClass(&quot;hidden&quot;);a.css({backgroundColor:&quot;#faa&quot;}).animate({backgroundColor:&quot;#f4f4f4&quot;},{queue:false,duration:500}).addClass(&quot;undo&quot;);jQuery(&quot;.filename:empty&quot;,a).remove();jQuery(&quot;.filename .title&quot;,a).css(&quot;font-weight&quot;,&quot;bold&quot;);jQuery(&quot;.filename&quot;,a).append('&lt;span cl
 ass=&quot;trashnotice&quot;&gt; '+pluploadL10n.deleted+&quot; &lt;/span&gt;&quot;).siblings(&quot;a.toggle&quot;).hide();jQuery(&quot;.filename&quot;,a).append(jQuery(&quot;a.undo&quot;,a).removeClass(&quot;hidden&quot;));jQuery(&quot;.menu_order_input&quot;,a).hide();return}function deleteError(c,b,a){}function uploadComplete(){jQuery(&quot;#insert-gallery&quot;).prop(&quot;disabled&quot;,false)}function switchUploader(b){var c=document.getElementById(&quot;flash-upload-ui&quot;),a=document.getElementById(&quot;html-upload-ui&quot;);if(b){c.style.display=&quot;block&quot;;a.style.display=&quot;none&quot;}else{c.style.display=&quot;none&quot;;a.style.display=&quot;block&quot;}}function dndHelper(a){var b=document.getElementById(&quot;dnd-helper&quot;);if(a){b.style.display=&quot;block&quot;}else{b.style.display=&quot;none&quot;}}function uploadError(b,c,a){switch(c){case plupload.FAILED:wpFileError(b,pluploadL10n.upload_failed);break;case plupload.FILE_EXTENSION_ERROR:wpFile
 Error(b,pluploadL10n.invalid_filetype);break;case plupload.FILE_SIZE_ERROR:wpQueueError(pluploadL10n.file_exceeds_size_limit.replace(&quot;%s&quot;,b.name));break;case plupload.IMAGE_FORMAT_ERROR:wpFileError(b,pluploadL10n.not_an_image);break;case plupload.IMAGE_MEMORY_ERROR:wpFileError(b,pluploadL10n.image_memory_exceeded);break;case plupload.IMAGE_DIMENSIONS_ERROR:wpFileError(b,pluploadL10n.image_dimensions_exceeded);break;case plupload.GENERIC_ERROR:wpQueueError(pluploadL10n.upload_failed);break;case plupload.IO_ERROR:wpQueueError(pluploadL10n.io_error);break;case plupload.HTTP_ERROR:wpQueueError(pluploadL10n.http_error);break;case plupload.INIT_ERROR:switchUploader(0);jQuery(&quot;.upload-html-bypass&quot;).hide();break;case plupload.SECURITY_ERROR:wpQueueError(pluploadL10n.security_error);break;default:wpFileError(b,pluploadL10n.default_error)}}jQuery(document).ready(function(a){a('input[type=&quot;radio&quot;]',&quot;#media-items&quot;).live(&quot;click&quot;,function(
 ){var b=a(this).closest(&quot;tr&quot;);if(a(b).hasClass(&quot;align&quot;)){setUserSetting(&quot;align&quot;,a(this).val())}else{if(a(b).hasClass(&quot;image-size&quot;)){setUserSetting(&quot;imgsize&quot;,a(this).val())}}});a(&quot;button.button&quot;,&quot;#media-items&quot;).live(&quot;click&quot;,function(){var b=this.className||&quot;&quot;;b=b.match(/url([^ '&quot;]+)/);if(b&amp;&amp;b[1]){setUserSetting(&quot;urlbutton&quot;,b[1]);a(this).siblings(&quot;.urlfield&quot;).val(a(this).attr(&quot;title&quot;))}});uploader_init=function(){uploader=new plupload.Uploader(wpUploaderInit);uploader.bind(&quot;Init&quot;,function(b){if(b.features.dragdrop){a(&quot;#plupload-upload-ui&quot;).addClass(&quot;drag-drop&quot;);a(&quot;#drag-drop-area&quot;).bind(&quot;dragover.wp-uploader&quot;,function(){a(this).css(&quot;border-color&quot;,&quot;#ccff55&quot;)}).bind(&quot;dragleave.wp-uploader, drop.wp-uploader&quot;,function(){a(this).css(&quot;border-color&quot;,&quot;&quot;)})
 }});uploader.init();uploader.bind(&quot;FilesAdded&quot;,function(b,c){a.each(c,function(e,d){fileQueued(d)});jQuery(&quot;#media-upload-error&quot;).html(&quot;&quot;);b.refresh();b.start()});uploader.bind(&quot;BeforeUpload&quot;,function(b,c){uploadStart(c)});uploader.bind(&quot;UploadProgress&quot;,function(b,c){uploadProgress(c,c.loaded,c.size)});uploader.bind(&quot;Error&quot;,function(b,c){uploadError(c.file,c.code,c.message);b.refresh()});uploader.bind(&quot;FileUploaded&quot;,function(b,d,c){uploadSuccess(d,c.response)});uploader.bind(&quot;UploadComplete&quot;,function(b,c){uploadComplete()})};if(typeof(wpUploaderInit)==&quot;object&quot;){uploader_init()}});
</del><span class="cx">\ No newline at end of file
</span><ins>+var topWin=window.dialogArguments||opener||parent||top,uploader,uploader_init;function fileDialogStart(){jQuery(&quot;#media-upload-error&quot;).empty()}function fileQueued(a){jQuery(&quot;.media-blank&quot;).remove();if(jQuery(&quot;form.type-form #media-items&quot;).children().length==1&amp;&amp;jQuery(&quot;.hidden&quot;,&quot;#media-items&quot;).length&gt;0){jQuery(&quot;.describe-toggle-on&quot;).show();jQuery(&quot;.describe-toggle-off&quot;).hide();jQuery(&quot;.slidetoggle&quot;).slideUp(200).siblings().removeClass(&quot;hidden&quot;)}jQuery(&quot;#media-items&quot;).append('&lt;div id=&quot;media-item-'+a.id+'&quot; class=&quot;media-item child-of-'+post_id+'&quot;&gt;&lt;div class=&quot;progress&quot;&gt;&lt;div class=&quot;bar&quot;&gt;&lt;/div&gt;&lt;/div&gt;&lt;div class=&quot;filename original&quot;&gt;&lt;span class=&quot;percent&quot;&gt;&lt;/span&gt; '+a.name+&quot;&lt;/div&gt;&lt;/div&gt;&quot;);jQuery(&quot;.progress&quot;,&quot;#media-item-&qu
 ot;+a.id).show();jQuery(&quot;#insert-gallery&quot;).prop(&quot;disabled&quot;,true)}function uploadStart(a){try{if(typeof topWin.tb_remove!=&quot;undefined&quot;){topWin.jQuery(&quot;#TB_overlay&quot;).unbind(&quot;click&quot;,topWin.tb_remove)}}catch(b){}return true}function uploadProgress(e,b,d){var a=jQuery(&quot;#media-items&quot;).width()-2,c=jQuery(&quot;#media-item-&quot;+e.id);jQuery(&quot;.bar&quot;,c).width(a*b/d);jQuery(&quot;.percent&quot;,c).html(Math.ceil(b/d*100)+&quot;%&quot;);if(b==d){jQuery(&quot;.bar&quot;,c).html('&lt;strong class=&quot;crunching&quot;&gt;'+pluploadL10n.crunching+&quot;&lt;/strong&gt;&quot;)}}function updateMediaForm(){var b=jQuery(&quot;form.type-form #media-items&quot;).children(),a=jQuery(&quot;#media-items&quot;).children();if(b.length==1){jQuery(&quot;.slidetoggle&quot;,b).slideDown(500).siblings().addClass(&quot;hidden&quot;).filter(&quot;.toggle&quot;).toggle()}if(a.not(&quot;.media-blank&quot;).length&gt;0){jQuery(&quot;.savebutt
 on&quot;).show()}else{jQuery(&quot;.savebutton&quot;).hide()}if(a.length&gt;1){jQuery(&quot;.insert-gallery&quot;).show()}else{jQuery(&quot;.insert-gallery&quot;).hide()}}function uploadSuccess(b,a){if(a.match(&quot;media-upload-error&quot;)){jQuery(&quot;#media-item-&quot;+b.id).html(a);return}prepareMediaItem(b,a);updateMediaForm();if(jQuery(&quot;#media-item-&quot;+b.id).hasClass(&quot;child-of-&quot;+post_id)){jQuery(&quot;#attachments-count&quot;).text(1*jQuery(&quot;#attachments-count&quot;).text()+1)}}function setResize(a){if(a){if(uploader.features.jpgresize){uploader.settings.resize={width:resize_width,height:resize_height,quality:100}}else{uploader.settings.multipart_params.image_resize=true}}else{delete (uploader.settings.resize);delete (uploader.settings.multipart_params.image_resize)}}function prepareMediaItem(c,a){var d=(typeof shortform==&quot;undefined&quot;)?1:2,b=jQuery(&quot;#media-item-&quot;+c.id);jQuery(&quot;.bar&quot;,b).remove();jQuery(&quot;.progres
 s&quot;,b).hide();try{if(typeof topWin.tb_remove!=&quot;undefined&quot;){topWin.jQuery(&quot;#TB_overlay&quot;).click(topWin.tb_remove)}}catch(g){}if(isNaN(a)||!a){b.append(a);prepareMediaItemInit(c)}else{b.load(&quot;async-upload.php&quot;,{attachment_id:a,fetch:d},function(){prepareMediaItemInit(c);updateMediaForm()})}}function prepareMediaItemInit(b){var a=jQuery(&quot;#media-item-&quot;+b.id);jQuery(&quot;.thumbnail&quot;,a).clone().attr(&quot;class&quot;,&quot;pinkynail toggle&quot;).prependTo(a);jQuery(&quot;.filename.original&quot;,a).replaceWith(jQuery(&quot;.filename.new&quot;,a));jQuery(&quot;a.toggle&quot;,a).click(function(){jQuery(this).siblings(&quot;.slidetoggle&quot;).slideToggle(350,function(){var d=jQuery(window).height(),e=jQuery(this).offset().top,f=jQuery(this).height(),c;if(d&amp;&amp;e&amp;&amp;f){c=e+f;if(c&gt;d&amp;&amp;(f+48)&lt;d){window.scrollBy(0,c-d+13)}else{if(c&gt;d){window.scrollTo(0,e-36)}}}});jQuery(this).siblings(&quot;.toggle&quot;).andSe
 lf().toggle();jQuery(this).siblings(&quot;a.toggle&quot;).focus();return false});jQuery(&quot;a.delete&quot;,a).click(function(){jQuery.ajax({url:&quot;admin-ajax.php&quot;,type:&quot;post&quot;,success:deleteSuccess,error:deleteError,id:b.id,data:{id:this.id.replace(/[^0-9]/g,&quot;&quot;),action:&quot;trash-post&quot;,_ajax_nonce:this.href.replace(/^.*wpnonce=/,&quot;&quot;)}});return false});jQuery(&quot;a.undo&quot;,a).click(function(){jQuery.ajax({url:&quot;admin-ajax.php&quot;,type:&quot;post&quot;,id:b.id,data:{id:this.id.replace(/[^0-9]/g,&quot;&quot;),action:&quot;untrash-post&quot;,_ajax_nonce:this.href.replace(/^.*wpnonce=/,&quot;&quot;)},success:function(d,e){var c=jQuery(&quot;#media-item-&quot;+b.id);if(type=jQuery(&quot;#type-of-&quot;+b.id).val()){jQuery(&quot;#&quot;+type+&quot;-counter&quot;).text(jQuery(&quot;#&quot;+type+&quot;-counter&quot;).text()-0+1)}if(c.hasClass(&quot;child-of-&quot;+post_id)){jQuery(&quot;#attachments-count&quot;).text(jQuery(&quot
 ;#attachments-count&quot;).text()-0+1)}jQuery(&quot;.filename .trashnotice&quot;,c).remove();jQuery(&quot;.filename .title&quot;,c).css(&quot;font-weight&quot;,&quot;normal&quot;);jQuery(&quot;a.undo&quot;,c).addClass(&quot;hidden&quot;);jQuery(&quot;a.describe-toggle-on, .menu_order_input&quot;,c).show();c.css({backgroundColor:&quot;#ceb&quot;}).animate({backgroundColor:&quot;#fff&quot;},{queue:false,duration:500,complete:function(){jQuery(this).css({backgroundColor:&quot;&quot;})}}).removeClass(&quot;undo&quot;)}});return false});jQuery(&quot;#media-item-&quot;+b.id+&quot;.startopen&quot;).removeClass(&quot;startopen&quot;).slideToggle(500).siblings(&quot;.toggle&quot;).toggle()}function wpQueueError(a){jQuery(&quot;#media-upload-error&quot;).show().html('&lt;div class=&quot;error&quot;&gt;&lt;p&gt;'+a+&quot;&lt;/p&gt;&lt;/div&gt;&quot;)}function wpFileError(d,c){var b=jQuery(&quot;#media-item-&quot;+d.id),a=jQuery(&quot;.filename&quot;,b).text();b.html('&lt;div class=&quo
 t;error-div&quot;&gt;&lt;a class=&quot;dismiss&quot; href=&quot;#&quot;&gt;'+pluploadL10n.dismiss+&quot;&lt;/a&gt;&lt;strong&gt;&quot;+pluploadL10n.error_uploading.replace(&quot;%s&quot;,a)+&quot;&lt;/strong&gt;&lt;br /&gt;&quot;+c+&quot;&lt;/div&gt;&quot;);b.find(&quot;a.dismiss&quot;).click(function(){jQuery(this).parents(&quot;.media-item&quot;).slideUp(200,function(){jQuery(this).remove()})})}function itemAjaxError(d,b){var c=jQuery(&quot;#media-item-&quot;+d),a=jQuery(&quot;.filename&quot;,c).text();c.html('&lt;div class=&quot;error-div&quot;&gt;&lt;a class=&quot;dismiss&quot; href=&quot;#&quot;&gt;'+pluploadL10n.dismiss+&quot;&lt;/a&gt;&lt;strong&gt;&quot;+pluploadL10n.error_uploading.replace(&quot;%s&quot;,a)+&quot;&lt;/strong&gt;&lt;br /&gt;&quot;+b+&quot;&lt;/div&gt;&quot;);c.find(&quot;a.dismiss&quot;).click(function(){jQuery(this).parents(&quot;.media-item&quot;).slideUp(200,function(){jQuery(this).remove()})})}function deleteSuccess(b,d){if(b==&quot;-1&quot;){ret
 urn itemAjaxError(this.id,&quot;You do not have permission. Has your session expired?&quot;)}if(b==&quot;0&quot;){return itemAjaxError(this.id,&quot;Could not be deleted. Has it been deleted already?&quot;)}var c=this.id,a=jQuery(&quot;#media-item-&quot;+c);if(type=jQuery(&quot;#type-of-&quot;+c).val()){jQuery(&quot;#&quot;+type+&quot;-counter&quot;).text(jQuery(&quot;#&quot;+type+&quot;-counter&quot;).text()-1)}if(a.hasClass(&quot;child-of-&quot;+post_id)){jQuery(&quot;#attachments-count&quot;).text(jQuery(&quot;#attachments-count&quot;).text()-1)}if(jQuery(&quot;form.type-form #media-items&quot;).children().length==1&amp;&amp;jQuery(&quot;.hidden&quot;,&quot;#media-items&quot;).length&gt;0){jQuery(&quot;.toggle&quot;).toggle();jQuery(&quot;.slidetoggle&quot;).slideUp(200).siblings().removeClass(&quot;hidden&quot;)}jQuery(&quot;.toggle&quot;,a).toggle();jQuery(&quot;.slidetoggle&quot;,a).slideUp(200).siblings().removeClass(&quot;hidden&quot;);a.css({backgroundColor:&quot;#f
 aa&quot;}).animate({backgroundColor:&quot;#f4f4f4&quot;},{queue:false,duration:500}).addClass(&quot;undo&quot;);jQuery(&quot;.filename:empty&quot;,a).remove();jQuery(&quot;.filename .title&quot;,a).css(&quot;font-weight&quot;,&quot;bold&quot;);jQuery(&quot;.filename&quot;,a).append('&lt;span class=&quot;trashnotice&quot;&gt; '+pluploadL10n.deleted+&quot; &lt;/span&gt;&quot;).siblings(&quot;a.toggle&quot;).hide();jQuery(&quot;.filename&quot;,a).append(jQuery(&quot;a.undo&quot;,a).removeClass(&quot;hidden&quot;));jQuery(&quot;.menu_order_input&quot;,a).hide();return}function deleteError(c,b,a){}function uploadComplete(){jQuery(&quot;#insert-gallery&quot;).prop(&quot;disabled&quot;,false)}function switchUploader(b){var c=document.getElementById(&quot;flash-upload-ui&quot;),a=document.getElementById(&quot;html-upload-ui&quot;);if(b){c.style.display=&quot;block&quot;;a.style.display=&quot;none&quot;}else{c.style.display=&quot;none&quot;;a.style.display=&quot;block&quot;}}function
  dndHelper(a){var b=document.getElementById(&quot;dnd-helper&quot;);if(a){b.style.display=&quot;block&quot;}else{b.style.display=&quot;none&quot;}}function uploadError(b,c,a){switch(c){case plupload.FAILED:wpFileError(b,pluploadL10n.upload_failed);break;case plupload.FILE_EXTENSION_ERROR:wpFileError(b,pluploadL10n.invalid_filetype);break;case plupload.FILE_SIZE_ERROR:wpQueueError(pluploadL10n.file_exceeds_size_limit.replace(&quot;%s&quot;,b.name));break;case plupload.IMAGE_FORMAT_ERROR:wpFileError(b,pluploadL10n.not_an_image);break;case plupload.IMAGE_MEMORY_ERROR:wpFileError(b,pluploadL10n.image_memory_exceeded);break;case plupload.IMAGE_DIMENSIONS_ERROR:wpFileError(b,pluploadL10n.image_dimensions_exceeded);break;case plupload.GENERIC_ERROR:wpQueueError(pluploadL10n.upload_failed);break;case plupload.IO_ERROR:wpQueueError(pluploadL10n.io_error);break;case plupload.HTTP_ERROR:wpQueueError(pluploadL10n.http_error);break;case plupload.INIT_ERROR:switchUploader(0);jQuery(&quot;
 .upload-html-bypass&quot;).hide();break;case plupload.SECURITY_ERROR:wpQueueError(pluploadL10n.security_error);break;default:wpFileError(b,pluploadL10n.default_error)}}jQuery(document).ready(function(a){a('input[type=&quot;radio&quot;]',&quot;#media-items&quot;).live(&quot;click&quot;,function(){var b=a(this).closest(&quot;tr&quot;);if(a(b).hasClass(&quot;align&quot;)){setUserSetting(&quot;align&quot;,a(this).val())}else{if(a(b).hasClass(&quot;image-size&quot;)){setUserSetting(&quot;imgsize&quot;,a(this).val())}}});a(&quot;button.button&quot;,&quot;#media-items&quot;).live(&quot;click&quot;,function(){var b=this.className||&quot;&quot;;b=b.match(/url([^ '&quot;]+)/);if(b&amp;&amp;b[1]){setUserSetting(&quot;urlbutton&quot;,b[1]);a(this).siblings(&quot;.urlfield&quot;).val(a(this).attr(&quot;title&quot;))}});uploader_init=function(){uploader=new plupload.Uploader(wpUploaderInit);a(&quot;#image_resize&quot;).bind(&quot;change&quot;,function(){var b=a(this).prop(&quot;checked&qu
 ot;);setResize(b);if(b){setUserSetting(&quot;upload_resize&quot;,&quot;1&quot;)}else{deleteUserSetting(&quot;upload_resize&quot;)}});uploader.bind(&quot;Init&quot;,function(b){setResize(getUserSetting(&quot;upload_resize&quot;,false));if(b.features.dragdrop){a(&quot;#plupload-upload-ui&quot;).addClass(&quot;drag-drop&quot;);a(&quot;#drag-drop-area&quot;).bind(&quot;dragover.wp-uploader&quot;,function(){a(this).css(&quot;border-color&quot;,&quot;#ccff55&quot;)}).bind(&quot;dragleave.wp-uploader, drop.wp-uploader&quot;,function(){a(this).css(&quot;border-color&quot;,&quot;&quot;)})}});uploader.init();uploader.bind(&quot;FilesAdded&quot;,function(b,c){a.each(c,function(e,d){fileQueued(d)});jQuery(&quot;#media-upload-error&quot;).html(&quot;&quot;);b.refresh();b.start()});uploader.bind(&quot;BeforeUpload&quot;,function(b,c){uploadStart(c)});uploader.bind(&quot;UploadProgress&quot;,function(b,c){uploadProgress(c,c.loaded,c.size)});uploader.bind(&quot;Error&quot;,function(b,c){upl
 oadError(c.file,c.code,c.message);b.refresh()});uploader.bind(&quot;FileUploaded&quot;,function(b,d,c){uploadSuccess(d,c.response)});uploader.bind(&quot;UploadComplete&quot;,function(b,c){uploadComplete()})};if(typeof(wpUploaderInit)==&quot;object&quot;){uploader_init()}});
</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 (19224 => 19225)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/script-loader.php        2011-11-08 22:26:49 UTC (rev 19224)
+++ trunk/wp-includes/script-loader.php        2011-11-08 22:34:09 UTC (rev 19225)
</span><span class="lines">@@ -220,7 +220,7 @@
</span><span class="cx">         // cannot use the plupload.full.js, as it loads browserplus init JS from Yahoo
</span><span class="cx">         $scripts-&gt;add( 'plupload-all', false, array('plupload', 'plupload-html5', 'plupload-flash', 'plupload-silverlight', 'plupload-html4'), '1511');
</span><span class="cx"> 
</span><del>-        $scripts-&gt;add( 'plupload-handlers', &quot;/wp-includes/js/plupload/handlers$suffix.js&quot;, array('plupload-all', 'jquery'), '20111108');
</del><ins>+        $scripts-&gt;add( 'plupload-handlers', &quot;/wp-includes/js/plupload/handlers$suffix.js&quot;, array('plupload-all', 'jquery'), '20111102');
</ins><span class="cx">         $scripts-&gt;localize( 'plupload-handlers', 'pluploadL10n', $uploader_l10n );
</span><span class="cx"> 
</span><span class="cx">         // keep 'swfupload' for back-compat.
</span></span></pre>
</div>
</div>

</body>
</html>