<!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>[23110] trunk/wp-includes: When inserting from URL in the media modal, retain query params and properly insert the caption code.</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/23110">23110</a></dd>
<dt>Author</dt> <dd>ryan</dd>
<dt>Date</dt> <dd>2012-12-06 23:12:59 +0000 (Thu, 06 Dec 2012)</dd>
</dl>
<h3>Log Message</h3>
<pre>When inserting from URL in the media modal, retain query params and properly insert the caption code.
Props koopersmith
fixes <a href="http://core.trac.wordpress.org/ticket/22796">#22796</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpincludescssmediaviewscss">trunk/wp-includes/css/media-views.css</a></li>
<li><a href="#trunkwpincludesjsautosavejs">trunk/wp-includes/js/autosave.js</a></li>
<li><a href="#trunkwpincludesjsmediaviewsjs">trunk/wp-includes/js/media-views.js</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpincludescssmediaviewscss"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/css/media-views.css (23109 => 23110)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/css/media-views.css 2012-12-06 19:49:42 UTC (rev 23109)
+++ trunk/wp-includes/css/media-views.css 2012-12-06 23:12:59 UTC (rev 23110)
</span><span class="lines">@@ -1249,6 +1249,18 @@
</span><span class="cx"> /**
</span><span class="cx"> * Spinner
</span><span class="cx"> */
</span><ins>+
+.media-frame .spinner {
+ background: url(../images/wpspin.gif) no-repeat;
+ background-size: 16px 16px;
+ display: none;
+ opacity: 0.7;
+ filter: alpha(opacity=70);
+ width: 16px;
+ height: 16px;
+ margin: 0;
+}
+
</ins><span class="cx"> .media-sidebar .settings-save-status {
</span><span class="cx"> background: #f5f5f5;
</span><span class="cx"> float: right;
</span><span class="lines">@@ -1257,14 +1269,6 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> .media-sidebar .settings-save-status .spinner {
</span><del>- background: url(../images/wpspin.gif) no-repeat;
- background-size: 16px 16px;
- display: none;
- float: right;
- opacity: 0.7;
- filter: alpha(opacity=70);
- width: 16px;
- height: 16px;
</del><span class="cx"> margin: 0 5px 0;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -1397,8 +1401,7 @@
</span><span class="cx"> .embed-url {
</span><span class="cx"> display: block;
</span><span class="cx"> position: relative;
</span><del>- height: 40px;
- padding: 0 16px 16px;
</del><ins>+ padding: 0 16px 7px;
</ins><span class="cx"> margin: 0;
</span><span class="cx"> z-index: 250;
</span><span class="cx"> background: #fff;
</span><span class="lines">@@ -1416,6 +1419,16 @@
</span><span class="cx"> box-shadow: inset 2px 2px 4px -2px rgba( 0, 0, 0, 0.1 );
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+.media-frame .embed-url .spinner {
+ position: absolute;
+ top: 16px;
+ right: 26px;
+}
+
+.media-frame .embed-loading .embed-url .spinner {
+ display: block;
+}
+
</ins><span class="cx"> .embed-link-settings,
</span><span class="cx"> .embed-image-settings {
</span><span class="cx"> position: absolute;
</span><span class="lines">@@ -1437,6 +1450,7 @@
</span><span class="cx">
</span><span class="cx"> .media-embed .thumbnail img {
</span><span class="cx"> max-height: 200px;
</span><ins>+ display: block;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> .media-embed .thumbnail:after {
</span><span class="lines">@@ -1652,7 +1666,7 @@
</span><span class="cx"> background-size: 134px 15px;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- .media-sidebar .settings-save-status .spinner {
</del><ins>+ .media-frame .spinner {
</ins><span class="cx"> background-image: url(../images/wpspin-2x.gif);
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">\ No newline at end of file
</span></span></pre></div>
<a id="trunkwpincludesjsautosavejs"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/js/autosave.js (23109 => 23110)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/js/autosave.js 2012-12-06 19:49:42 UTC (rev 23109)
+++ trunk/wp-includes/js/autosave.js 2012-12-06 23:12:59 UTC (rev 23110)
</span><span class="lines">@@ -230,7 +230,7 @@
</span><span class="cx"> // delay that a bit to avoid some rare collisions while the DOM is being updated.
</span><span class="cx"> setTimeout(function(){
</span><span class="cx"> jQuery(':button, :submit', '#submitpost').removeAttr('disabled');
</span><del>- jQuery('.spinner').hide();
</del><ins>+ jQuery('.spinner', '#submitpost').hide();
</ins><span class="cx"> }, 500);
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkwpincludesjsmediaviewsjs"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/js/media-views.js (23109 => 23110)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/js/media-views.js 2012-12-06 19:49:42 UTC (rev 23109)
+++ trunk/wp-includes/js/media-views.js 2012-12-06 23:12:59 UTC (rev 23110)
</span><span class="lines">@@ -778,9 +778,30 @@
</span><span class="cx"> },
</span><span class="cx">
</span><span class="cx"> scan: function() {
</span><del>- var attributes = { type: 'link' };
</del><ins>+ var scanners,
+ embed = this,
+ attributes = {
+ type: 'link',
+ scanners: []
+ };
</ins><span class="cx">
</span><del>- this.trigger( 'scan', attributes );
</del><ins>+ // Scan is triggered with the list of `attributes` to set on the
+ // state, useful for the 'type' attribute and 'scanners' attribute,
+ // an array of promise objects for asynchronous scan operations.
+ if ( this.props.get('url') )
+ this.trigger( 'scan', attributes );
+
+ if ( attributes.scanners.length ) {
+ scanners = attributes.scanners = $.when.apply( $, attributes.scanners );
+ scanners.always( function() {
+ if ( embed.get('scanners') === scanners )
+ embed.set( 'loading', false );
+ });
+ } else {
+ attributes.scanners = null;
+ }
+
+ attributes.loading = !! attributes.scanners;
</ins><span class="cx"> this.set( attributes );
</span><span class="cx"> },
</span><span class="cx">
</span><span class="lines">@@ -788,26 +809,30 @@
</span><span class="cx"> var frame = this.frame,
</span><span class="cx"> state = this,
</span><span class="cx"> url = this.props.get('url'),
</span><del>- image = new Image();
</del><ins>+ image = new Image(),
+ deferred = $.Deferred();
</ins><span class="cx">
</span><ins>+ attributes.scanners.push( deferred.promise() );
+
</ins><span class="cx"> // Try to load the image and find its width/height.
</span><span class="cx"> image.onload = function() {
</span><ins>+ deferred.resolve();
+
</ins><span class="cx"> if ( state !== frame.state() || url !== state.props.get('url') )
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> state.set({
</span><del>- type: 'image',
</del><ins>+ type: 'image'
+ });
+
+ state.props.set({
</ins><span class="cx"> width: image.width,
</span><span class="cx"> height: image.height
</span><span class="cx"> });
</span><span class="cx"> };
</span><span class="cx">
</span><ins>+ image.onerror = deferred.reject;
</ins><span class="cx"> image.src = url;
</span><del>-
- // Check if the URL looks like an image; skew toward success.
- url = url.replace( /([?|#].*)$/, '' );
- if ( /\.(png|jpe?g|gif)$/i.test( url ) )
- attributes.type = 'image';
</del><span class="cx"> },
</span><span class="cx">
</span><span class="cx"> refresh: function() {
</span><span class="lines">@@ -4147,6 +4172,7 @@
</span><span class="cx"> this.views.set([ this.url ]);
</span><span class="cx"> this.refresh();
</span><span class="cx"> this.model.on( 'change:type', this.refresh, this );
</span><ins>+ this.model.on( 'change:loading', this.loading, this );
</ins><span class="cx"> },
</span><span class="cx">
</span><span class="cx"> settings: function( view ) {
</span><span class="lines">@@ -4172,6 +4198,10 @@
</span><span class="cx"> model: this.model.props,
</span><span class="cx"> priority: 40
</span><span class="cx"> }) );
</span><ins>+ },
+
+ loading: function() {
+ this.$el.toggleClass( 'embed-loading', this.model.get('loading') );
</ins><span class="cx"> }
</span><span class="cx"> });
</span><span class="cx">
</span><span class="lines">@@ -4194,8 +4224,12 @@
</span><span class="cx"> value: this.model.get('url') || ''
</span><span class="cx"> });
</span><span class="cx">
</span><ins>+ this.spinner = this.make( 'span', {
+ 'class': 'spinner'
+ });
+
</ins><span class="cx"> this.$input = $( this.input );
</span><del>- this.$el.append( this.input );
</del><ins>+ this.$el.append([ this.input, this.spinner ]);
</ins><span class="cx">
</span><span class="cx"> this.model.on( 'change:url', this.render, this );
</span><span class="cx"> },
</span></span></pre>
</div>
</div>
</body>
</html>