<!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>[41554] trunk/src: Remove SWFUpload,</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" style="font-size: 105%">
<dt style="float: left; width: 6em; font-weight: bold">Revision</dt> <dd><a style="font-weight: bold" href="https://core.trac.wordpress.org/changeset/41554">41554</a><script type="application/ld+json">{"@context":"http://schema.org","@type":"EmailMessage","description":"Review this Commit","action":{"@type":"ViewAction","url":"https://core.trac.wordpress.org/changeset/41554","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>azaozz</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2017-09-21 16:34:31 +0000 (Thu, 21 Sep 2017)</dd>
</dl>

<pre style='padding-left: 1em; margin: 2em 0; border-left: 2px solid #ccc; line-height: 1.25; font-size: 105%; font-family: sans-serif'>Remove SWFUpload,
- Refactor swfupload.js to output a simple upload form, and handlers.js.
- Delete the SWFUpload plugins directory and swfupload.swf.
- Remove flash cookies "hack" from async-upload.php.

See <a href="https://core.trac.wordpress.org/ticket/41752">#41752</a>.</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpadminasyncuploadphp">trunk/src/wp-admin/async-upload.php</a></li>
<li><a href="#trunksrcwpadminincludesupdatecorephp">trunk/src/wp-admin/includes/update-core.php</a></li>
<li><a href="#trunksrcwpincludesjsswfuploadhandlersjs">trunk/src/wp-includes/js/swfupload/handlers.js</a></li>
<li><a href="#trunksrcwpincludesjsswfuploadhandlersminjs">trunk/src/wp-includes/js/swfupload/handlers.min.js</a></li>
<li><a href="#trunksrcwpincludesjsswfuploadswfuploadjs">trunk/src/wp-includes/js/swfupload/swfupload.js</a></li>
<li><a href="#trunksrcwpincludesscriptloaderphp">trunk/src/wp-includes/script-loader.php</a></li>
</ul>

<h3>Removed Paths</h3>
<ul>
<li>trunk/src/wp-includes/js/swfupload/plugins/</li>
<li><a href="#trunksrcwpincludesjsswfuploadswfuploadswf">trunk/src/wp-includes/js/swfupload/swfupload.swf</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcwpadminasyncuploadphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-admin/async-upload.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/async-upload.php       2017-09-21 12:57:16 UTC (rev 41553)
+++ trunk/src/wp-admin/async-upload.php 2017-09-21 16:34:31 UTC (rev 41554)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1,6 +1,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <?php
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * Server-side file upload handler from wp-plupload, swfupload or other asynchronous upload methods.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * Server-side file upload handler from wp-plupload or other asynchronous upload methods.
</ins><span class="cx" style="display: block; padding: 0 10px">  *
</span><span class="cx" style="display: block; padding: 0 10px">  * @package WordPress
</span><span class="cx" style="display: block; padding: 0 10px">  * @subpackage Administration
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -14,20 +14,10 @@
</span><span class="cx" style="display: block; padding: 0 10px">        define( 'WP_ADMIN', true );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-if ( defined('ABSPATH') )
-       require_once(ABSPATH . 'wp-load.php');
-else
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+if ( defined( 'ABSPATH' ) ) {
+       require_once( ABSPATH . 'wp-load.php' );
+} else {
</ins><span class="cx" style="display: block; padding: 0 10px">         require_once( dirname( dirname( __FILE__ ) ) . '/wp-load.php' );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-
-if ( ! ( isset( $_REQUEST['action'] ) && 'upload-attachment' == $_REQUEST['action'] ) ) {
-       // Flash often fails to send cookies with the POST or upload, so we need to pass it in GET or POST instead
-       if ( is_ssl() && empty($_COOKIE[SECURE_AUTH_COOKIE]) && !empty($_REQUEST['auth_cookie']) )
-               $_COOKIE[SECURE_AUTH_COOKIE] = $_REQUEST['auth_cookie'];
-       elseif ( empty($_COOKIE[AUTH_COOKIE]) && !empty($_REQUEST['auth_cookie']) )
-               $_COOKIE[AUTH_COOKIE] = $_REQUEST['auth_cookie'];
-       if ( empty($_COOKIE[LOGGED_IN_COOKIE]) && !empty($_REQUEST['logged_in_cookie']) )
-               $_COOKIE[LOGGED_IN_COOKIE] = $_REQUEST['logged_in_cookie'];
-       unset($current_user);
</del><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px"> require_once( ABSPATH . 'wp-admin/admin.php' );
</span></span></pre></div>
<a id="trunksrcwpadminincludesupdatecorephp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-admin/includes/update-core.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/includes/update-core.php       2017-09-21 12:57:16 UTC (rev 41553)
+++ trunk/src/wp-admin/includes/update-core.php 2017-09-21 16:34:31 UTC (rev 41554)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -716,6 +716,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> // 4.9
</span><span class="cx" style="display: block; padding: 0 10px"> 'wp-includes/js/plupload/plupload.flash.swf',
</span><span class="cx" style="display: block; padding: 0 10px"> 'wp-includes/js/plupload/plupload.silverlight.xap',
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+'wp-includes/js/swfupload/plugins',
+'wp-includes/js/swfupload/swfupload.swf',
</ins><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span></span></pre></div>
<a id="trunksrcwpincludesjsswfuploadhandlersjs"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/js/swfupload/handlers.js</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/js/swfupload/handlers.js    2017-09-21 12:57:16 UTC (rev 41553)
+++ trunk/src/wp-includes/js/swfupload/handlers.js      2017-09-21 16:34:31 UTC (rev 41554)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1,360 +1,38 @@
</span><span class="cx" style="display: block; padding: 0 10px"> var topWin = window.dialogArguments || opener || parent || top;
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-function fileDialogStart() {
-       jQuery("#media-upload-error").empty();
-}
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+function fileDialogStart() {}
+function fileQueued() {}
+function uploadStart() {}
+function uploadProgress() {}
+function prepareMediaItem() {}
+function prepareMediaItemInit() {}
+function itemAjaxError() {}
+function deleteSuccess() {}
+function deleteError() {}
+function updateMediaForm() {}
+function uploadSuccess() {}
+function uploadComplete() {}
+function wpQueueError() {}
+function wpFileError() {}
+function fileQueueError() {}
+function fileDialogComplete() {}
+function uploadError() {}
+function cancelUpload() {}
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-// progress and success handlers for media multi uploads
-function fileQueued(fileObj) {
-       // Get rid of unused form
-       jQuery('.media-blank').remove();
-       // Collapse a single item
-       if ( jQuery('form.type-form #media-items').children().length == 1 && jQuery('.hidden', '#media-items').length > 0 ) {
-               jQuery('.describe-toggle-on').show();
-               jQuery('.describe-toggle-off').hide();
-               jQuery('.slidetoggle').slideUp(200).siblings().removeClass('hidden');
-       }
-       // Create a progress bar containing the filename
-       jQuery('<div class="media-item">')
-               .attr( 'id', 'media-item-' + fileObj.id )
-               .addClass('child-of-' + post_id)
-               .append('<div class="progress"><div class="bar"></div></div>',
-                       jQuery('<div class="filename original"><span class="percent"></span>').text( ' ' + fileObj.name ))
-               .appendTo( jQuery('#media-items' ) );
-       // Display the progress div
-       jQuery('.progress', '#media-item-' + fileObj.id).show();
-
-       // Disable submit and enable cancel
-       jQuery('#insert-gallery').prop('disabled', true);
-       jQuery('#cancel-upload').prop('disabled', false);
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+function switchUploader() {
+       jQuery( '#' + swfu.customSettings.swfupload_element_id ).hide();
+       jQuery( '#' + swfu.customSettings.degraded_element_id ).show();
+       jQuery( '.upload-html-bypass' ).hide();
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-function uploadStart(fileObj) {
-       try {
-               if ( typeof topWin.tb_remove != 'undefined' )
-                       topWin.jQuery('#TB_overlay').unbind('click', topWin.tb_remove);
-       } catch(e){}
-
-       return true;
-}
-
-function uploadProgress(fileObj, bytesDone, bytesTotal) {
-       // Lengthen the progress bar
-       var w = jQuery('#media-items').width() - 2, item = jQuery('#media-item-' + fileObj.id);
-       jQuery('.bar', item).width( w * bytesDone / bytesTotal );
-       jQuery('.percent', item).html( Math.ceil(bytesDone / bytesTotal * 100) + '%' );
-
-       if ( bytesDone == bytesTotal )
-               jQuery('.bar', item).html('<strong class="crunching">' + swfuploadL10n.crunching + '</strong>');
-}
-
-function prepareMediaItem(fileObj, serverData) {
-       var f = ( typeof shortform == 'undefined' ) ? 1 : 2, item = jQuery('#media-item-' + fileObj.id);
-       // Move the progress bar to 100%
-       jQuery('.bar', item).remove();
-       jQuery('.progress', item).hide();
-
-       try {
-               if ( typeof topWin.tb_remove != 'undefined' )
-                       topWin.jQuery('#TB_overlay').click(topWin.tb_remove);
-       } catch(e){}
-
-       // Old style: Append the HTML returned by the server -- thumbnail and form inputs
-       if ( isNaN(serverData) || !serverData ) {
-               item.append(serverData);
-               prepareMediaItemInit(fileObj);
-       }
-       // New style: server data is just the attachment ID, fetch the thumbnail and form html from the server
-       else {
-               item.load('async-upload.php', {attachment_id:serverData, fetch:f}, function(){prepareMediaItemInit(fileObj);updateMediaForm()});
-       }
-}
-
-function prepareMediaItemInit(fileObj) {
-       var item = jQuery('#media-item-' + fileObj.id);
-       // Clone the thumbnail as a "pinkynail" -- a tiny image to the left of the filename
-       jQuery('.thumbnail', item).clone().attr('class', 'pinkynail toggle').prependTo(item);
-
-       // Replace the original filename with the new (unique) one assigned during upload
-       jQuery('.filename.original', item).replaceWith( jQuery('.filename.new', item) );
-
-       // Also bind toggle to the links
-       jQuery('a.toggle', item).click(function(){
-               jQuery(this).siblings('.slidetoggle').slideToggle(350, function(){
-                       var w = jQuery(window).height(), t = jQuery(this).offset().top, h = jQuery(this).height(), b;
-
-                       if ( w && t && h ) {
-                b = t + h;
-
-                if ( b > w && (h + 48) < w )
-                    window.scrollBy(0, b - w + 13);
-                else if ( b > w )
-                    window.scrollTo(0, t - 36);
-            }
-               });
-               jQuery(this).siblings('.toggle').andSelf().toggle();
-               jQuery(this).siblings('a.toggle').focus();
-               return false;
-       });
-
-       // Bind AJAX to the new Delete button
-       jQuery('a.delete', item).click(function(){
-               // Tell the server to delete it. TODO: handle exceptions
-               jQuery.ajax({
-                       url: ajaxurl,
-                       type: 'post',
-                       success: deleteSuccess,
-                       error: deleteError,
-                       id: fileObj.id,
-                       data: {
-                               id : this.id.replace(/[^0-9]/g, ''),
-                               action : 'trash-post',
-                               _ajax_nonce : this.href.replace(/^.*wpnonce=/,'')
-                       }
-               });
-               return false;
-       });
-
-       // Bind AJAX to the new Undo button
-       jQuery('a.undo', item).click(function(){
-               // Tell the server to untrash it. TODO: handle exceptions
-               jQuery.ajax({
-                       url: ajaxurl,
-                       type: 'post',
-                       id: fileObj.id,
-                       data: {
-                               id : this.id.replace(/[^0-9]/g,''),
-                               action: 'untrash-post',
-                               _ajax_nonce: this.href.replace(/^.*wpnonce=/,'')
-                       },
-                       success: function(data, textStatus){
-                               var item = jQuery('#media-item-' + fileObj.id);
-
-                               if ( type = jQuery('#type-of-' + fileObj.id).val() )
-                                       jQuery('#' + type + '-counter').text(jQuery('#' + type + '-counter').text()-0+1);
-                               if ( item.hasClass('child-of-'+post_id) )
-                                       jQuery('#attachments-count').text(jQuery('#attachments-count').text()-0+1);
-
-                               jQuery('.filename .trashnotice', item).remove();
-                               jQuery('.filename .title', item).css('font-weight','normal');
-                               jQuery('a.undo', item).addClass('hidden');
-                               jQuery('a.describe-toggle-on, .menu_order_input', item).show();
-                               item.css( {backgroundColor:'#ceb'} ).animate( {backgroundColor: '#fff'}, { queue: false, duration: 500, complete: function(){ jQuery(this).css({backgroundColor:''}); } }).removeClass('undo');
-                       }
-               });
-               return false;
-       });
-
-       // Open this item if it says to start open (e.g. to display an error)
-       jQuery('#media-item-' + fileObj.id + '.startopen').removeClass('startopen').slideToggle(500).siblings('.toggle').toggle();
-}
-
-function itemAjaxError(id, html) {
-       var item = jQuery('#media-item-' + id);
-       var filename = jQuery('.filename', item).text();
-
-       item.html('<div class="error-div">'
-                               + '<a class="dismiss" href="#">' + swfuploadL10n.dismiss + '</a>'
-                               + '<strong>' + swfuploadL10n.error_uploading.replace('%s', filename) + '</strong><br />'
-                               + html
-                               + '</div>');
-       item.find('a.dismiss').click(function(){jQuery(this).parents('.media-item').slideUp(200, function(){jQuery(this).remove();})});
-}
-
-function deleteSuccess(data, textStatus) {
-       if ( data == '-1' )
-               return itemAjaxError(this.id, 'You do not have permission. Has your session expired?');
-       if ( data == '0' )
-               return itemAjaxError(this.id, 'Could not be deleted. Has it been deleted already?');
-
-       var id = this.id, item = jQuery('#media-item-' + id);
-
-       // Decrement the counters.
-       if ( type = jQuery('#type-of-' + id).val() )
-               jQuery('#' + type + '-counter').text( jQuery('#' + type + '-counter').text() - 1 );
-       if ( item.hasClass('child-of-'+post_id) )
-               jQuery('#attachments-count').text( jQuery('#attachments-count').text() - 1 );
-
-       if ( jQuery('form.type-form #media-items').children().length == 1 && jQuery('.hidden', '#media-items').length > 0 ) {
-               jQuery('.toggle').toggle();
-               jQuery('.slidetoggle').slideUp(200).siblings().removeClass('hidden');
-       }
-
-       // Vanish it.
-       jQuery('.toggle', item).toggle();
-       jQuery('.slidetoggle', item).slideUp(200).siblings().removeClass('hidden');
-       item.css( {backgroundColor:'#faa'} ).animate( {backgroundColor:'#f4f4f4'}, {queue:false, duration:500} ).addClass('undo');
-
-       jQuery('.filename:empty', item).remove();
-       jQuery('.filename .title', item).css('font-weight','bold');
-       jQuery('.filename', item).append('<span class="trashnotice"> ' + swfuploadL10n.deleted + ' </span>').siblings('a.toggle').hide();
-       jQuery('.filename', item).append( jQuery('a.undo', item).removeClass('hidden') );
-       jQuery('.menu_order_input', item).hide();
-
-       return;
-}
-
-function deleteError(X, textStatus, errorThrown) {
-       // TODO
-}
-
-function updateMediaForm() {
-       var one = jQuery('form.type-form #media-items').children(), items = jQuery('#media-items').children();
-
-       // Just one file, no need for collapsible part
-       if ( one.length == 1 ) {
-               jQuery('.slidetoggle', one).slideDown(500).siblings().addClass('hidden').filter('.toggle').toggle();
-       }
-
-       // Only show Save buttons when there is at least one file.
-       if ( items.not('.media-blank').length > 0 )
-               jQuery('.savebutton').show();
-       else
-               jQuery('.savebutton').hide();
-
-       // Only show Gallery buttons when there are at least two files.
-       if ( items.length > 1 ) {
-               jQuery('.insert-gallery').show();
-       } else {
-               jQuery('.insert-gallery').hide();
-       }
-}
-
-function uploadSuccess(fileObj, serverData) {
-       // if async-upload returned an error message, place it in the media item div and return
-       if ( serverData.match('media-upload-error') ) {
-               jQuery('#media-item-' + fileObj.id).html(serverData);
-               return;
-       }
-
-       prepareMediaItem(fileObj, serverData);
-       updateMediaForm();
-
-       // Increment the counter.
-       if ( jQuery('#media-item-' + fileObj.id).hasClass('child-of-' + post_id) )
-               jQuery('#attachments-count').text(1 * jQuery('#attachments-count').text() + 1);
-}
-
-function uploadComplete(fileObj) {
-       // If no more uploads queued, enable the submit button
-       if ( swfu.getStats().files_queued == 0 ) {
-               jQuery('#cancel-upload').prop('disabled', true);
-               jQuery('#insert-gallery').prop('disabled', false);
-       }
-}
-
-
-// wp-specific error handlers
-
-// generic message
-function wpQueueError(message) {
-       jQuery('#media-upload-error').show().text(message);
-}
-
-// file-specific message
-function wpFileError(fileObj, message) {
-       var item = jQuery('#media-item-' + fileObj.id);
-       var filename = jQuery('.filename', item).text();
-
-       item.html('<div class="error-div">'
-                               + '<a class="dismiss" href="#">' + swfuploadL10n.dismiss + '</a>'
-                               + '<strong>' + swfuploadL10n.error_uploading.replace('%s', filename) + '</strong><br />'
-                               + message
-                               + '</div>');
-       item.find('a.dismiss').click(function(){jQuery(this).parents('.media-item').slideUp(200, function(){jQuery(this).remove();})});
-}
-
-function fileQueueError(fileObj, error_code, message)  {
-       // Handle this error separately because we don't want to create a FileProgress element for it.
-       if ( error_code == SWFUpload.QUEUE_ERROR.QUEUE_LIMIT_EXCEEDED ) {
-               wpQueueError(swfuploadL10n.queue_limit_exceeded);
-       }
-       else if ( error_code == SWFUpload.QUEUE_ERROR.FILE_EXCEEDS_SIZE_LIMIT ) {
-               fileQueued(fileObj);
-               wpFileError(fileObj, swfuploadL10n.file_exceeds_size_limit);
-       }
-       else if ( error_code == SWFUpload.QUEUE_ERROR.ZERO_BYTE_FILE ) {
-               fileQueued(fileObj);
-               wpFileError(fileObj, swfuploadL10n.zero_byte_file);
-       }
-       else if ( error_code == SWFUpload.QUEUE_ERROR.INVALID_FILETYPE ) {
-               fileQueued(fileObj);
-               wpFileError(fileObj, swfuploadL10n.invalid_filetype);
-       }
-       else {
-               wpQueueError(swfuploadL10n.default_error);
-       }
-}
-
-function fileDialogComplete(num_files_queued) {
-       try {
-               if (num_files_queued > 0) {
-                       this.startUpload();
-               }
-       } catch (ex) {
-               this.debug(ex);
-       }
-}
-
-function switchUploader(s) {
-       var f = document.getElementById(swfu.customSettings.swfupload_element_id), h = document.getElementById(swfu.customSettings.degraded_element_id);
-       if ( s ) {
-               f.style.display = 'block';
-               h.style.display = 'none';
-       } else {
-               f.style.display = 'none';
-               h.style.display = 'block';
-       }
-}
-
</del><span class="cx" style="display: block; padding: 0 10px"> function swfuploadPreLoad() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        if ( !uploaderMode ) {
-               switchUploader(1);
-       } else {
-               switchUploader(0);
-       }
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ switchUploader();
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px"> function swfuploadLoadFailed() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        switchUploader(0);
-       jQuery('.upload-html-bypass').hide();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ switchUploader();
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-function uploadError(fileObj, errorCode, message) {
-
-       switch (errorCode) {
-               case SWFUpload.UPLOAD_ERROR.MISSING_UPLOAD_URL:
-                       wpFileError(fileObj, swfuploadL10n.missing_upload_url);
-                       break;
-               case SWFUpload.UPLOAD_ERROR.UPLOAD_LIMIT_EXCEEDED:
-                       wpFileError(fileObj, swfuploadL10n.upload_limit_exceeded);
-                       break;
-               case SWFUpload.UPLOAD_ERROR.HTTP_ERROR:
-                       wpQueueError(swfuploadL10n.http_error);
-                       break;
-               case SWFUpload.UPLOAD_ERROR.UPLOAD_FAILED:
-                       wpQueueError(swfuploadL10n.upload_failed);
-                       break;
-               case SWFUpload.UPLOAD_ERROR.IO_ERROR:
-                       wpQueueError(swfuploadL10n.io_error);
-                       break;
-               case SWFUpload.UPLOAD_ERROR.SECURITY_ERROR:
-                       wpQueueError(swfuploadL10n.security_error);
-                       break;
-               case SWFUpload.UPLOAD_ERROR.UPLOAD_STOPPED:
-               case SWFUpload.UPLOAD_ERROR.FILE_CANCELLED:
-                       jQuery('#media-item-' + fileObj.id).remove();
-                       break;
-               default:
-                       wpFileError(fileObj, swfuploadL10n.default_error);
-       }
-}
-
-function cancelUpload() {
-       swfu.cancelQueue();
-}
-
-// remember the last used image size, alignment and url
</del><span class="cx" style="display: block; padding: 0 10px"> jQuery(document).ready(function($){
</span><span class="cx" style="display: block; padding: 0 10px">        $( 'input[type="radio"]', '#media-items' ).on( 'click', function(){
</span><span class="cx" style="display: block; padding: 0 10px">                var tr = $(this).closest('tr');
</span></span></pre></div>
<a id="trunksrcwpincludesjsswfuploadhandlersminjs"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/js/swfupload/handlers.min.js</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/js/swfupload/handlers.min.js        2017-09-21 12:57:16 UTC (rev 41553)
+++ trunk/src/wp-includes/js/swfupload/handlers.min.js  2017-09-21 16:34:31 UTC (rev 41554)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1 +1 @@
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-var topWin=window.dialogArguments||opener||parent||top;function fileDialogStart(){jQuery("#media-upload-error").empty()}function fileQueued(a){jQuery(".media-blank").remove();if(jQuery("form.type-form #media-items").children().length==1&&jQuery(".hidden","#media-items").length>0){jQuery(".describe-toggle-on").show();jQuery(".describe-toggle-off").hide();jQuery(".slidetoggle").slideUp(200).siblings().removeClass("hidden")}jQuery('<div class="media-item">').attr("id","media-item-"+a.id).addClass("child-of-"+post_id).append('<div class="progress"><div class="bar"></div></div>',jQuery('<div class="filename original"><span class="percent"></span>').text(" "+
 a.name)).appendTo(jQuery("#media-items"));jQuery(".progress","#media-item-"+a.id).show();jQuery("#insert-gallery").prop("disabled",true);jQuery("#cancel-upload").prop("disabled",false)}function uploadStart(a){try{if(typeof topWin.tb_remove!="undefined"){topWin.jQuery("#TB_overlay").unbind("click",topWin.tb_remove)}}catch(b){}return true}function uploadProgress(e,b,d){var a=jQuery("#media-items").width()-2,c=jQuery("#media-item-"+e.id);jQuery(".bar",c).width(a*b/d);jQuery(".percent",c).html(Math.ceil(b/d*100)+"%");if(b==d){jQuery(".bar",c).html('<strong class="crunching">'+swfuploadL10n.crunching+"</strong>")}}function prepareMediaItem(c,a){var d=(typeof shortform=="undefined")?1:2,b=jQuery("#media-item-"+c.id);jQuery(".bar",b).remove();jQuery(".progress",
 b).hide();try{if(typeof topWin.tb_remove!="undefined"){topWin.jQuery("#TB_overlay").click(topWin.tb_remove)}}catch(g){}if(isNaN(a)||!a){b.append(a);prepareMediaItemInit(c)}else{b.load("async-upload.php",{attachment_id:a,fetch:d},function(){prepareMediaItemInit(c);updateMediaForm()})}}function prepareMediaItemInit(b){var a=jQuery("#media-item-"+b.id);jQuery(".thumbnail",a).clone().attr("class","pinkynail toggle").prependTo(a);jQuery(".filename.original",a).replaceWith(jQuery(".filename.new",a));jQuery("a.toggle",a).click(function(){jQuery(this).siblings(".slidetoggle").slideToggle(350,function(){var d=jQuery(window).height(),e=jQuery(this).offset().top,f=jQuery(this).height(),c;if(d&&e&&f){c=e+f;if(c>d&&(f+48)<d){window.scrollBy(0,c-d+13)}else{if(c>d){window.scrollTo(0,e-36)}}}});jQuery(this).siblings(".toggle").andSelf().toggle();jQ
 uery(this).siblings("a.toggle").focus();return false});jQuery("a.delete",a).click(function(){jQuery.ajax({url:ajaxurl,type:"post",success:deleteSuccess,error:deleteError,id:b.id,data:{id:this.id.replace(/[^0-9]/g,""),action:"trash-post",_ajax_nonce:this.href.replace(/^.*wpnonce=/,"")}});return false});jQuery("a.undo",a).click(function(){jQuery.ajax({url:ajaxurl,type:"post",id:b.id,data:{id:this.id.replace(/[^0-9]/g,""),action:"untrash-post",_ajax_nonce:this.href.replace(/^.*wpnonce=/,"")},success:function(d,e){var c=jQuery("#media-item-"+b.id);if(type=jQuery("#type-of-"+b.id).val()){jQuery("#"+type+"-counter").text(jQuery("#"+type+"-counter").text()-0+1)}if(c.hasClass("child-of-"+post_id)){jQuery("#attachments-count").text(jQuery("#attachments-count").text()-0+1)}jQuery(".filename 
 .trashnotice",c).remove();jQuery(".filename .title",c).css("font-weight","normal");jQuery("a.undo",c).addClass("hidden");jQuery("a.describe-toggle-on, .menu_order_input",c).show();c.css({backgroundColor:"#ceb"}).animate({backgroundColor:"#fff"},{queue:false,duration:500,complete:function(){jQuery(this).css({backgroundColor:""})}}).removeClass("undo")}});return false});jQuery("#media-item-"+b.id+".startopen").removeClass("startopen").slideToggle(500).siblings(".toggle").toggle()}function itemAjaxError(d,b){var c=jQuery("#media-item-"+d);var a=jQuery(".filename",c).text();c.html('<div class="error-div"><a class="dismiss" href="#">'+swfuploadL10n.dismiss+"</a><strong>"+swfuploadL10n.error_uploading.replace("%s",a)+"</strong><br />&quo
 t;+b+"</div>");c.find("a.dismiss").click(function(){jQuery(this).parents(".media-item").slideUp(200,function(){jQuery(this).remove()})})}function deleteSuccess(b,d){if(b=="-1"){return itemAjaxError(this.id,"You do not have permission. Has your session expired?")}if(b=="0"){return itemAjaxError(this.id,"Could not be deleted. Has it been deleted already?")}var c=this.id,a=jQuery("#media-item-"+c);if(type=jQuery("#type-of-"+c).val()){jQuery("#"+type+"-counter").text(jQuery("#"+type+"-counter").text()-1)}if(a.hasClass("child-of-"+post_id)){jQuery("#attachments-count").text(jQuery("#attachments-count").text()-1)}if(jQuery("form.type-form #media-items").children().length==1&&jQuery(".hidden","#media-items").length>0){jQuery(".toggle").toggle();jQuery(".slidetoggle")
 .slideUp(200).siblings().removeClass("hidden")}jQuery(".toggle",a).toggle();jQuery(".slidetoggle",a).slideUp(200).siblings().removeClass("hidden");a.css({backgroundColor:"#faa"}).animate({backgroundColor:"#f4f4f4"},{queue:false,duration:500}).addClass("undo");jQuery(".filename:empty",a).remove();jQuery(".filename .title",a).css("font-weight","bold");jQuery(".filename",a).append('<span class="trashnotice"> '+swfuploadL10n.deleted+" </span>").siblings("a.toggle").hide();jQuery(".filename",a).append(jQuery("a.undo",a).removeClass("hidden"));jQuery(".menu_order_input",a).hide();return}function deleteError(c,b,a){}function updateMediaForm(){var b=jQuery("form.type-form #media-items").children(),a=jQuery("#media-items").children();if(b.length==1){jQuery(".slidetoggl
 e",b).slideDown(500).siblings().addClass("hidden").filter(".toggle").toggle()}if(a.not(".media-blank").length>0){jQuery(".savebutton").show()}else{jQuery(".savebutton").hide()}if(a.length>1){jQuery(".insert-gallery").show()}else{jQuery(".insert-gallery").hide()}}function uploadSuccess(b,a){if(a.match("media-upload-error")){jQuery("#media-item-"+b.id).html(a);return}prepareMediaItem(b,a);updateMediaForm();if(jQuery("#media-item-"+b.id).hasClass("child-of-"+post_id)){jQuery("#attachments-count").text(1*jQuery("#attachments-count").text()+1)}}function uploadComplete(a){if(swfu.getStats().files_queued==0){jQuery("#cancel-upload").prop("disabled",true);jQuery("#insert-gallery").prop("disabled",false)}}function wpQueueError(a){jQuery("#media-upload-error").show().text(a)}function wpFileError(d,c){var 
 b=jQuery("#media-item-"+d.id);var a=jQuery(".filename",b).text();b.html('<div class="error-div"><a class="dismiss" href="#">'+swfuploadL10n.dismiss+"</a><strong>"+swfuploadL10n.error_uploading.replace("%s",a)+"</strong><br />"+c+"</div>");b.find("a.dismiss").click(function(){jQuery(this).parents(".media-item").slideUp(200,function(){jQuery(this).remove()})})}function fileQueueError(c,a,b){if(a==SWFUpload.QUEUE_ERROR.QUEUE_LIMIT_EXCEEDED){wpQueueError(swfuploadL10n.queue_limit_exceeded)}else{if(a==SWFUpload.QUEUE_ERROR.FILE_EXCEEDS_SIZE_LIMIT){fileQueued(c);wpFileError(c,swfuploadL10n.file_exceeds_size_limit)}else{if(a==SWFUpload.QUEUE_ERROR.ZERO_BYTE_FILE){fileQueued(c);wpFileError(c,swfuploadL10n.zero_byte_file)}else{if(a==SWFUpload.QUEUE_ERROR.INVALID_FILETYPE){fileQueued(c);wpFileError(c,swfuploadL10n.invalid_filetype)}else{wpQueu
 eError(swfuploadL10n.default_error)}}}}}function fileDialogComplete(b){try{if(b>0){this.startUpload()}}catch(a){this.debug(a)}}function switchUploader(b){var c=document.getElementById(swfu.customSettings.swfupload_element_id),a=document.getElementById(swfu.customSettings.degraded_element_id);if(b){c.style.display="block";a.style.display="none"}else{c.style.display="none";a.style.display="block"}}function swfuploadPreLoad(){if(!uploaderMode){switchUploader(1)}else{switchUploader(0)}}function swfuploadLoadFailed(){switchUploader(0);jQuery(".upload-html-bypass").hide()}function uploadError(b,c,a){switch(c){case SWFUpload.UPLOAD_ERROR.MISSING_UPLOAD_URL:wpFileError(b,swfuploadL10n.missing_upload_url);break;case SWFUpload.UPLOAD_ERROR.UPLOAD_LIMIT_EXCEEDED:wpFileError(b,swfuploadL10n.upload_limit_exceeded);break;case SWFUpload.UPLOAD_ERROR.HTTP_ERROR:wpQueueError(swfuploadL10n.http_error);break;case SWFUpload.UPLOAD_ERROR.UPLOAD_FAILED
 :wpQueueError(swfuploadL10n.upload_failed);break;case SWFUpload.UPLOAD_ERROR.IO_ERROR:wpQueueError(swfuploadL10n.io_error);break;case SWFUpload.UPLOAD_ERROR.SECURITY_ERROR:wpQueueError(swfuploadL10n.security_error);break;case SWFUpload.UPLOAD_ERROR.UPLOAD_STOPPED:case SWFUpload.UPLOAD_ERROR.FILE_CANCELLED:jQuery("#media-item-"+b.id).remove();break;default:wpFileError(b,swfuploadL10n.default_error)}}function cancelUpload(){swfu.cancelQueue()}jQuery(document).ready(function(a){a('input[type="radio"]',"#media-items").live("click",function(){var b=a(this).closest("tr");if(a(b).hasClass("align")){setUserSetting("align",a(this).val())}else{if(a(b).hasClass("image-size")){setUserSetting("imgsize",a(this).val())}}});a("button.button","#media-items").live("click",function(){var b=this.className||"";b=b.match(/url([^ '"]+)/);if(b&&b[1]){setUserSetting(
 "urlbutton",b[1]);a(this).siblings(".urlfield").val(a(this).attr("title"))}})});
</del><span class="cx" style="display: block; padding: 0 10px">\ No newline at end of file
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+function fileDialogStart(){}function fileQueued(){}function uploadStart(){}function uploadProgress(){}function prepareMediaItem(){}function prepareMediaItemInit(){}function itemAjaxError(){}function deleteSuccess(){}function deleteError(){}function updateMediaForm(){}function uploadSuccess(){}function uploadComplete(){}function wpQueueError(){}function wpFileError(){}function fileQueueError(){}function fileDialogComplete(){}function uploadError(){}function cancelUpload(){}function switchUploader(){jQuery("#"+swfu.customSettings.swfupload_element_id).hide(),jQuery("#"+swfu.customSettings.degraded_element_id).show(),jQuery(".upload-html-bypass").hide()}function swfuploadPreLoad(){switchUploader()}function swfuploadLoadFailed(){switchUploader()}var topWin=window.dialogArguments||opener||parent||top;jQuery(document).ready(function(a){a('input[type="radio&qu
 ot;]',"#media-items").on("click",function(){var b=a(this).closest("tr");a(b).hasClass("align")?setUserSetting("align",a(this).val()):a(b).hasClass("image-size")&&setUserSetting("imgsize",a(this).val())}),a("button.button","#media-items").on("click",function(){var b=this.className||"";b=b.match(/url([^ '"]+)/),b&&b[1]&&(setUserSetting("urlbutton",b[1]),a(this).siblings(".urlfield").val(a(this).attr("title")))})});
</ins><span class="cx" style="display: block; padding: 0 10px">\ No newline at end of file
</span></span></pre></div>
<a id="trunksrcwpincludesjsswfuploadswfuploadjs"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/js/swfupload/swfupload.js</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/js/swfupload/swfupload.js   2017-09-21 12:57:16 UTC (rev 41553)
+++ trunk/src/wp-includes/js/swfupload/swfupload.js     2017-09-21 16:34:31 UTC (rev 41554)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1,980 +1,140 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * SWFUpload: http://www.swfupload.org, http://swfupload.googlecode.com
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * SWFUpload fallback
</ins><span class="cx" style="display: block; padding: 0 10px">  *
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * mmSWFUpload 1.0: Flash upload dialog - http://profandesign.se/swfupload/,  http://www.vinterwebb.se/
- *
- * SWFUpload is (c) 2006-2007 Lars Huring, Olov Nilz√©n and Mammon Media and is released under the MIT License:
- * http://www.opensource.org/licenses/mit-license.php
- *
- * SWFUpload 2 is (c) 2007-2008 Jake Roberts and is released under the MIT License:
- * http://www.opensource.org/licenses/mit-license.php
- *
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @since 4.9.0
</ins><span class="cx" style="display: block; padding: 0 10px">  */
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-
-/* ******************* */
-/* Constructor & Init  */
-/* ******************* */
</del><span class="cx" style="display: block; padding: 0 10px"> var SWFUpload;
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-if (SWFUpload == undefined) {
-       SWFUpload = function (settings) {
-               this.initSWFUpload(settings);
-       };
-}
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+( function () {
+       function noop() {}
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-SWFUpload.prototype.initSWFUpload = function (settings) {
-       try {
-               this.customSettings = {};       // A container where developers can place their own settings associated with this instance.
-               this.settings = settings;
-               this.eventQueue = [];
-               this.movieName = "SWFUpload_" + SWFUpload.movieCount++;
-               this.movieElement = null;
-
-
-               // Setup global control tracking
-               SWFUpload.instances[this.movieName] = this;
-
-               // Load the settings.  Load the Flash movie.
-               this.initSettings();
-               this.loadFlash();
-               this.displayDebugInfo();
-       } catch (ex) {
-               delete SWFUpload.instances[this.movieName];
-               throw ex;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if (SWFUpload == undefined) {
+               SWFUpload = function (settings) {
+                       this.initSWFUpload(settings);
+               };
</ins><span class="cx" style="display: block; padding: 0 10px">         }
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-};
</del><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-/* *************** */
-/* Static Members  */
-/* *************** */
-SWFUpload.instances = {};
-SWFUpload.movieCount = 0;
-SWFUpload.version = "2.2.0 2009-03-25";
-SWFUpload.QUEUE_ERROR = {
-       QUEUE_LIMIT_EXCEEDED                    : -100,
-       FILE_EXCEEDS_SIZE_LIMIT                 : -110,
-       ZERO_BYTE_FILE                                  : -120,
-       INVALID_FILETYPE                                : -130
-};
-SWFUpload.UPLOAD_ERROR = {
-       HTTP_ERROR                                              : -200,
-       MISSING_UPLOAD_URL                      : -210,
-       IO_ERROR                                                : -220,
-       SECURITY_ERROR                                  : -230,
-       UPLOAD_LIMIT_EXCEEDED                   : -240,
-       UPLOAD_FAILED                                   : -250,
-       SPECIFIED_FILE_ID_NOT_FOUND             : -260,
-       FILE_VALIDATION_FAILED                  : -270,
-       FILE_CANCELLED                                  : -280,
-       UPLOAD_STOPPED                                  : -290
-};
-SWFUpload.FILE_STATUS = {
-       QUEUED           : -1,
-       IN_PROGRESS      : -2,
-       ERROR            : -3,
-       COMPLETE         : -4,
-       CANCELLED        : -5
-};
-SWFUpload.BUTTON_ACTION = {
-       SELECT_FILE  : -100,
-       SELECT_FILES : -110,
-       START_UPLOAD : -120
-};
-SWFUpload.CURSOR = {
-       ARROW : -1,
-       HAND : -2
-};
-SWFUpload.WINDOW_MODE = {
-       WINDOW : "window",
-       TRANSPARENT : "transparent",
-       OPAQUE : "opaque"
-};
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ SWFUpload.prototype.initSWFUpload = function ( settings ) {
+               function fallback() {
+                       var $ = window.jQuery;
+                       var $placeholder = settings.button_placeholder_id ? $( '#' + settings.button_placeholder_id ) : $( settings.button_placeholder );
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-// Private: takes a URL, determines if it is relative and converts to an absolute URL
-// using the current site. Only processes the URL if it can, otherwise returns the URL untouched
-SWFUpload.completeURL = function(url) {
-       if (typeof(url) !== "string" || url.match(/^https?:\/\//i) || url.match(/^\//)) {
-               return url;
-       }
-       
-       var currentURL = window.location.protocol + "//" + window.location.hostname + (window.location.port ? ":" + window.location.port : "");
-       
-       var indexSlash = window.location.pathname.lastIndexOf("/");
-       if (indexSlash <= 0) {
-               path = "/";
-       } else {
-               path = window.location.pathname.substr(0, indexSlash) + "/";
-       }
-       
-       return /*currentURL +*/ path + url;
-       
-};
-
-
-/* ******************** */
-/* Instance Members  */
-/* ******************** */
-
-// Private: initSettings ensures that all the
-// settings are set, getting a default value if one was not assigned.
-SWFUpload.prototype.initSettings = function () {
-       this.ensureDefault = function (settingName, defaultValue) {
-               this.settings[settingName] = (this.settings[settingName] == undefined) ? defaultValue : this.settings[settingName];
-       };
-       
-       // Upload backend settings
-       this.ensureDefault("upload_url", "");
-       this.ensureDefault("preserve_relative_urls", false);
-       this.ensureDefault("file_post_name", "Filedata");
-       this.ensureDefault("post_params", {});
-       this.ensureDefault("use_query_string", false);
-       this.ensureDefault("requeue_on_error", false);
-       this.ensureDefault("http_success", []);
-       this.ensureDefault("assume_success_timeout", 0);
-       
-       // File Settings
-       this.ensureDefault("file_types", "*.*");
-       this.ensureDefault("file_types_description", "All Files");
-       this.ensureDefault("file_size_limit", 0);     // Default zero means "unlimited"
-       this.ensureDefault("file_upload_limit", 0);
-       this.ensureDefault("file_queue_limit", 0);
-
-       // Flash Settings
-       this.ensureDefault("flash_url", "swfupload.swf");
-       this.ensureDefault("prevent_swf_caching", true);
-       
-       // Button Settings
-       this.ensureDefault("button_image_url", "");
-       this.ensureDefault("button_width", 1);
-       this.ensureDefault("button_height", 1);
-       this.ensureDefault("button_text", "");
-       this.ensureDefault("button_text_style", "color: #000000; font-size: 16pt;");
-       this.ensureDefault("button_text_top_padding", 0);
-       this.ensureDefault("button_text_left_padding", 0);
-       this.ensureDefault("button_action", SWFUpload.BUTTON_ACTION.SELECT_FILES);
-       this.ensureDefault("button_disabled", false);
-       this.ensureDefault("button_placeholder_id", "");
-       this.ensureDefault("button_placeholder", null);
-       this.ensureDefault("button_cursor", SWFUpload.CURSOR.ARROW);
-       this.ensureDefault("button_window_mode", SWFUpload.WINDOW_MODE.WINDOW);
-       
-       // Debug Settings
-       this.ensureDefault("debug", false);
-       this.settings.debug_enabled = this.settings.debug;      // Here to maintain v2 API
-       
-       // Event Handlers
-       this.settings.return_upload_start_handler = this.returnUploadStart;
-       this.ensureDefault("swfupload_loaded_handler", null);
-       this.ensureDefault("file_dialog_start_handler", null);
-       this.ensureDefault("file_queued_handler", null);
-       this.ensureDefault("file_queue_error_handler", null);
-       this.ensureDefault("file_dialog_complete_handler", null);
-       
-       this.ensureDefault("upload_start_handler", null);
-       this.ensureDefault("upload_progress_handler", null);
-       this.ensureDefault("upload_error_handler", null);
-       this.ensureDefault("upload_success_handler", null);
-       this.ensureDefault("upload_complete_handler", null);
-       
-       this.ensureDefault("debug_handler", this.debugMessage);
-
-       this.ensureDefault("custom_settings", {});
-
-       // Other settings
-       this.customSettings = this.settings.custom_settings;
-       
-       // Update the flash url if needed
-       if (!!this.settings.prevent_swf_caching) {
-               this.settings.flash_url = this.settings.flash_url + (this.settings.flash_url.indexOf("?") < 0 ? "?" : "&") + "preventswfcaching=" + new Date().getTime();
-       }
-       
-       if (!this.settings.preserve_relative_urls) {
-               //this.settings.flash_url = SWFUpload.completeURL(this.settings.flash_url);     // Don't need to do this one since flash doesn't look at it
-               this.settings.upload_url = SWFUpload.completeURL(this.settings.upload_url);
-               this.settings.button_image_url = SWFUpload.completeURL(this.settings.button_image_url);
-       }
-       
-       delete this.ensureDefault;
-};
-
-// Private: loadFlash replaces the button_placeholder element with the flash movie.
-SWFUpload.prototype.loadFlash = function () {
-       var targetElement, tempParent;
-
-       // Make sure an element with the ID we are going to use doesn't already exist
-       if (document.getElementById(this.movieName) !== null) {
-               throw "ID " + this.movieName + " is already in use. The Flash Object could not be added";
-       }
-
-       // Get the element where we will be placing the flash movie
-       targetElement = document.getElementById(this.settings.button_placeholder_id) || this.settings.button_placeholder;
-
-       if (targetElement == undefined) {
-               throw "Could not find the placeholder element: " + this.settings.button_placeholder_id;
-       }
-
-       // Append the container and load the flash
-       tempParent = document.createElement("div");
-       tempParent.innerHTML = this.getFlashHTML();     // Using innerHTML is non-standard but the only sensible way to dynamically add Flash in IE (and maybe other browsers)
-       targetElement.parentNode.replaceChild(tempParent.firstChild, targetElement);
-
-       // Fix IE Flash/Form bug
-       if (window[this.movieName] == undefined) {
-               window[this.movieName] = this.getMovieElement();
-       }
-       
-};
-
-// Private: getFlashHTML generates the object tag needed to embed the flash in to the document
-SWFUpload.prototype.getFlashHTML = function () {
-       // Flash Satay object syntax: http://www.alistapart.com/articles/flashsatay
-       return ['<object id="', this.movieName, '" type="application/x-shockwave-flash" data="', this.settings.flash_url, '" width="', this.settings.button_width, '" height="', this.settings.button_height, '" class="swfupload">',
-                               '<param name="wmode" value="', this.settings.button_window_mode, '" />',
-                               '<param name="movie" value="', this.settings.flash_url, '" />',
-                               '<param name="quality" value="high" />',
-                               '<param name="menu" value="false" />',
-                               '<param name="allowScriptAccess" value="always" />',
-                               '<param name="flashvars" value="' + this.getFlashVars() + '" />',
-                               '</object>'].join("");
-};
-
-// Private: getFlashVars builds the parameter string that will be passed
-// to flash in the flashvars param.
-SWFUpload.prototype.getFlashVars = function () {
-       // Build a string from the post param object
-       var paramString = this.buildParamString();
-       var httpSuccessString = this.settings.http_success.join(",");
-       
-       // Build the parameter string
-       return ["movieName=", encodeURIComponent(this.movieName),
-                       "&amp;uploadURL=", encodeURIComponent(this.settings.upload_url),
-                       "&amp;useQueryString=", encodeURIComponent(this.settings.use_query_string),
-                       "&amp;requeueOnError=", encodeURIComponent(this.settings.requeue_on_error),
-                       "&amp;httpSuccess=", encodeURIComponent(httpSuccessString),
-                       "&amp;assumeSuccessTimeout=", encodeURIComponent(this.settings.assume_success_timeout),
-                       "&amp;params=", encodeURIComponent(paramString),
-                       "&amp;filePostName=", encodeURIComponent(this.settings.file_post_name),
-                       "&amp;fileTypes=", encodeURIComponent(this.settings.file_types),
-                       "&amp;fileTypesDescription=", encodeURIComponent(this.settings.file_types_description),
-                       "&amp;fileSizeLimit=", encodeURIComponent(this.settings.file_size_limit),
-                       "&amp;fileUploadLimit=", encodeURIComponent(this.settings.file_upload_limit),
-                       "&amp;fileQueueLimit=", encodeURIComponent(this.settings.file_queue_limit),
-                       "&amp;debugEnabled=", encodeURIComponent(this.settings.debug_enabled),
-                       "&amp;buttonImageURL=", encodeURIComponent(this.settings.button_image_url),
-                       "&amp;buttonWidth=", encodeURIComponent(this.settings.button_width),
-                       "&amp;buttonHeight=", encodeURIComponent(this.settings.button_height),
-                       "&amp;buttonText=", encodeURIComponent(this.settings.button_text),
-                       "&amp;buttonTextTopPadding=", encodeURIComponent(this.settings.button_text_top_padding),
-                       "&amp;buttonTextLeftPadding=", encodeURIComponent(this.settings.button_text_left_padding),
-                       "&amp;buttonTextStyle=", encodeURIComponent(this.settings.button_text_style),
-                       "&amp;buttonAction=", encodeURIComponent(this.settings.button_action),
-                       "&amp;buttonDisabled=", encodeURIComponent(this.settings.button_disabled),
-                       "&amp;buttonCursor=", encodeURIComponent(this.settings.button_cursor)
-               ].join("");
-};
-
-// Public: getMovieElement retrieves the DOM reference to the Flash element added by SWFUpload
-// The element is cached after the first lookup
-SWFUpload.prototype.getMovieElement = function () {
-       if (this.movieElement == undefined) {
-               this.movieElement = document.getElementById(this.movieName);
-       }
-
-       if (this.movieElement === null) {
-               throw "Could not find Flash element";
-       }
-       
-       return this.movieElement;
-};
-
-// Private: buildParamString takes the name/value pairs in the post_params setting object
-// and joins them up in to a string formatted "name=value&amp;name=value"
-SWFUpload.prototype.buildParamString = function () {
-       var postParams = this.settings.post_params; 
-       var paramStringPairs = [];
-
-       if (typeof(postParams) === "object") {
-               for (var name in postParams) {
-                       if (postParams.hasOwnProperty(name)) {
-                               paramStringPairs.push(encodeURIComponent(name.toString()) + "=" + encodeURIComponent(postParams[name].toString()));
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 if ( ! $placeholder.length ) {
+                               return;
</ins><span class="cx" style="display: block; padding: 0 10px">                         }
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                }
-       }
</del><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        return paramStringPairs.join("&amp;");
-};
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 var $form = $placeholder.closest( 'form' );
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-// Public: Used to remove a SWFUpload instance from the page. This method strives to remove
-// all references to the SWF, and other objects so memory is properly freed.
-// Returns true if everything was destroyed. Returns a false if a failure occurs leaving SWFUpload in an inconsistant state.
-// Credits: Major improvements provided by steffen
-SWFUpload.prototype.destroy = function () {
-       try {
-               // Make sure Flash is done before we try to remove it
-               this.cancelUpload(null, false);
-               
-
-               // Remove the SWFUpload DOM nodes
-               var movieElement = null;
-               movieElement = this.getMovieElement();
-               
-               if (movieElement && typeof(movieElement.CallFunction) === "unknown") { // We only want to do this in IE
-                       // Loop through all the movie's properties and remove all function references (DOM/JS IE 6/7 memory leak workaround)
-                       for (var i in movieElement) {
-                               try {
-                                       if (typeof(movieElement[i]) === "function") {
-                                               movieElement[i] = null;
-                                       }
-                               } catch (ex1) {}
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 if ( ! $form.length ) {
+                               $form = $( '<form enctype="multipart/form-data" method="post">' );
+                               $form.attr( 'action', settings.upload_url );
+                               $form.insertAfter( $placeholder ).append( $placeholder );
</ins><span class="cx" style="display: block; padding: 0 10px">                         }
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        // Remove the Movie Element from the page
-                       try {
-                               movieElement.parentNode.removeChild(movieElement);
-                       } catch (ex) {}
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 $placeholder.replaceWith(
+                               $( '<div>' )
+                                       .append(
+                                               $( '<input type="file" multiple />' ).attr({
+                                                       name: settings.file_post_name || 'async-upload',
+                                                       accepts: settings.file_types || '*.*'
+                                               })
+                                       ).append(
+                                               $( '<input type="submit" name="html-upload" class="button" value="Upload" />' )
+                                       )
+                       );
</ins><span class="cx" style="display: block; padding: 0 10px">                 }
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                
-               // Remove IE form fix reference
-               window[this.movieName] = null;
</del><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Destroy other references
-               SWFUpload.instances[this.movieName] = null;
-               delete SWFUpload.instances[this.movieName];
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         try {
+                       // Try the built-in fallback.
+                       if ( typeof settings.swfupload_load_failed_handler === 'function' && settings.custom_settings ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                this.movieElement = null;
-               this.settings = null;
-               this.customSettings = null;
-               this.eventQueue = null;
-               this.movieName = null;
-               
-               
-               return true;
-       } catch (ex2) {
-               return false;
-       }
-};
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         window.swfu = {
+                                       customSettings: settings.custom_settings
+                               };
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-
-// Public: displayDebugInfo prints out settings and configuration
-// information about this SWFUpload instance.
-// This function (and any references to it) can be deleted when placing
-// SWFUpload in production.
-SWFUpload.prototype.displayDebugInfo = function () {
-       this.debug(
-               [
-                       "---SWFUpload Instance Info---\n",
-                       "Version: ", SWFUpload.version, "\n",
-                       "Movie Name: ", this.movieName, "\n",
-                       "Settings:\n",
-                       "\t", "upload_url:               ", this.settings.upload_url, "\n",
-                       "\t", "flash_url:                ", this.settings.flash_url, "\n",
-                       "\t", "use_query_string:         ", this.settings.use_query_string.toString(), "\n",
-                       "\t", "requeue_on_error:         ", this.settings.requeue_on_error.toString(), "\n",
-                       "\t", "http_success:             ", this.settings.http_success.join(", "), "\n",
-                       "\t", "assume_success_timeout:   ", this.settings.assume_success_timeout, "\n",
-                       "\t", "file_post_name:           ", this.settings.file_post_name, "\n",
-                       "\t", "post_params:              ", this.settings.post_params.toString(), "\n",
-                       "\t", "file_types:               ", this.settings.file_types, "\n",
-                       "\t", "file_types_description:   ", this.settings.file_types_description, "\n",
-                       "\t", "file_size_limit:          ", this.settings.file_size_limit, "\n",
-                       "\t", "file_upload_limit:        ", this.settings.file_upload_limit, "\n",
-                       "\t", "file_queue_limit:         ", this.settings.file_queue_limit, "\n",
-                       "\t", "debug:                    ", this.settings.debug.toString(), "\n",
-
-                       "\t", "prevent_swf_caching:      ", this.settings.prevent_swf_caching.toString(), "\n",
-
-                       "\t", "button_placeholder_id:    ", this.settings.button_placeholder_id.toString(), "\n",
-                       "\t", "button_placeholder:       ", (this.settings.button_placeholder ? "Set" : "Not Set"), "\n",
-                       "\t", "button_image_url:         ", this.settings.button_image_url.toString(), "\n",
-                       "\t", "button_width:             ", this.settings.button_width.toString(), "\n",
-                       "\t", "button_height:            ", this.settings.button_height.toString(), "\n",
-                       "\t", "button_text:              ", this.settings.button_text.toString(), "\n",
-                       "\t", "button_text_style:        ", this.settings.button_text_style.toString(), "\n",
-                       "\t", "button_text_top_padding:  ", this.settings.button_text_top_padding.toString(), "\n",
-                       "\t", "button_text_left_padding: ", this.settings.button_text_left_padding.toString(), "\n",
-                       "\t", "button_action:            ", this.settings.button_action.toString(), "\n",
-                       "\t", "button_disabled:          ", this.settings.button_disabled.toString(), "\n",
-
-                       "\t", "custom_settings:          ", this.settings.custom_settings.toString(), "\n",
-                       "Event Handlers:\n",
-                       "\t", "swfupload_loaded_handler assigned:  ", (typeof this.settings.swfupload_loaded_handler === "function").toString(), "\n",
-                       "\t", "file_dialog_start_handler assigned: ", (typeof this.settings.file_dialog_start_handler === "function").toString(), "\n",
-                       "\t", "file_queued_handler assigned:       ", (typeof this.settings.file_queued_handler === "function").toString(), "\n",
-                       "\t", "file_queue_error_handler assigned:  ", (typeof this.settings.file_queue_error_handler === "function").toString(), "\n",
-                       "\t", "upload_start_handler assigned:      ", (typeof this.settings.upload_start_handler === "function").toString(), "\n",
-                       "\t", "upload_progress_handler assigned:   ", (typeof this.settings.upload_progress_handler === "function").toString(), "\n",
-                       "\t", "upload_error_handler assigned:      ", (typeof this.settings.upload_error_handler === "function").toString(), "\n",
-                       "\t", "upload_success_handler assigned:    ", (typeof this.settings.upload_success_handler === "function").toString(), "\n",
-                       "\t", "upload_complete_handler assigned:   ", (typeof this.settings.upload_complete_handler === "function").toString(), "\n",
-                       "\t", "debug_handler assigned:             ", (typeof this.settings.debug_handler === "function").toString(), "\n"
-               ].join("")
-       );
-};
-
-/* Note: addSetting and getSetting are no longer used by SWFUpload but are included
-       the maintain v2 API compatibility
-*/
-// Public: (Deprecated) addSetting adds a setting value. If the value given is undefined or null then the default_value is used.
-SWFUpload.prototype.addSetting = function (name, value, default_value) {
-    if (value == undefined) {
-        return (this.settings[name] = default_value);
-    } else {
-        return (this.settings[name] = value);
-       }
-};
-
-// Public: (Deprecated) getSetting gets a setting. Returns an empty string if the setting was not found.
-SWFUpload.prototype.getSetting = function (name) {
-    if (this.settings[name] != undefined) {
-        return this.settings[name];
-       }
-
-    return "";
-};
-
-
-
-// Private: callFlash handles function calls made to the Flash element.
-// Calls are made with a setTimeout for some functions to work around
-// bugs in the ExternalInterface library.
-SWFUpload.prototype.callFlash = function (functionName, argumentArray) {
-       argumentArray = argumentArray || [];
-       
-       var movieElement = this.getMovieElement();
-       var returnValue, returnString;
-
-       // Flash's method if calling ExternalInterface methods (code adapted from MooTools).
-       try {
-               returnString = movieElement.CallFunction('<invoke name="' + functionName + '" returntype="javascript">' + __flash__argumentsToXML(argumentArray, 0) + '</invoke>');
-               returnValue = eval(returnString);
-       } catch (ex) {
-               throw "Call to " + functionName + " failed";
-       }
-       
-       // Unescape file post param values
-       if (returnValue != undefined && typeof returnValue.post === "object") {
-               returnValue = this.unescapeFilePostParams(returnValue);
-       }
-
-       return returnValue;
-};
-
-/* *****************************
-       -- Flash control methods --
-       Your UI should use these
-       to operate SWFUpload
-   ***************************** */
-
-// WARNING: this function does not work in Flash Player 10
-// Public: selectFile causes a File Selection Dialog window to appear.  This
-// dialog only allows 1 file to be selected.
-SWFUpload.prototype.selectFile = function () {
-       this.callFlash("SelectFile");
-};
-
-// WARNING: this function does not work in Flash Player 10
-// Public: selectFiles causes a File Selection Dialog window to appear/ This
-// dialog allows the user to select any number of files
-// Flash Bug Warning: Flash limits the number of selectable files based on the combined length of the file names.
-// If the selection name length is too long the dialog will fail in an unpredictable manner.  There is no work-around
-// for this bug.
-SWFUpload.prototype.selectFiles = function () {
-       this.callFlash("SelectFiles");
-};
-
-
-// Public: startUpload starts uploading the first file in the queue unless
-// the optional parameter 'fileID' specifies the ID 
-SWFUpload.prototype.startUpload = function (fileID) {
-       this.callFlash("StartUpload", [fileID]);
-};
-
-// Public: cancelUpload cancels any queued file.  The fileID parameter may be the file ID or index.
-// If you do not specify a fileID the current uploading file or first file in the queue is cancelled.
-// If you do not want the uploadError event to trigger you can specify false for the triggerErrorEvent parameter.
-SWFUpload.prototype.cancelUpload = function (fileID, triggerErrorEvent) {
-       if (triggerErrorEvent !== false) {
-               triggerErrorEvent = true;
-       }
-       this.callFlash("CancelUpload", [fileID, triggerErrorEvent]);
-};
-
-// Public: stopUpload stops the current upload and requeues the file at the beginning of the queue.
-// If nothing is currently uploading then nothing happens.
-SWFUpload.prototype.stopUpload = function () {
-       this.callFlash("StopUpload");
-};
-
-/* ************************
- * Settings methods
- *   These methods change the SWFUpload settings.
- *   SWFUpload settings should not be changed directly on the settings object
- *   since many of the settings need to be passed to Flash in order to take
- *   effect.
- * *********************** */
-
-// Public: getStats gets the file statistics object.
-SWFUpload.prototype.getStats = function () {
-       return this.callFlash("GetStats");
-};
-
-// Public: setStats changes the SWFUpload statistics.  You shouldn't need to 
-// change the statistics but you can.  Changing the statistics does not
-// affect SWFUpload accept for the successful_uploads count which is used
-// by the upload_limit setting to determine how many files the user may upload.
-SWFUpload.prototype.setStats = function (statsObject) {
-       this.callFlash("SetStats", [statsObject]);
-};
-
-// Public: getFile retrieves a File object by ID or Index.  If the file is
-// not found then 'null' is returned.
-SWFUpload.prototype.getFile = function (fileID) {
-       if (typeof(fileID) === "number") {
-               return this.callFlash("GetFileByIndex", [fileID]);
-       } else {
-               return this.callFlash("GetFile", [fileID]);
-       }
-};
-
-// Public: addFileParam sets a name/value pair that will be posted with the
-// file specified by the Files ID.  If the name already exists then the
-// exiting value will be overwritten.
-SWFUpload.prototype.addFileParam = function (fileID, name, value) {
-       return this.callFlash("AddFileParam", [fileID, name, value]);
-};
-
-// Public: removeFileParam removes a previously set (by addFileParam) name/value
-// pair from the specified file.
-SWFUpload.prototype.removeFileParam = function (fileID, name) {
-       this.callFlash("RemoveFileParam", [fileID, name]);
-};
-
-// Public: setUploadUrl changes the upload_url setting.
-SWFUpload.prototype.setUploadURL = function (url) {
-       this.settings.upload_url = url.toString();
-       this.callFlash("SetUploadURL", [url]);
-};
-
-// Public: setPostParams changes the post_params setting
-SWFUpload.prototype.setPostParams = function (paramsObject) {
-       this.settings.post_params = paramsObject;
-       this.callFlash("SetPostParams", [paramsObject]);
-};
-
-// Public: addPostParam adds post name/value pair.  Each name can have only one value.
-SWFUpload.prototype.addPostParam = function (name, value) {
-       this.settings.post_params[name] = value;
-       this.callFlash("SetPostParams", [this.settings.post_params]);
-};
-
-// Public: removePostParam deletes post name/value pair.
-SWFUpload.prototype.removePostParam = function (name) {
-       delete this.settings.post_params[name];
-       this.callFlash("SetPostParams", [this.settings.post_params]);
-};
-
-// Public: setFileTypes changes the file_types setting and the file_types_description setting
-SWFUpload.prototype.setFileTypes = function (types, description) {
-       this.settings.file_types = types;
-       this.settings.file_types_description = description;
-       this.callFlash("SetFileTypes", [types, description]);
-};
-
-// Public: setFileSizeLimit changes the file_size_limit setting
-SWFUpload.prototype.setFileSizeLimit = function (fileSizeLimit) {
-       this.settings.file_size_limit = fileSizeLimit;
-       this.callFlash("SetFileSizeLimit", [fileSizeLimit]);
-};
-
-// Public: setFileUploadLimit changes the file_upload_limit setting
-SWFUpload.prototype.setFileUploadLimit = function (fileUploadLimit) {
-       this.settings.file_upload_limit = fileUploadLimit;
-       this.callFlash("SetFileUploadLimit", [fileUploadLimit]);
-};
-
-// Public: setFileQueueLimit changes the file_queue_limit setting
-SWFUpload.prototype.setFileQueueLimit = function (fileQueueLimit) {
-       this.settings.file_queue_limit = fileQueueLimit;
-       this.callFlash("SetFileQueueLimit", [fileQueueLimit]);
-};
-
-// Public: setFilePostName changes the file_post_name setting
-SWFUpload.prototype.setFilePostName = function (filePostName) {
-       this.settings.file_post_name = filePostName;
-       this.callFlash("SetFilePostName", [filePostName]);
-};
-
-// Public: setUseQueryString changes the use_query_string setting
-SWFUpload.prototype.setUseQueryString = function (useQueryString) {
-       this.settings.use_query_string = useQueryString;
-       this.callFlash("SetUseQueryString", [useQueryString]);
-};
-
-// Public: setRequeueOnError changes the requeue_on_error setting
-SWFUpload.prototype.setRequeueOnError = function (requeueOnError) {
-       this.settings.requeue_on_error = requeueOnError;
-       this.callFlash("SetRequeueOnError", [requeueOnError]);
-};
-
-// Public: setHTTPSuccess changes the http_success setting
-SWFUpload.prototype.setHTTPSuccess = function (http_status_codes) {
-       if (typeof http_status_codes === "string") {
-               http_status_codes = http_status_codes.replace(" ", "").split(",");
-       }
-       
-       this.settings.http_success = http_status_codes;
-       this.callFlash("SetHTTPSuccess", [http_status_codes]);
-};
-
-// Public: setHTTPSuccess changes the http_success setting
-SWFUpload.prototype.setAssumeSuccessTimeout = function (timeout_seconds) {
-       this.settings.assume_success_timeout = timeout_seconds;
-       this.callFlash("SetAssumeSuccessTimeout", [timeout_seconds]);
-};
-
-// Public: setDebugEnabled changes the debug_enabled setting
-SWFUpload.prototype.setDebugEnabled = function (debugEnabled) {
-       this.settings.debug_enabled = debugEnabled;
-       this.callFlash("SetDebugEnabled", [debugEnabled]);
-};
-
-// Public: setButtonImageURL loads a button image sprite
-SWFUpload.prototype.setButtonImageURL = function (buttonImageURL) {
-       if (buttonImageURL == undefined) {
-               buttonImageURL = "";
-       }
-       
-       this.settings.button_image_url = buttonImageURL;
-       this.callFlash("SetButtonImageURL", [buttonImageURL]);
-};
-
-// Public: setButtonDimensions resizes the Flash Movie and button
-SWFUpload.prototype.setButtonDimensions = function (width, height) {
-       this.settings.button_width = width;
-       this.settings.button_height = height;
-       
-       var movie = this.getMovieElement();
-       if (movie != undefined) {
-               movie.style.width = width + "px";
-               movie.style.height = height + "px";
-       }
-       
-       this.callFlash("SetButtonDimensions", [width, height]);
-};
-// Public: setButtonText Changes the text overlaid on the button
-SWFUpload.prototype.setButtonText = function (html) {
-       this.settings.button_text = html;
-       this.callFlash("SetButtonText", [html]);
-};
-// Public: setButtonTextPadding changes the top and left padding of the text overlay
-SWFUpload.prototype.setButtonTextPadding = function (left, top) {
-       this.settings.button_text_top_padding = top;
-       this.settings.button_text_left_padding = left;
-       this.callFlash("SetButtonTextPadding", [left, top]);
-};
-
-// Public: setButtonTextStyle changes the CSS used to style the HTML/Text overlaid on the button
-SWFUpload.prototype.setButtonTextStyle = function (css) {
-       this.settings.button_text_style = css;
-       this.callFlash("SetButtonTextStyle", [css]);
-};
-// Public: setButtonDisabled disables/enables the button
-SWFUpload.prototype.setButtonDisabled = function (isDisabled) {
-       this.settings.button_disabled = isDisabled;
-       this.callFlash("SetButtonDisabled", [isDisabled]);
-};
-// Public: setButtonAction sets the action that occurs when the button is clicked
-SWFUpload.prototype.setButtonAction = function (buttonAction) {
-       this.settings.button_action = buttonAction;
-       this.callFlash("SetButtonAction", [buttonAction]);
-};
-
-// Public: setButtonCursor changes the mouse cursor displayed when hovering over the button
-SWFUpload.prototype.setButtonCursor = function (cursor) {
-       this.settings.button_cursor = cursor;
-       this.callFlash("SetButtonCursor", [cursor]);
-};
-
-/* *******************************
-       Flash Event Interfaces
-       These functions are used by Flash to trigger the various
-       events.
-       
-       All these functions a Private.
-       
-       Because the ExternalInterface library is buggy the event calls
-       are added to a queue and the queue then executed by a setTimeout.
-       This ensures that events are executed in a determinate order and that
-       the ExternalInterface bugs are avoided.
-******************************* */
-
-SWFUpload.prototype.queueEvent = function (handlerName, argumentArray) {
-       // Warning: Don't call this.debug inside here or you'll create an infinite loop
-       
-       if (argumentArray == undefined) {
-               argumentArray = [];
-       } else if (!(argumentArray instanceof Array)) {
-               argumentArray = [argumentArray];
-       }
-       
-       var self = this;
-       if (typeof this.settings[handlerName] === "function") {
-               // Queue the event
-               this.eventQueue.push(function () {
-                       this.settings[handlerName].apply(this, argumentArray);
-               });
-               
-               // Execute the next queued event
-               setTimeout(function () {
-                       self.executeNextEvent();
-               }, 0);
-               
-       } else if (this.settings[handlerName] !== null) {
-               throw "Event handler " + handlerName + " is unknown or is not a function";
-       }
-};
-
-// Private: Causes the next event in the queue to be executed.  Since events are queued using a setTimeout
-// we must queue them in order to garentee that they are executed in order.
-SWFUpload.prototype.executeNextEvent = function () {
-       // Warning: Don't call this.debug inside here or you'll create an infinite loop
-
-       var  f = this.eventQueue ? this.eventQueue.shift() : null;
-       if (typeof(f) === "function") {
-               f.apply(this);
-       }
-};
-
-// Private: unescapeFileParams is part of a workaround for a flash bug where objects passed through ExternalInterface cannot have
-// properties that contain characters that are not valid for JavaScript identifiers. To work around this
-// the Flash Component escapes the parameter names and we must unescape again before passing them along.
-SWFUpload.prototype.unescapeFilePostParams = function (file) {
-       var reg = /[$]([0-9a-f]{4})/i;
-       var unescapedPost = {};
-       var uk;
-
-       if (file != undefined) {
-               for (var k in file.post) {
-                       if (file.post.hasOwnProperty(k)) {
-                               uk = k;
-                               var match;
-                               while ((match = reg.exec(uk)) !== null) {
-                                       uk = uk.replace(match[0], String.fromCharCode(parseInt("0x" + match[1], 16)));
-                               }
-                               unescapedPost[uk] = file.post[k];
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         settings.swfupload_load_failed_handler();
+                       } else {
+                               fallback();
</ins><span class="cx" style="display: block; padding: 0 10px">                         }
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                } catch ( ex ) {
+                       fallback();
</ins><span class="cx" style="display: block; padding: 0 10px">                 }
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+        };
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                file.post = unescapedPost;
-       }
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ SWFUpload.instances = {};
+       SWFUpload.movieCount = 0;
+       SWFUpload.version = "0";
+       SWFUpload.QUEUE_ERROR = {};
+       SWFUpload.UPLOAD_ERROR = {};
+       SWFUpload.FILE_STATUS = {};
+       SWFUpload.BUTTON_ACTION = {};
+       SWFUpload.CURSOR = {};
+       SWFUpload.WINDOW_MODE = {};
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        return file;
-};
-
-// Private: Called by Flash to see if JS can call in to Flash (test if External Interface is working)
-SWFUpload.prototype.testExternalInterface = function () {
-       try {
-               return this.callFlash("TestExternalInterface");
-       } catch (ex) {
-               return false;
-       }
-};
-
-// Private: This event is called by Flash when it has finished loading. Don't modify this.
-// Use the swfupload_loaded_handler event setting to execute custom code when SWFUpload has loaded.
-SWFUpload.prototype.flashReady = function () {
-       // Check that the movie element is loaded correctly with its ExternalInterface methods defined
-       var movieElement = this.getMovieElement();
-
-       if (!movieElement) {
-               this.debug("Flash called back ready but the flash movie can't be found.");
-               return;
-       }
-
-       this.cleanUp(movieElement);
-       
-       this.queueEvent("swfupload_loaded_handler");
-};
-
-// Private: removes Flash added fuctions to the DOM node to prevent memory leaks in IE.
-// This function is called by Flash each time the ExternalInterface functions are created.
-SWFUpload.prototype.cleanUp = function (movieElement) {
-       // Pro-actively unhook all the Flash functions
-       try {
-               if (this.movieElement && typeof(movieElement.CallFunction) === "unknown") { // We only want to do this in IE
-                       this.debug("Removing Flash functions hooks (this should only run in IE and should prevent memory leaks)");
-                       for (var key in movieElement) {
-                               try {
-                                       if (typeof(movieElement[key]) === "function") {
-                                               movieElement[key] = null;
-                                       }
-                               } catch (ex) {
-                               }
-                       }
-               }
-       } catch (ex1) {
-       
-       }
-
-       // Fix Flashes own cleanup code so if the SWFMovie was removed from the page
-       // it doesn't display errors.
-       window["__flash__removeCallback"] = function (instance, name) {
-               try {
-                       if (instance) {
-                               instance[name] = null;
-                       }
-               } catch (flashEx) {
-               
-               }
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ SWFUpload.completeURL = noop;
+       SWFUpload.prototype.initSettings = noop;
+       SWFUpload.prototype.loadFlash = noop;
+       SWFUpload.prototype.getFlashHTML = noop;
+       SWFUpload.prototype.getFlashVars = noop;
+       SWFUpload.prototype.getMovieElement = noop;
+       SWFUpload.prototype.buildParamString = noop;
+       SWFUpload.prototype.destroy = noop;
+       SWFUpload.prototype.displayDebugInfo = noop;
+       SWFUpload.prototype.addSetting = noop;
+       SWFUpload.prototype.getSetting = noop;
+       SWFUpload.prototype.callFlash = noop;
+       SWFUpload.prototype.selectFile = noop;
+       SWFUpload.prototype.selectFiles = noop;
+       SWFUpload.prototype.startUpload = noop;
+       SWFUpload.prototype.cancelUpload = noop;
+       SWFUpload.prototype.stopUpload = noop;
+       SWFUpload.prototype.getStats = noop;
+       SWFUpload.prototype.setStats = noop;
+       SWFUpload.prototype.getFile = noop;
+       SWFUpload.prototype.addFileParam = noop;
+       SWFUpload.prototype.removeFileParam = noop;
+       SWFUpload.prototype.setUploadURL = noop;
+       SWFUpload.prototype.setPostParams = noop;
+       SWFUpload.prototype.addPostParam = noop;
+       SWFUpload.prototype.removePostParam = noop;
+       SWFUpload.prototype.setFileTypes = noop;
+       SWFUpload.prototype.setFileSizeLimit = noop;
+       SWFUpload.prototype.setFileUploadLimit = noop;
+       SWFUpload.prototype.setFileQueueLimit = noop;
+       SWFUpload.prototype.setFilePostName = noop;
+       SWFUpload.prototype.setUseQueryString = noop;
+       SWFUpload.prototype.setRequeueOnError = noop;
+       SWFUpload.prototype.setHTTPSuccess = noop;
+       SWFUpload.prototype.setAssumeSuccessTimeout = noop;
+       SWFUpload.prototype.setDebugEnabled = noop;
+       SWFUpload.prototype.setButtonImageURL = noop;
+       SWFUpload.prototype.setButtonDimensions = noop;
+       SWFUpload.prototype.setButtonText = noop;
+       SWFUpload.prototype.setButtonTextPadding = noop;
+       SWFUpload.prototype.setButtonTextStyle = noop;
+       SWFUpload.prototype.setButtonDisabled = noop;
+       SWFUpload.prototype.setButtonAction = noop;
+       SWFUpload.prototype.setButtonCursor = noop;
+       SWFUpload.prototype.queueEvent = noop;
+       SWFUpload.prototype.executeNextEvent = noop;
+       SWFUpload.prototype.unescapeFilePostParams = noop;
+       SWFUpload.prototype.testExternalInterface = noop;
+       SWFUpload.prototype.flashReady = noop;
+       SWFUpload.prototype.cleanUp = noop;
+       SWFUpload.prototype.fileDialogStart = noop;
+       SWFUpload.prototype.fileQueued = noop;
+       SWFUpload.prototype.fileQueueError = noop;
+       SWFUpload.prototype.fileDialogComplete = noop;
+       SWFUpload.prototype.uploadStart = noop;
+       SWFUpload.prototype.returnUploadStart = noop;
+       SWFUpload.prototype.uploadProgress = noop;
+       SWFUpload.prototype.uploadError = noop;
+       SWFUpload.prototype.uploadSuccess = noop;
+       SWFUpload.prototype.uploadComplete = noop;
+       SWFUpload.prototype.debug = noop;
+       SWFUpload.prototype.debugMessage = noop;
+       SWFUpload.Console = {
+               writeLine: noop
</ins><span class="cx" style="display: block; padding: 0 10px">         };
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-
-};
-
-
-/* This is a chance to do something before the browse window opens */
-SWFUpload.prototype.fileDialogStart = function () {
-       this.queueEvent("file_dialog_start_handler");
-};
-
-
-/* Called when a file is successfully added to the queue. */
-SWFUpload.prototype.fileQueued = function (file) {
-       file = this.unescapeFilePostParams(file);
-       this.queueEvent("file_queued_handler", file);
-};
-
-
-/* Handle errors that occur when an attempt to queue a file fails. */
-SWFUpload.prototype.fileQueueError = function (file, errorCode, message) {
-       file = this.unescapeFilePostParams(file);
-       this.queueEvent("file_queue_error_handler", [file, errorCode, message]);
-};
-
-/* Called after the file dialog has closed and the selected files have been queued.
-       You could call startUpload here if you want the queued files to begin uploading immediately. */
-SWFUpload.prototype.fileDialogComplete = function (numFilesSelected, numFilesQueued, numFilesInQueue) {
-       this.queueEvent("file_dialog_complete_handler", [numFilesSelected, numFilesQueued, numFilesInQueue]);
-};
-
-SWFUpload.prototype.uploadStart = function (file) {
-       file = this.unescapeFilePostParams(file);
-       this.queueEvent("return_upload_start_handler", file);
-};
-
-SWFUpload.prototype.returnUploadStart = function (file) {
-       var returnValue;
-       if (typeof this.settings.upload_start_handler === "function") {
-               file = this.unescapeFilePostParams(file);
-               returnValue = this.settings.upload_start_handler.call(this, file);
-       } else if (this.settings.upload_start_handler != undefined) {
-               throw "upload_start_handler must be a function";
-       }
-
-       // Convert undefined to true so if nothing is returned from the upload_start_handler it is
-       // interpretted as 'true'.
-       if (returnValue === undefined) {
-               returnValue = true;
-       }
-       
-       returnValue = !!returnValue;
-       
-       this.callFlash("ReturnUploadStart", [returnValue]);
-};
-
-
-
-SWFUpload.prototype.uploadProgress = function (file, bytesComplete, bytesTotal) {
-       file = this.unescapeFilePostParams(file);
-       this.queueEvent("upload_progress_handler", [file, bytesComplete, bytesTotal]);
-};
-
-SWFUpload.prototype.uploadError = function (file, errorCode, message) {
-       file = this.unescapeFilePostParams(file);
-       this.queueEvent("upload_error_handler", [file, errorCode, message]);
-};
-
-SWFUpload.prototype.uploadSuccess = function (file, serverData, responseReceived) {
-       file = this.unescapeFilePostParams(file);
-       this.queueEvent("upload_success_handler", [file, serverData, responseReceived]);
-};
-
-SWFUpload.prototype.uploadComplete = function (file) {
-       file = this.unescapeFilePostParams(file);
-       this.queueEvent("upload_complete_handler", file);
-};
-
-/* Called by SWFUpload JavaScript and Flash functions when debug is enabled. By default it writes messages to the
-   internal debug console.  You can override this event and have messages written where you want. */
-SWFUpload.prototype.debug = function (message) {
-       this.queueEvent("debug_handler", message);
-};
-
-
-/* **********************************
-       Debug Console
-       The debug console is a self contained, in page location
-       for debug message to be sent.  The Debug Console adds
-       itself to the body if necessary.
-
-       The console is automatically scrolled as messages appear.
-       
-       If you are using your own debug handler or when you deploy to production and
-       have debug disabled you can remove these functions to reduce the file size
-       and complexity.
-********************************** */
-   
-// Private: debugMessage is the default debug_handler.  If you want to print debug messages
-// call the debug() function.  When overriding the function your own function should
-// check to see if the debug setting is true before outputting debug information.
-SWFUpload.prototype.debugMessage = function (message) {
-       if (this.settings.debug) {
-               var exceptionMessage, exceptionValues = [];
-
-               // Check for an exception object and print it nicely
-               if (typeof message === "object" && typeof message.name === "string" && typeof message.message === "string") {
-                       for (var key in message) {
-                               if (message.hasOwnProperty(key)) {
-                                       exceptionValues.push(key + ": " + message[key]);
-                               }
-                       }
-                       exceptionMessage = exceptionValues.join("\n") || "";
-                       exceptionValues = exceptionMessage.split("\n");
-                       exceptionMessage = "EXCEPTION: " + exceptionValues.join("\nEXCEPTION: ");
-                       SWFUpload.Console.writeLine(exceptionMessage);
-               } else {
-                       SWFUpload.Console.writeLine(message);
-               }
-       }
-};
-
-SWFUpload.Console = {};
-SWFUpload.Console.writeLine = function (message) {
-       var console, documentForm;
-
-       try {
-               console = document.getElementById("SWFUpload_Console");
-
-               if (!console) {
-                       documentForm = document.createElement("form");
-                       document.getElementsByTagName("body")[0].appendChild(documentForm);
-
-                       console = document.createElement("textarea");
-                       console.id = "SWFUpload_Console";
-                       console.style.fontFamily = "monospace";
-                       console.setAttribute("wrap", "off");
-                       console.wrap = "off";
-                       console.style.overflow = "auto";
-                       console.style.width = "700px";
-                       console.style.height = "350px";
-                       console.style.margin = "5px";
-                       documentForm.appendChild(console);
-               }
-
-               console.value += message + "\n";
-
-               console.scrollTop = console.scrollHeight - console.clientHeight;
-       } catch (ex) {
-               alert("Exception: " + ex.name + " Message: " + ex.message);
-       }
-};
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+}() );
</ins></span></pre></div>
<a id="trunksrcwpincludesjsswfuploadswfuploadswf"></a>
<div class="binary"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Deleted: trunk/src/wp-includes/js/swfupload/swfupload.swf</h4>
<pre class="diff"><span>
<span class="cx">(Binary files differ)
</span></span></pre></div>
<a id="trunksrcwpincludesscriptloaderphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/script-loader.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/script-loader.php   2017-09-21 12:57:16 UTC (rev 41553)
+++ trunk/src/wp-includes/script-loader.php     2017-09-21 16:34:31 UTC (rev 41554)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -326,10 +326,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px">        // keep 'swfupload' for back-compat.
</span><span class="cx" style="display: block; padding: 0 10px">        $scripts->add( 'swfupload', '/wp-includes/js/swfupload/swfupload.js', array(), '2201-20110113');
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        $scripts->add( 'swfupload-swfobject', '/wp-includes/js/swfupload/plugins/swfupload.swfobject.js', array('swfupload', 'swfobject'), '2201a');
-       $scripts->add( 'swfupload-queue', '/wp-includes/js/swfupload/plugins/swfupload.queue.js', array('swfupload'), '2201');
-       $scripts->add( 'swfupload-speed', '/wp-includes/js/swfupload/plugins/swfupload.speed.js', array('swfupload'), '2201');
-       $scripts->add( 'swfupload-all', false, array('swfupload', 'swfupload-swfobject', 'swfupload-queue'), '2201');
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $scripts->add( 'swfupload-all', false, array( 'swfupload' ), '2201' );
</ins><span class="cx" style="display: block; padding: 0 10px">         $scripts->add( 'swfupload-handlers', "/wp-includes/js/swfupload/handlers$suffix.js", array('swfupload-all', 'jquery'), '2201-20110524');
</span><span class="cx" style="display: block; padding: 0 10px">        did_action( 'init' ) && $scripts->localize( 'swfupload-handlers', 'swfuploadL10n', $uploader_l10n );
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span></span></pre>
</div>
</div>

</body>
</html>