Ticket #27366: 27366-11.patch

src/wp-includes/js/media-views.js

@@ -6060 +6060 @@
                         'click .edit-attachment': 'editAttachment',
                         'click .replace-attachment': 'replaceAttachment',
                         'click .advanced-toggle': 'toggleAdvanced',
-                        'change [data-setting="customWidth"]': 'syncCustomSize',
-                        'change [data-setting="customHeight"]': 'syncCustomSize',
-                        'keyup [data-setting="customWidth"]': 'syncCustomSize',
-                        'keyup [data-setting="customHeight"]': 'syncCustomSize'
+                        'change [data-setting="customWidth"]': 'onCustomSize',
+                        'change [data-setting="customHeight"]': 'onCustomSize',
+                        'keyup [data-setting="customWidth"]': 'onCustomSize',
+                        'keyup [data-setting="customHeight"]': 'onCustomSize'
                 } ),
                 initialize: function() {
                         // used in AttachmentDisplay.prototype.updateLinkTo
@@ -6136 +6136 @@
                         }
                 },
 
-                syncCustomSize: function( event ) {
+                onCustomSize: function( event ) {
                         var dimension = $( event.target ).data('setting'),
+                                num = $( event.target ).val(),
                                 value;
 
+                        // Ignore bogus input
+                        if ( ! /^\d+/.test( num ) || parseInt( num, 10 ) < 1 ) {
+                                event.preventDefault();
+                                return;
+                        }
+
                         if ( dimension === 'customWidth' ) {
-                                value = Math.round( 1 / this.model.get( 'aspectRatio' ) * $( event.target ).val() );
+                                value = Math.round( 1 / this.model.get( 'aspectRatio' ) * num );
                                 this.model.set( 'customHeight', value, { silent: true } );
                                 this.$( '[data-setting="customHeight"]' ).val( value );
                         } else {
-                                value = Math.round( this.model.get( 'aspectRatio' ) * $( event.target ).val() );
+                                value = Math.round( this.model.get( 'aspectRatio' ) * num );
+                                this.model.set( 'customWidth', value, { silent: true  } );
                                 this.$( '[data-setting="customWidth"]' ).val( value );
-                                this.model.set( 'customWidth', value, { silent: true } );
+
                         }
                 },
 

src/wp-includes/js/tinymce/plugins/wpeditimage/plugin.js

@@ -114 +114 @@
         }
 
         function extractImageData( imageNode ) {
-                var classes, extraClasses, metadata, captionBlock, caption, link, width, height,
+                var classes, extraClasses, metadata, captionBlock, caption, link, width,
                         dom = editor.dom;
 
                 // default attributes
                 metadata = {
                         attachment_id: false,
-                        url: false,
-                        height: '',
-                        width: '',
-                        customWidth: '',
-                        customHeight: '',
                         size: 'custom',
                         caption: '',
-                        alt: '',
                         align: 'none',
                         extraClasses: '',
                         link: false,
@@ -141 +135 @@
                 metadata.url = dom.getAttrib( imageNode, 'src' );
                 metadata.alt = dom.getAttrib( imageNode, 'alt' );
                 metadata.title = dom.getAttrib( imageNode, 'title' );
-                width = dom.getAttrib( imageNode, 'width' ) || imageNode.width;
-                height = dom.getAttrib( imageNode, 'height' ) || imageNode.height;
-                metadata.width = parseInt( width, 10 );
-                metadata.height = parseInt( height, 10 );
-                metadata.customWidth = metadata.width;
-                metadata.customHeight = metadata.height;
+                metadata.customWidth = metadata.width = width = imageNode.width;
+                metadata.customHeight = metadata.height = imageNode.height;
 
                 classes = tinymce.explode( imageNode.className, ' ' );
                 extraClasses = [];