<!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>[27942] trunk/src/wp-includes/js: Edit image modal:</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">
<dt>Revision</dt> <dd><a href="http://core.trac.wordpress.org/changeset/27942">27942</a></dd>
<dt>Author</dt> <dd>azaozz</dd>
<dt>Date</dt> <dd>2014-04-04 01:48:24 +0000 (Fri, 04 Apr 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Edit image modal:
- Make the calculation of the aspect ratio more robust.
- Better getting of the image height and width.
Props gcorne, see <a href="http://core.trac.wordpress.org/ticket/27366">#27366</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpincludesjsmediamodelsjs">trunk/src/wp-includes/js/media-models.js</a></li>
<li><a href="#trunksrcwpincludesjsmediaviewsjs">trunk/src/wp-includes/js/media-views.js</a></li>
<li><a href="#trunksrcwpincludesjstinymcepluginswpeditimagepluginjs">trunk/src/wp-includes/js/tinymce/plugins/wpeditimage/plugin.js</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcwpincludesjsmediamodelsjs"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-includes/js/media-models.js (27941 => 27942)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-includes/js/media-models.js 2014-04-04 01:30:11 UTC (rev 27941)
+++ trunk/src/wp-includes/js/media-models.js 2014-04-04 01:48:24 UTC (rev 27942)
</span><span class="lines">@@ -369,13 +369,14 @@
</span><span class="cx"> this.on( 'change:size', this.updateSize, this );
</span><span class="cx">
</span><span class="cx"> this.setLinkTypeFromUrl();
</span><ins>+ this.setAspectRatio();
</ins><span class="cx">
</span><del>- this.set( 'aspectRatio', attributes.customWidth / attributes.customHeight );
</del><span class="cx"> this.set( 'originalUrl', attributes.url );
</span><span class="cx"> },
</span><span class="cx">
</span><span class="cx"> bindAttachmentListeners: function() {
</span><span class="cx"> this.listenTo( this.attachment, 'sync', this.setLinkTypeFromUrl );
</span><ins>+ this.listenTo( this.attachment, 'sync', this.setAspectRatio );
</ins><span class="cx"> this.listenTo( this.attachment, 'change', this.updateSize );
</span><span class="cx"> },
</span><span class="cx">
</span><span class="lines">@@ -466,6 +467,21 @@
</span><span class="cx"> this.set( 'url', size.url );
</span><span class="cx"> this.set( 'width', size.width );
</span><span class="cx"> this.set( 'height', size.height );
</span><ins>+ },
+
+ setAspectRatio: function() {
+ var full;
+
+ if ( this.attachment ) {
+ full = this.attachment.get( 'sizes' ).full;
+
+ if ( full ) {
+ this.set( 'aspectRatio', full.width / full.height );
+ return;
+ }
+ }
+
+ this.set( 'aspectRatio', this.get( 'customWidth' ) / this.get( 'customHeight' ) );
</ins><span class="cx"> }
</span><span class="cx"> });
</span><span class="cx">
</span></span></pre></div>
<a id="trunksrcwpincludesjsmediaviewsjs"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-includes/js/media-views.js (27941 => 27942)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-includes/js/media-views.js 2014-04-04 01:30:11 UTC (rev 27941)
+++ trunk/src/wp-includes/js/media-views.js 2014-04-04 01:48:24 UTC (rev 27942)
</span><span class="lines">@@ -6060,10 +6060,10 @@
</span><span class="cx"> 'click .edit-attachment': 'editAttachment',
</span><span class="cx"> 'click .replace-attachment': 'replaceAttachment',
</span><span class="cx"> 'click .advanced-toggle': 'toggleAdvanced',
</span><del>- 'change [data-setting="customWidth"]': 'syncCustomSize',
- 'change [data-setting="customHeight"]': 'syncCustomSize',
- 'keyup [data-setting="customWidth"]': 'syncCustomSize',
- 'keyup [data-setting="customHeight"]': 'syncCustomSize'
</del><ins>+ 'change [data-setting="customWidth"]': 'onCustomSize',
+ 'change [data-setting="customHeight"]': 'onCustomSize',
+ 'keyup [data-setting="customWidth"]': 'onCustomSize',
+ 'keyup [data-setting="customHeight"]': 'onCustomSize'
</ins><span class="cx"> } ),
</span><span class="cx"> initialize: function() {
</span><span class="cx"> // used in AttachmentDisplay.prototype.updateLinkTo
</span><span class="lines">@@ -6136,18 +6136,26 @@
</span><span class="cx"> }
</span><span class="cx"> },
</span><span class="cx">
</span><del>- syncCustomSize: function( event ) {
</del><ins>+ onCustomSize: function( event ) {
</ins><span class="cx"> var dimension = $( event.target ).data('setting'),
</span><ins>+ num = $( event.target ).val(),
</ins><span class="cx"> value;
</span><span class="cx">
</span><ins>+ // Ignore bogus input
+ if ( ! /^\d+/.test( num ) || parseInt( num, 10 ) < 1 ) {
+ event.preventDefault();
+ return;
+ }
+
</ins><span class="cx"> if ( dimension === 'customWidth' ) {
</span><del>- value = Math.round( 1 / this.model.get( 'aspectRatio' ) * $( event.target ).val() );
</del><ins>+ value = Math.round( 1 / this.model.get( 'aspectRatio' ) * num );
</ins><span class="cx"> this.model.set( 'customHeight', value, { silent: true } );
</span><span class="cx"> this.$( '[data-setting="customHeight"]' ).val( value );
</span><span class="cx"> } else {
</span><del>- value = Math.round( this.model.get( 'aspectRatio' ) * $( event.target ).val() );
</del><ins>+ value = Math.round( this.model.get( 'aspectRatio' ) * num );
+ this.model.set( 'customWidth', value, { silent: true } );
</ins><span class="cx"> this.$( '[data-setting="customWidth"]' ).val( value );
</span><del>- this.model.set( 'customWidth', value, { silent: true } );
</del><ins>+
</ins><span class="cx"> }
</span><span class="cx"> },
</span><span class="cx">
</span></span></pre></div>
<a id="trunksrcwpincludesjstinymcepluginswpeditimagepluginjs"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-includes/js/tinymce/plugins/wpeditimage/plugin.js (27941 => 27942)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-includes/js/tinymce/plugins/wpeditimage/plugin.js 2014-04-04 01:30:11 UTC (rev 27941)
+++ trunk/src/wp-includes/js/tinymce/plugins/wpeditimage/plugin.js 2014-04-04 01:48:24 UTC (rev 27942)
</span><span class="lines">@@ -115,19 +115,14 @@
</span><span class="cx">
</span><span class="cx"> function extractImageData( imageNode ) {
</span><span class="cx"> var classes, extraClasses, metadata, captionBlock, caption, link, width, height,
</span><del>- dom = editor.dom;
</del><ins>+ dom = editor.dom,
+ isIntRegExp = /^\d+$/;
</ins><span class="cx">
</span><span class="cx"> // default attributes
</span><span class="cx"> metadata = {
</span><span class="cx"> attachment_id: false,
</span><del>- url: false,
- height: '',
- width: '',
- customWidth: '',
- customHeight: '',
</del><span class="cx"> size: 'custom',
</span><span class="cx"> caption: '',
</span><del>- alt: '',
</del><span class="cx"> align: 'none',
</span><span class="cx"> extraClasses: '',
</span><span class="cx"> link: false,
</span><span class="lines">@@ -141,13 +136,21 @@
</span><span class="cx"> metadata.url = dom.getAttrib( imageNode, 'src' );
</span><span class="cx"> metadata.alt = dom.getAttrib( imageNode, 'alt' );
</span><span class="cx"> metadata.title = dom.getAttrib( imageNode, 'title' );
</span><del>- 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;
</del><span class="cx">
</span><ins>+ width = dom.getAttrib( imageNode, 'width' );
+ height = dom.getAttrib( imageNode, 'height' );
+
+ if ( ! isIntRegExp.test( width ) || parseInt( width, 10 ) < 1 ) {
+ width = imageNode.naturalWidth || imageNode.width;
+ }
+
+ if ( ! isIntRegExp.test( height ) || parseInt( height, 10 ) < 1 ) {
+ height = imageNode.naturalHeight || imageNode.height;
+ }
+
+ metadata.customWidth = metadata.width = width;
+ metadata.customHeight = metadata.height = height;
+
</ins><span class="cx"> classes = tinymce.explode( imageNode.className, ' ' );
</span><span class="cx"> extraClasses = [];
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>