<!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>[28752] trunk/src/wp-includes/js: Add "edit" mode for `[embed]` and URL media previews.</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/28752">28752</a></dd>
<dt>Author</dt> <dd>wonderboymusic</dd>
<dt>Date</dt> <dd>2014-06-13 21:41:20 +0000 (Fri, 13 Jun 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Add "edit" mode for `[embed]` and URL media previews.
See <a href="http://core.trac.wordpress.org/ticket/28532">#28532</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpincludesjsmceviewjs">trunk/src/wp-includes/js/mce-view.js</a></li>
<li><a href="#trunksrcwpincludesjsmediaeditorjs">trunk/src/wp-includes/js/media-editor.js</a></li>
<li><a href="#trunksrcwpincludesjsmediaviewsjs">trunk/src/wp-includes/js/media-views.js</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcwpincludesjsmceviewjs"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-includes/js/mce-view.js (28751 => 28752)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-includes/js/mce-view.js 2014-06-13 21:25:16 UTC (rev 28751)
+++ trunk/src/wp-includes/js/mce-view.js 2014-06-13 21:41:20 UTC (rev 28752)
</span><span class="lines">@@ -810,11 +810,47 @@
</span><span class="cx"> }
</span><span class="cx"> } );
</span><span class="cx">
</span><del>- wp.mce.views.register( 'embed', {
- View: wp.mce.embedView
- } );
</del><ins>+ wp.mce.embedMixin = {
+ View: wp.mce.embedView,
+ edit: function( node ) {
+ var embed = media.embed,
+ self = this,
+ frame,
+ data,
+ isURL = 'embedURL' === this.shortcode;
</ins><span class="cx">
</span><del>- wp.mce.views.register( 'embedURL', {
</del><ins>+ $( document ).trigger( 'media:edit' );
+
+ data = window.decodeURIComponent( $( node ).attr('data-wpview-text') );
+ frame = embed.edit( data, isURL );
+ frame.on( 'close', function() {
+ frame.detach();
+ } );
+ frame.state( 'embed' ).props.on( 'change:url', function (model, url) {
+ if ( ! url ) {
+ return;
+ }
+ frame.state( 'embed' ).metadata = model.toJSON();
+ } );
+ frame.state( 'embed' ).on( 'select', function() {
+ var shortcode;
+
+ if ( isURL ) {
+ shortcode = frame.state( 'embed' ).metadata.url;
+ } else {
+ shortcode = embed.shortcode( frame.state( 'embed' ).metadata ).string();
+ }
+ $( node ).attr( 'data-wpview-text', window.encodeURIComponent( shortcode ) );
+ wp.mce.views.refreshView( self, shortcode );
+ frame.detach();
+ } );
+ frame.open();
+ }
+ };
+
+ wp.mce.views.register( 'embed', _.extend( {}, wp.mce.embedMixin ) );
+
+ wp.mce.views.register( 'embedURL', _.extend( {}, wp.mce.embedMixin, {
</ins><span class="cx"> toView: function( content ) {
</span><span class="cx"> var re = /(?:^|<p>)(https?:\/\/[^\s"]+?)(?:<\/p>\s*|$)/gi,
</span><span class="cx"> match = re.exec( tinymce.trim( content ) );
</span><span class="lines">@@ -830,8 +866,7 @@
</span><span class="cx"> url: match[1]
</span><span class="cx"> }
</span><span class="cx"> };
</span><del>- },
- View: wp.mce.embedView
- } );
</del><ins>+ }
+ } ) );
</ins><span class="cx">
</span><span class="cx"> }(jQuery));
</span></span></pre></div>
<a id="trunksrcwpincludesjsmediaeditorjs"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-includes/js/media-editor.js (28751 => 28752)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-includes/js/media-editor.js 2014-06-13 21:25:16 UTC (rev 28751)
+++ trunk/src/wp-includes/js/media-editor.js 2014-06-13 21:41:20 UTC (rev 28752)
</span><span class="lines">@@ -298,6 +298,60 @@
</span><span class="cx"> }
</span><span class="cx"> };
</span><span class="cx">
</span><ins>+ wp.media.embed = {
+ coerce : wp.media.coerce,
+
+ defaults : {
+ url : '',
+ width: '',
+ height: ''
+ },
+
+ edit : function( data, isURL ) {
+ var frame, props = {}, shortcode;
+
+ if ( isURL ) {
+ props.url = data.replace(/<[^>]+>/g, '');
+ } else {
+ shortcode = wp.shortcode.next( 'embed', data ).shortcode;
+
+ props = _.defaults( shortcode.attrs.named, this.defaults );
+ if ( shortcode.content ) {
+ props.url = shortcode.content;
+ }
+ }
+
+ frame = wp.media({
+ frame: 'post',
+ state: 'embed',
+ metadata: props
+ });
+
+ return frame;
+ },
+
+ shortcode : function( model ) {
+ var self = this, content;
+
+ _.each( this.defaults, function( value, key ) {
+ model[ key ] = self.coerce( model, key );
+
+ if ( value === model[ key ] ) {
+ delete model[ key ];
+ }
+ });
+
+ content = model.url;
+ delete model.url;
+
+ return new wp.shortcode({
+ tag: 'embed',
+ attrs: model,
+ content: content
+ });
+ }
+ };
+
</ins><span class="cx"> wp.media.collection = function(attributes) {
</span><span class="cx"> var collections = {};
</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 (28751 => 28752)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-includes/js/media-views.js 2014-06-13 21:25:16 UTC (rev 28751)
+++ trunk/src/wp-includes/js/media-views.js 2014-06-13 21:41:20 UTC (rev 28752)
</span><span class="lines">@@ -1402,15 +1402,17 @@
</span><span class="cx">
</span><span class="cx"> priority: 120,
</span><span class="cx"> type: 'link',
</span><del>- url: ''
</del><ins>+ url: '',
+ metadata: {}
</ins><span class="cx"> },
</span><span class="cx">
</span><span class="cx"> // The amount of time used when debouncing the scan.
</span><span class="cx"> sensitivity: 200,
</span><span class="cx">
</span><del>- initialize: function() {
</del><ins>+ initialize: function(options) {
+ this.metadata = options.metadata;
</ins><span class="cx"> this.debouncedScan = _.debounce( _.bind( this.scan, this ), this.sensitivity );
</span><del>- this.props = new Backbone.Model({ url: '' });
</del><ins>+ this.props = new Backbone.Model( this.metadata || { url: '' });
</ins><span class="cx"> this.props.on( 'change:url', this.debouncedScan, this );
</span><span class="cx"> this.props.on( 'change:url', this.refresh, this );
</span><span class="cx"> this.on( 'scan', this.scanImage, this );
</span><span class="lines">@@ -2278,7 +2280,8 @@
</span><span class="cx"> _.defaults( this.options, {
</span><span class="cx"> multiple: true,
</span><span class="cx"> editing: false,
</span><del>- state: 'insert'
</del><ins>+ state: 'insert',
+ metadata: {}
</ins><span class="cx"> });
</span><span class="cx"> /**
</span><span class="cx"> * call 'initialize' directly on the parent class
</span><span class="lines">@@ -2330,7 +2333,7 @@
</span><span class="cx"> }),
</span><span class="cx">
</span><span class="cx"> // Embed states.
</span><del>- new media.controller.Embed(),
</del><ins>+ new media.controller.Embed( { metadata: options.metadata } ),
</ins><span class="cx">
</span><span class="cx"> new media.controller.EditImage( { model: options.editImage } ),
</span><span class="cx">
</span><span class="lines">@@ -6440,13 +6443,21 @@
</span><span class="cx"> },
</span><span class="cx">
</span><span class="cx"> initialize: function() {
</span><del>- this.$input = $('<input id="embed-url-field" />').attr( 'type', 'text' ).val( this.model.get('url') );
</del><ins>+ var self = this;
+
+ this.$input = $('<input id="embed-url-field" type="text" />').val( this.model.get('url') );
</ins><span class="cx"> this.input = this.$input[0];
</span><span class="cx">
</span><span class="cx"> this.spinner = $('<span class="spinner" />')[0];
</span><span class="cx"> this.$el.append([ this.input, this.spinner ]);
</span><span class="cx">
</span><span class="cx"> this.model.on( 'change:url', this.render, this );
</span><ins>+
+ if ( this.model.get( 'url' ) ) {
+ _.delay( function () {
+ self.model.trigger( 'change:url' );
+ }, 500 );
+ }
</ins><span class="cx"> },
</span><span class="cx"> /**
</span><span class="cx"> * @returns {wp.media.view.EmbedUrl} Returns itself to allow chaining
</span></span></pre>
</div>
</div>
</body>
</html>