<!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>[28358] trunk/src: First pass at `wpview` logic for the `[embed]` shortcode.</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/28358">28358</a></dd>
<dt>Author</dt> <dd>wonderboymusic</dd>
<dt>Date</dt> <dd>2014-05-10 23:35:08 +0000 (Sat, 10 May 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>First pass at `wpview` logic for the `[embed]` shortcode. URLs on a their own line are parsed as well. The toolbar will appear with the "remove" button when the view is clicked. Edit has not been implemented yet.
Props avryl, wonderboymusic.
See <a href="http://core.trac.wordpress.org/ticket/28195">#28195</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpadminadminajaxphp">trunk/src/wp-admin/admin-ajax.php</a></li>
<li><a href="#trunksrcwpadminincludesajaxactionsphp">trunk/src/wp-admin/includes/ajax-actions.php</a></li>
<li><a href="#trunksrcwpincludesjsmceviewjs">trunk/src/wp-includes/js/mce-view.js</a></li>
<li><a href="#trunksrcwpincludesjsmediaaudiovideojs">trunk/src/wp-includes/js/media-audiovideo.js</a></li>
<li><a href="#trunksrcwpincludesjstinymcepluginswpviewpluginjs">trunk/src/wp-includes/js/tinymce/plugins/wpview/plugin.js</a></li>
<li><a href="#trunksrcwpincludesmediatemplatephp">trunk/src/wp-includes/media-template.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcwpadminadminajaxphp"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-admin/admin-ajax.php (28357 => 28358)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-admin/admin-ajax.php 2014-05-10 08:01:13 UTC (rev 28357)
+++ trunk/src/wp-admin/admin-ajax.php 2014-05-10 23:35:08 UTC (rev 28358)
</span><span class="lines">@@ -58,7 +58,7 @@
</span><span class="cx"> 'wp-remove-post-lock', 'dismiss-wp-pointer', 'upload-attachment', 'get-attachment',
</span><span class="cx"> 'query-attachments', 'save-attachment', 'save-attachment-compat', 'send-link-to-editor',
</span><span class="cx"> 'send-attachment-to-editor', 'save-attachment-order', 'heartbeat', 'get-revision-diffs',
</span><del>- 'save-user-color-scheme', 'update-widget', 'query-themes',
</del><ins>+ 'save-user-color-scheme', 'update-widget', 'query-themes', 'filter-content'
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> // Register core Ajax calls.
</span></span></pre></div>
<a id="trunksrcwpadminincludesajaxactionsphp"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-admin/includes/ajax-actions.php (28357 => 28358)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-admin/includes/ajax-actions.php 2014-05-10 08:01:13 UTC (rev 28357)
+++ trunk/src/wp-admin/includes/ajax-actions.php 2014-05-10 23:35:08 UTC (rev 28358)
</span><span class="lines">@@ -2506,3 +2506,24 @@
</span><span class="cx">
</span><span class="cx"> wp_send_json_success( $api );
</span><span class="cx"> }
</span><ins>+
+/**
+ * Apply `the_content` filters to a string based on the post ID.
+ *
+ * @since 4.0.0
+ */
+function wp_ajax_filter_content() {
+ global $post;
+
+ if ( ! $post = get_post( (int) $_REQUEST['post_ID'] ) ) {
+ wp_send_json_error();
+ }
+
+ if ( ! current_user_can( 'read_post', $post->ID ) ) {
+ wp_send_json_error();
+ }
+
+ setup_postdata( $post );
+
+ wp_send_json_success( apply_filters( 'the_content', wp_unslash( $_POST['content'] ) ) );
+}
</ins></span></pre></div>
<a id="trunksrcwpincludesjsmceviewjs"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-includes/js/mce-view.js (28357 => 28358)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-includes/js/mce-view.js 2014-05-10 08:01:13 UTC (rev 28357)
+++ trunk/src/wp-includes/js/mce-view.js 2014-05-10 23:35:08 UTC (rev 28358)
</span><span class="lines">@@ -354,28 +354,8 @@
</span><span class="cx"> */
</span><span class="cx"> wp.mce.media = {
</span><span class="cx"> loaded: false,
</span><del>- /**
- * @global wp.shortcode
- *
- * @param {string} content
- * @returns {Object}
- */
- toView: function( content ) {
- var match = wp.shortcode.next( this.shortcode, content );
</del><ins>+ toView: wp.mce.gallery.toView,
</ins><span class="cx">
</span><del>- if ( ! match ) {
- return;
- }
-
- return {
- index: match.index,
- content: match.content,
- options: {
- shortcode: match.shortcode
- }
- };
- },
-
</del><span class="cx"> /**
</span><span class="cx"> * Called when a TinyMCE view is clicked for editing.
</span><span class="cx"> * - Parses the shortcode out of the element's data attribute
</span><span class="lines">@@ -690,4 +670,79 @@
</span><span class="cx"> View: wp.mce.media.PlaylistView
</span><span class="cx"> } );
</span><span class="cx"> wp.mce.views.register( 'playlist', wp.mce.playlist );
</span><ins>+
+ wp.mce.embed = {
+ shortcode: 'embed',
+ toView: wp.mce.gallery.toView,
+ View: wp.mce.View.extend( {
+ className: 'editor-embed',
+ template: media.template( 'editor-embed' ),
+ initialize: function( options ) {
+ this.players = [];
+ this.content = options.content;
+ this.parsed = false;
+ this.shortcode = options.shortcode;
+ _.bindAll( this, 'setHtml', 'setNode', 'fetch' );
+ $( this ).on( 'ready', this.setNode );
+ },
+ unbind: function() {
+ var self = this;
+ this.pauseAllPlayers();
+ _.each( this.players, function ( player ) {
+ self.removePlayer( player );
+ } );
+ this.players = [];
+ },
+ setNode: function ( e, node ) {
+ this.node = node;
+ if ( this.parsed ) {
+ this.parseMediaShortcodes();
+ } else {
+ this.fetch();
+ }
+ },
+ fetch: function () {
+ wp.ajax.send( 'filter-content', {
+ data: {
+ post_ID: $( '#post_ID' ).val(),
+ content: this.shortcode.string()
+ }
+ } ).done( this.setHtml );
+ },
+ setHtml: function ( content ) {
+ var scripts = $( content ).find( 'script' );
+
+ this.parsed = content;
+
+ $( this.node ).html( this.getHtml() );
+ if ( scripts ) {
+ _.each( scripts, function (script) {
+ var element = document.createElement( 'script' );
+ element.type = 'text/javascript';
+ element.src = script.src;
+ tinymce.activeEditor.contentDocument.getElementsByTagName( 'head' )[0].appendChild( element );
+ } );
+ }
+ this.parseMediaShortcodes();
+ },
+ parseMediaShortcodes: function () {
+ var self = this;
+ $( '.wp-audio-shortcode, .wp-video-shortcode', this.node ).each( function ( i, element ) {
+ self.players.push( new MediaElementPlayer( element, self.mejsSettings ) );
+ } );
+ },
+ getHtml: function() {
+ if ( ! this.parsed ) {
+ return '';
+ }
+ return this.template({ content: this.parsed });
+ }
+ } ),
+ edit: function() {}
+ };
+
+ _.extend( wp.mce.embed.View.prototype, wp.media.mixin );
+
+ wp.mce.views.register( 'embed', wp.mce.embed );
+
</ins><span class="cx"> }(jQuery));
</span></span></pre></div>
<a id="trunksrcwpincludesjsmediaaudiovideojs"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-includes/js/media-audiovideo.js (28357 => 28358)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-includes/js/media-audiovideo.js 2014-05-10 08:01:13 UTC (rev 28357)
+++ trunk/src/wp-includes/js/media-audiovideo.js 2014-05-10 23:35:08 UTC (rev 28358)
</span><span class="lines">@@ -131,6 +131,10 @@
</span><span class="cx"> removePlayer: function(t) {
</span><span class="cx"> var featureIndex, feature;
</span><span class="cx">
</span><ins>+ if ( ! t.options ) {
+ return;
+ }
+
</ins><span class="cx"> // invoke features cleanup
</span><span class="cx"> for ( featureIndex in t.options.features ) {
</span><span class="cx"> feature = t.options.features[featureIndex];
</span></span></pre></div>
<a id="trunksrcwpincludesjstinymcepluginswpviewpluginjs"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-includes/js/tinymce/plugins/wpview/plugin.js (28357 => 28358)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-includes/js/tinymce/plugins/wpview/plugin.js 2014-05-10 08:01:13 UTC (rev 28357)
+++ trunk/src/wp-includes/js/tinymce/plugins/wpview/plugin.js 2014-05-10 23:35:08 UTC (rev 28358)
</span><span class="lines">@@ -168,6 +168,12 @@
</span><span class="cx"> event.content = wp.mce.views.toViews( event.content );
</span><span class="cx"> });
</span><span class="cx">
</span><ins>+ editor.on( 'PastePreProcess', function( event ) {
+ if ( event.content.match( /^\s*(https?:\/\/[^\s"]+)\s*$/im ) ) {
+ event.content = '[embed]' + event.content + '[/embed]';
+ }
+ } );
+
</ins><span class="cx"> // When the editor's content has been updated and the DOM has been
</span><span class="cx"> // processed, render the views in the document.
</span><span class="cx"> editor.on( 'SetContent', function( event ) {
</span></span></pre></div>
<a id="trunksrcwpincludesmediatemplatephp"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-includes/media-template.php (28357 => 28358)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-includes/media-template.php 2014-05-10 08:01:13 UTC (rev 28357)
+++ trunk/src/wp-includes/media-template.php 2014-05-10 23:35:08 UTC (rev 28358)
</span><span class="lines">@@ -1045,6 +1045,14 @@
</span><span class="cx"> <div class="upload-errors"></div>
</span><span class="cx"> </script>
</span><span class="cx">
</span><ins>+ <script type="text/html" id="tmpl-editor-embed">
+ <div class="toolbar">
+ <div class="dashicons dashicons-no-alt remove"></div>
+ </div>
+ {{{ data.content }}}
+ <div class="wpview-overlay"></div>
+ </script>
+
</ins><span class="cx"> <?php
</span><span class="cx">
</span><span class="cx"> /**
</span></span></pre>
</div>
</div>
</body>
</html>