<!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>[22459] trunk/wp-admin: Forms with the class .wp-upload-form will now have their submit button disabled until a file is selected.</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg > ul, #logmsg > ol { margin-left: 0; margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://core.trac.wordpress.org/changeset/22459">22459</a></dd>
<dt>Author</dt> <dd>nacin</dd>
<dt>Date</dt> <dd>2012-11-07 23:54:03 +0000 (Wed, 07 Nov 2012)</dd>
</dl>
<h3>Log Message</h3>
<pre>Forms with the class .wp-upload-form will now have their submit button disabled until a file is selected. props kovshenin, helenyhou, lessbloat, SergeyBiryukov, tommcfarlin. fixes <a href="http://core.trac.wordpress.org/ticket/20855">#20855</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpadmincustombackgroundphp">trunk/wp-admin/custom-background.php</a></li>
<li><a href="#trunkwpadmincustomheaderphp">trunk/wp-admin/custom-header.php</a></li>
<li><a href="#trunkwpadminincludesplugininstallphp">trunk/wp-admin/includes/plugin-install.php</a></li>
<li><a href="#trunkwpadminincludestemplatephp">trunk/wp-admin/includes/template.php</a></li>
<li><a href="#trunkwpadminincludesthemeinstallphp">trunk/wp-admin/includes/theme-install.php</a></li>
<li><a href="#trunkwpadminjscommonjs">trunk/wp-admin/js/common.js</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpadmincustombackgroundphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/custom-background.php (22458 => 22459)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/custom-background.php 2012-11-07 23:33:21 UTC (rev 22458)
+++ trunk/wp-admin/custom-background.php 2012-11-07 23:54:03 UTC (rev 22459)
</span><span class="lines">@@ -254,7 +254,7 @@
</span><span class="cx"> <?php endif; ?>
</span><span class="cx"> <tr valign="top">
</span><span class="cx"> <th scope="row"><?php _e('Select Image'); ?></th>
</span><del>-<td><form enctype="multipart/form-data" id="upload-form" method="post" action="">
</del><ins>+<td><form enctype="multipart/form-data" id="upload-form" class="wp-upload-form" method="post" action="">
</ins><span class="cx"> <p>
</span><span class="cx"> <label for="upload"><?php _e( 'Choose an image from your computer:' ); ?></label><br />
</span><span class="cx"> <input type="file" id="upload" name="import" />
</span></span></pre></div>
<a id="trunkwpadmincustomheaderphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/custom-header.php (22458 => 22459)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/custom-header.php 2012-11-07 23:33:21 UTC (rev 22458)
+++ trunk/wp-admin/custom-header.php 2012-11-07 23:54:03 UTC (rev 22459)
</span><span class="lines">@@ -525,7 +525,7 @@
</span><span class="cx"> printf( __( 'Suggested height is <strong>%1$d pixels</strong>.' ) . ' ', get_theme_support( 'custom-header', 'height' ) );
</span><span class="cx"> }
</span><span class="cx"> ?></p>
</span><del>- <form enctype="multipart/form-data" id="upload-form" method="post" action="<?php echo esc_attr( add_query_arg( 'step', 2 ) ) ?>">
</del><ins>+ <form enctype="multipart/form-data" id="upload-form" class="wp-upload-form" method="post" action="<?php echo esc_attr( add_query_arg( 'step', 2 ) ) ?>">
</ins><span class="cx"> <p>
</span><span class="cx"> <label for="upload"><?php _e( 'Choose an image from your computer:' ); ?></label><br />
</span><span class="cx"> <input type="file" id="upload" name="import" />
</span></span></pre></div>
<a id="trunkwpadminincludesplugininstallphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/includes/plugin-install.php (22458 => 22459)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/plugin-install.php 2012-11-07 23:33:21 UTC (rev 22458)
+++ trunk/wp-admin/includes/plugin-install.php 2012-11-07 23:54:03 UTC (rev 22459)
</span><span class="lines">@@ -142,13 +142,13 @@
</span><span class="cx"> */
</span><span class="cx"> function install_plugins_upload( $page = 1 ) {
</span><span class="cx"> ?>
</span><del>- <h4><?php _e('Install a plugin in .zip format') ?></h4>
- <p class="install-help"><?php _e('If you have a plugin in a .zip format, you may install it by uploading it here.') ?></p>
- <form method="post" enctype="multipart/form-data" action="<?php echo self_admin_url('update.php?action=upload-plugin') ?>">
- <?php wp_nonce_field( 'plugin-upload') ?>
</del><ins>+ <h4><?php _e('Install a plugin in .zip format'); ?></h4>
+ <p class="install-help"><?php _e('If you have a plugin in a .zip format, you may install it by uploading it here.'); ?></p>
+ <form method="post" enctype="multipart/form-data" class="wp-upload-form" action="<?php echo self_admin_url('update.php?action=upload-plugin'); ?>">
+ <?php wp_nonce_field( 'plugin-upload'); ?>
</ins><span class="cx"> <label class="screen-reader-text" for="pluginzip"><?php _e('Plugin zip file'); ?></label>
</span><span class="cx"> <input type="file" id="pluginzip" name="pluginzip" />
</span><del>- <input type="submit" class="button" value="<?php esc_attr_e('Install Now') ?>" />
</del><ins>+ <?php submit_button( __( 'Install Now' ), 'button', 'install-plugin-submit', false ); ?>
</ins><span class="cx"> </form>
</span><span class="cx"> <?php
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkwpadminincludestemplatephp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/includes/template.php (22458 => 22459)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/template.php 2012-11-07 23:33:21 UTC (rev 22458)
+++ trunk/wp-admin/includes/template.php 2012-11-07 23:54:03 UTC (rev 22459)
</span><span class="lines">@@ -787,7 +787,7 @@
</span><span class="cx"> <p><strong><?php echo $upload_dir['error']; ?></strong></p></div><?php
</span><span class="cx"> else :
</span><span class="cx"> ?>
</span><del>-<form enctype="multipart/form-data" id="import-upload-form" method="post" action="<?php echo esc_attr(wp_nonce_url($action, 'import-upload')); ?>">
</del><ins>+<form enctype="multipart/form-data" id="import-upload-form" method="post" class="wp-upload-form" action="<?php echo esc_attr(wp_nonce_url($action, 'import-upload')); ?>">
</ins><span class="cx"> <p>
</span><span class="cx"> <label for="upload"><?php _e( 'Choose a file from your computer:' ); ?></label> (<?php printf( __('Maximum size: %s' ), $size ); ?>)
</span><span class="cx"> <input type="file" id="upload" name="import" size="25" />
</span></span></pre></div>
<a id="trunkwpadminincludesthemeinstallphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/includes/theme-install.php (22458 => 22459)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/theme-install.php 2012-11-07 23:33:21 UTC (rev 22458)
+++ trunk/wp-admin/includes/theme-install.php 2012-11-07 23:54:03 UTC (rev 22459)
</span><span class="lines">@@ -134,10 +134,10 @@
</span><span class="cx">
</span><span class="cx"> function install_themes_upload($page = 1) {
</span><span class="cx"> ?>
</span><del>-<h4><?php _e('Install a theme in .zip format') ?></h4>
-<p class="install-help"><?php _e('If you have a theme in a .zip format, you may install it by uploading it here.') ?></p>
-<form method="post" enctype="multipart/form-data" action="<?php echo self_admin_url('update.php?action=upload-theme') ?>">
- <?php wp_nonce_field( 'theme-upload') ?>
</del><ins>+<h4><?php _e('Install a theme in .zip format'); ?></h4>
+<p class="install-help"><?php _e('If you have a theme in a .zip format, you may install it by uploading it here.'); ?></p>
+<form method="post" enctype="multipart/form-data" class="wp-upload-form" action="<?php echo self_admin_url('update.php?action=upload-theme'); ?>">
+ <?php wp_nonce_field( 'theme-upload'); ?>
</ins><span class="cx"> <input type="file" name="themezip" />
</span><span class="cx"> <?php submit_button( __( 'Install Now' ), 'button', 'install-theme-submit', false ); ?>
</span><span class="cx"> </form>
</span></span></pre></div>
<a id="trunkwpadminjscommonjs"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/js/common.js (22458 => 22459)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/js/common.js 2012-11-07 23:33:21 UTC (rev 22458)
+++ trunk/wp-admin/js/common.js 2012-11-07 23:54:03 UTC (rev 22459)
</span><span class="lines">@@ -249,7 +249,7 @@
</span><span class="cx"> sensitivity: 7,
</span><span class="cx"> interval: 90
</span><span class="cx"> });
</span><del>-
</del><ins>+
</ins><span class="cx"> menu.on('focus.adminmenu', '.wp-submenu a', function(e){
</span><span class="cx"> $(e.target).closest('li.menu-top').addClass('opensub');
</span><span class="cx"> }).on('blur.adminmenu', '.wp-submenu a', function(e){
</span><span class="lines">@@ -388,6 +388,20 @@
</span><span class="cx"> if ( e.target.scrollIntoView )
</span><span class="cx"> e.target.scrollIntoView(false);
</span><span class="cx"> });
</span><ins>+
+ // Disable upload buttons until files are selected
+ (function(){
+ var button, input, form = $('form.wp-upload-form');
+ if ( ! form.length )
+ return;
+ button = form.find('input[type="submit"]');
+ input = form.find('input[type="file"]');
+ function toggleUploadButton() {
+ button.prop('disabled', '' === input.val());
+ }
+ toggleUploadButton();
+ input.on('change', toggleUploadButton);
+ })();
</ins><span class="cx"> });
</span><span class="cx">
</span><span class="cx"> // internal use
</span></span></pre>
</div>
</div>
</body>
</html>