Changeset 37966

Timestamp:

07/05/2016 01:36:59 PM (4 years ago)

Author:

ocean90

Message:

Media: Improve form validation errors handling when editing images.

• Use the same check for a numeric value used on the crop fields on all the other fields: don't display "NaN", just empty the field.
• Remove the inline script that runs the initialization of the image editor and call it after the editor UI is fully ready.

Props afercia.
Fixes #36316.

Location:

trunk/src/wp-admin

Files:

• includes/image-edit.php (modified) (4 diffs)
• js/image-edit.js (modified) (6 diffs)

trunk/src/wp-admin/includes/image-edit.php

@@ -61 +61 @@
         <div class="nowrap">
         <label><span class="screen-reader-text"><?php _e( 'scale width' ); ?></span>
-        <input type="text" id="imgedit-scale-width-<?php echo $post_id; ?>" onkeyup="imageEdit.scaleChanged(<?php echo $post_id; ?>, 1)" onblur="imageEdit.scaleChanged(<?php echo $post_id; ?>, 1)" value="<?php echo isset( $meta['width'] ) ? $meta['width'] : 0; ?>" />
+        <input type="text" id="imgedit-scale-width-<?php echo $post_id; ?>" onkeyup="imageEdit.scaleChanged(<?php echo $post_id; ?>, 1, this)" onblur="imageEdit.scaleChanged(<?php echo $post_id; ?>, 1, this)" value="<?php echo isset( $meta['width'] ) ? $meta['width'] : 0; ?>" />
         </label>
         <span class="imgedit-separator">&times;</span>
         <label><span class="screen-reader-text"><?php _e( 'scale height' ); ?></span>
-        <input type="text" id="imgedit-scale-height-<?php echo $post_id; ?>" onkeyup="imageEdit.scaleChanged(<?php echo $post_id; ?>, 0)" onblur="imageEdit.scaleChanged(<?php echo $post_id; ?>, 0)" value="<?php echo isset( $meta['height'] ) ? $meta['height'] : 0; ?>" />
+        <input type="text" id="imgedit-scale-height-<?php echo $post_id; ?>" onkeyup="imageEdit.scaleChanged(<?php echo $post_id; ?>, 0, this)" onblur="imageEdit.scaleChanged(<?php echo $post_id; ?>, 0, this)" value="<?php echo isset( $meta['height'] ) ? $meta['height'] : 0; ?>" />
         </label>
         <span class="imgedit-scale-warn" id="imgedit-scale-warn-<?php echo $post_id; ?>">!</span>
@@ -117 +117 @@
         <div class="nowrap">
         <label><span class="screen-reader-text"><?php _e( 'crop ratio width' ); ?></span>
-        <input type="text" id="imgedit-crop-width-<?php echo $post_id; ?>" onkeyup="imageEdit.setRatioSelection(<?php echo $post_id; ?>, 0, this)" />
+        <input type="text" id="imgedit-crop-width-<?php echo $post_id; ?>" onkeyup="imageEdit.setRatioSelection(<?php echo $post_id; ?>, 0, this)" onblur="imageEdit.setRatioSelection(<?php echo $post_id; ?>, 0, this)" />
         </label>
         <span class="imgedit-separator">:</span>
         <label><span class="screen-reader-text"><?php _e( 'crop ratio height' ); ?></span>
-        <input type="text" id="imgedit-crop-height-<?php echo $post_id; ?>" onkeyup="imageEdit.setRatioSelection(<?php echo $post_id; ?>, 1, this)" />
+        <input type="text" id="imgedit-crop-height-<?php echo $post_id; ?>" onkeyup="imageEdit.setRatioSelection(<?php echo $post_id; ?>, 1, this)" onblur="imageEdit.setRatioSelection(<?php echo $post_id; ?>, 1, this)" />
         </label>
         </div>
@@ -130 +130 @@
         <div class="nowrap">
         <label><span class="screen-reader-text"><?php _e( 'selection width' ); ?></span>
-        <input type="text" id="imgedit-sel-width-<?php echo $post_id; ?>" onkeyup="imageEdit.setNumSelection(<?php echo $post_id; ?>)" />
+        <input type="text" id="imgedit-sel-width-<?php echo $post_id; ?>" onkeyup="imageEdit.setNumSelection(<?php echo $post_id; ?>, this)" onblur="imageEdit.setNumSelection(<?php echo $post_id; ?>, this)" />
         </label>
         <span class="imgedit-separator">&times;</span>
         <label><span class="screen-reader-text"><?php _e( 'selection height' ); ?></span>
-        <input type="text" id="imgedit-sel-height-<?php echo $post_id; ?>" onkeyup="imageEdit.setNumSelection(<?php echo $post_id; ?>)" />
+        <input type="text" id="imgedit-sel-height-<?php echo $post_id; ?>" onkeyup="imageEdit.setNumSelection(<?php echo $post_id; ?>, this)" onblur="imageEdit.setNumSelection(<?php echo $post_id; ?>, this)" />
         </label>
         </div>
@@ -225 +225 @@
     </div>
     <div class="imgedit-wait" id="imgedit-wait-<?php echo $post_id; ?>"></div>
-    <script type="text/javascript">jQuery( function() { imageEdit.init(<?php echo $post_id; ?>); });</script>
     <div class="hidden" id="imgedit-leaving-<?php echo $post_id; ?>"><?php _e("There are unsaved changes that will be lost. 'OK' to continue, 'Cancel' to return to the Image Editor."); ?></div>
     </div>

trunk/src/wp-admin/js/image-edit.js

@@ -9 +9 @@
 
     intval : function(f) {
+        /*
+         * Bitwise OR operator: one of the obscure ways to truncate floating point figures,
+         * worth reminding JavaScript doesn't have a distinct "integer" type.
+         */
         return f | 0;
     },
@@ -80 +84 @@
     },
 
-    scaleChanged : function(postid, x) {
+    scaleChanged : function( postid, x, el ) {
         var w = $('#imgedit-scale-width-' + postid), h = $('#imgedit-scale-height-' + postid),
         warn = $('#imgedit-scale-warn-' + postid), w1 = '', h1 = '';
+
+        if ( false === this.validateNumeric( el ) ) {
+            return;
+        }
 
         if ( x ) {
@@ -362 +370 @@
                 spin.removeClass( 'is-active' );
             });
+            // Initialise the Image Editor now that everything is ready.
+            imageEdit.init( postid );
         });
 
@@ -587 +597 @@
     },
 
-    setNumSelection : function(postid) {
+    setNumSelection : function( postid, el ) {
         var sel, elX = $('#imgedit-sel-width-' + postid), elY = $('#imgedit-sel-height-' + postid),
             x = this.intval( elX.val() ), y = this.intval( elY.val() ),
             img = $('#image-preview-' + postid), imgh = img.height(), imgw = img.width(),
             sizer = this.hold.sizer, x1, y1, x2, y2, ias = this.iasapi;
+
+        if ( false === this.validateNumeric( el ) ) {
+            return;
+        }
 
         if ( x < 1 ) {
@@ -651 +665 @@
             h = $('#image-preview-' + postid).height();
 
-        if ( !this.intval( $(el).val() ) ) {
-            $(el).val('');
+        if ( false === this.validateNumeric( el ) ) {
             return;
         }
@@ -677 +690 @@
             }
         }
+    },
+
+    validateNumeric: function( el ) {
+        if ( ! this.intval( $( el ).val() ) ) {
+            $( el ).val( '' );
+            return false;
+        }
     }
 };