Changeset 22459

Timestamp:

11/07/2012 11:54:03 PM (14 years ago)

Author:

nacin

Message:

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 #20855.

Location:

trunk/wp-admin

Files:

• custom-background.php (modified) (1 diff)
• custom-header.php (modified) (1 diff)
• includes/plugin-install.php (modified) (1 diff)
• includes/template.php (modified) (1 diff)
• includes/theme-install.php (modified) (1 diff)
• js/common.js (modified) (2 diffs)

trunk/wp-admin/custom-background.php

@@ -255 +255 @@
 <tr valign="top">
 <th scope="row"><?php _e('Select Image'); ?></th>
-<td><form enctype="multipart/form-data" id="upload-form" method="post" action="">
+<td><form enctype="multipart/form-data" id="upload-form" class="wp-upload-form" method="post" action="">
         <p>
                 <label for="upload"><?php _e( 'Choose an image from your computer:' ); ?></label><br />

trunk/wp-admin/custom-header.php

@@ -526 +526 @@
         }
         ?></p>
-        <form enctype="multipart/form-data" id="upload-form" method="post" action="<?php echo esc_attr( add_query_arg( 'step', 2 ) ) ?>">
+        <form enctype="multipart/form-data" id="upload-form" class="wp-upload-form" method="post" action="<?php echo esc_attr( add_query_arg( 'step', 2 ) ) ?>">
         <p>
                 <label for="upload"><?php _e( 'Choose an image from your computer:' ); ?></label><br />

trunk/wp-admin/includes/plugin-install.php

@@ -143 +143 @@
 function install_plugins_upload( $page = 1 ) {
 ?>
-        <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') ?>
+        <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'); ?>
                 <label class="screen-reader-text" for="pluginzip"><?php _e('Plugin zip file'); ?></label>
                 <input type="file" id="pluginzip" name="pluginzip" />
-                <input type="submit" class="button" value="<?php esc_attr_e('Install Now') ?>" />
+                <?php submit_button( __( 'Install Now' ), 'button', 'install-plugin-submit', false ); ?>
         </form>
 <?php

trunk/wp-admin/includes/template.php

@@ -788 +788 @@
         else :
 ?>
-<form enctype="multipart/form-data" id="import-upload-form" method="post" action="<?php echo esc_attr(wp_nonce_url($action, 'import-upload')); ?>">
+<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')); ?>">
 <p>
 <label for="upload"><?php _e( 'Choose a file from your computer:' ); ?></label> (<?php printf( __('Maximum size: %s' ), $size ); ?>)

trunk/wp-admin/includes/theme-install.php

@@ -135 +135 @@
 function install_themes_upload($page = 1) {
 ?>
-<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') ?>
+<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'); ?>
         <input type="file" name="themezip" />
         <?php submit_button( __( 'Install Now' ), 'button', 'install-theme-submit', false ); ?>

trunk/wp-admin/js/common.js

@@ -250 +250 @@
                         interval: 90
                 });
-                
+
                 menu.on('focus.adminmenu', '.wp-submenu a', function(e){
                         $(e.target).closest('li.menu-top').addClass('opensub');
@@ -389 +389 @@
                         e.target.scrollIntoView(false);
         });
+
+        // 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);
+        })();
 });