<!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>[33426] trunk/src/wp-includes: TinyMCE: views: use media setting to get post ID</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" style="font-size: 105%">
<dt style="float: left; width: 6em; font-weight: bold">Revision</dt> <dd><a style="font-weight: bold" href="https://core.trac.wordpress.org/changeset/33426">33426</a><script type="application/ld+json">{"@context":"http://schema.org","@type":"EmailMessage","description":"Review this Commit","action":{"@type":"ViewAction","url":"https://core.trac.wordpress.org/changeset/33426","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>iseulde</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2015-07-26 10:10:31 +0000 (Sun, 26 Jul 2015)</dd>
</dl>
<pre style='padding-left: 1em; margin: 2em 0; border-left: 2px solid #ccc; line-height: 1.25; font-size: 105%; font-family: sans-serif'>TinyMCE: views: use media setting to get post ID
Also fix dependency declarations and confusing variable names.
Props rhurling.
Fixes <a href="https://core.trac.wordpress.org/ticket/33096">#33096</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpincludesjsmceviewjs">trunk/src/wp-includes/js/mce-view.js</a></li>
<li><a href="#trunksrcwpincludesscriptloaderphp">trunk/src/wp-includes/script-loader.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcwpincludesjsmceviewjs"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/js/mce-view.js</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/js/mce-view.js 2015-07-26 09:40:58 UTC (rev 33425)
+++ trunk/src/wp-includes/js/mce-view.js 2015-07-26 10:10:31 UTC (rev 33426)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1,7 +1,5 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /* global tinymce */
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-window.wp = window.wp || {};
-
</del><span class="cx" style="display: block; padding: 0 10px"> /*
</span><span class="cx" style="display: block; padding: 0 10px"> * The TinyMCE view API.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -24,7 +22,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * |- registered view
</span><span class="cx" style="display: block; padding: 0 10px"> * | |- ...
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-( function( window, wp, $ ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+( function( window, wp, shortcode, $ ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> 'use strict';
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> var views = {},
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -671,7 +669,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @return {Object}
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> match: function( content ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- var match = wp.shortcode.next( this.type, content );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ var match = shortcode.next( this.type, content );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( match ) {
</span><span class="cx" style="display: block; padding: 0 10px"> return {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -720,30 +718,28 @@
</span><span class="cx" style="display: block; padding: 0 10px"> editor.focus();
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> } );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-} )( window, window.wp, window.jQuery );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+} )( window, window.wp, window.wp.shortcode, window.jQuery );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /*
</span><span class="cx" style="display: block; padding: 0 10px"> * The WordPress core TinyMCE views.
</span><span class="cx" style="display: block; padding: 0 10px"> * Views for the gallery, audio, video, playlist and embed shortcodes,
</span><span class="cx" style="display: block; padding: 0 10px"> * and a view for embeddable URLs.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-( function( window, views, $ ) {
- var postID = $( '#post_ID' ).val() || 0,
- media, gallery, av, embed;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+( function( window, views, media ) {
+ var base, gallery, av, embed;
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- media = {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ base = {
</ins><span class="cx" style="display: block; padding: 0 10px"> state: [],
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> edit: function( text, update ) {
</span><span class="cx" style="display: block; padding: 0 10px"> var type = this.type,
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- media = wp.media[ type ],
- frame = media.edit( text );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ frame = media[ type ].edit( text );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> this.pausePlayers && this.pausePlayers();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> _.each( this.state, function( state ) {
</span><span class="cx" style="display: block; padding: 0 10px"> frame.state( state ).on( 'update', function( selection ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- update( media.shortcode( selection ).string(), type === 'gallery' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ update( media[ type ].shortcode( selection ).string(), type === 'gallery' );
</ins><span class="cx" style="display: block; padding: 0 10px"> } );
</span><span class="cx" style="display: block; padding: 0 10px"> } );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -755,12 +751,12 @@
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> };
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- gallery = _.extend( {}, media, {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ gallery = _.extend( {}, base, {
</ins><span class="cx" style="display: block; padding: 0 10px"> state: [ 'gallery-edit' ],
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- template: wp.media.template( 'editor-gallery' ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ template: media.template( 'editor-gallery' ),
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> initialize: function() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- var attachments = wp.media.gallery.attachments( this.shortcode, postID ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ var attachments = media.gallery.attachments( this.shortcode, media.view.settings.post.id ),
</ins><span class="cx" style="display: block; padding: 0 10px"> attrs = this.shortcode.attrs.named,
</span><span class="cx" style="display: block; padding: 0 10px"> self = this;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -782,7 +778,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> self.render( self.template( {
</span><span class="cx" style="display: block; padding: 0 10px"> attachments: attachments,
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- columns: attrs.columns ? parseInt( attrs.columns, 10 ) : wp.media.galleryDefaults.columns
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ columns: attrs.columns ? parseInt( attrs.columns, 10 ) : media.galleryDefaults.columns
</ins><span class="cx" style="display: block; padding: 0 10px"> } ) );
</span><span class="cx" style="display: block; padding: 0 10px"> } )
</span><span class="cx" style="display: block; padding: 0 10px"> .fail( function( jqXHR, textStatus ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -791,7 +787,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> } );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- av = _.extend( {}, media, {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ av = _.extend( {}, base, {
</ins><span class="cx" style="display: block; padding: 0 10px"> action: 'parse-media-shortcode',
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> initialize: function() {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -799,13 +795,13 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( this.url ) {
</span><span class="cx" style="display: block; padding: 0 10px"> this.loader = false;
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- this.shortcode = wp.media.embed.shortcode( {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ this.shortcode = media.embed.shortcode( {
</ins><span class="cx" style="display: block; padding: 0 10px"> url: this.text
</span><span class="cx" style="display: block; padding: 0 10px"> } );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> wp.ajax.post( this.action, {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- post_ID: postID,
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ post_ID: media.view.settings.post.id,
</ins><span class="cx" style="display: block; padding: 0 10px"> type: this.shortcode.tag,
</span><span class="cx" style="display: block; padding: 0 10px"> shortcode: this.shortcode.string()
</span><span class="cx" style="display: block; padding: 0 10px"> } )
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -846,8 +842,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> action: 'parse-embed',
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> edit: function( text, update ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- var media = wp.media.embed,
- frame = media.edit( text, this.url ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ var frame = media.embed.edit( text, this.url ),
</ins><span class="cx" style="display: block; padding: 0 10px"> self = this;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> this.pausePlayers();
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -864,7 +859,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> if ( self.url ) {
</span><span class="cx" style="display: block; padding: 0 10px"> update( data.url );
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- update( media.shortcode( data ).string() );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ update( media.embed.shortcode( data ).string() );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> } );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -908,4 +903,4 @@
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> } ) );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-} )( window, window.wp.mce.views, window.jQuery );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+} )( window, window.wp.mce.views, window.wp.media );
</ins></span></pre></div>
<a id="trunksrcwpincludesscriptloaderphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/script-loader.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/script-loader.php 2015-07-26 09:40:58 UTC (rev 33425)
+++ trunk/src/wp-includes/script-loader.php 2015-07-26 10:10:31 UTC (rev 33426)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -456,7 +456,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $scripts->add( 'media-views', "/wp-includes/js/media-views$suffix.js", array( 'utils', 'media-models', 'wp-plupload', 'jquery-ui-sortable', 'wp-mediaelement' ), false, 1 );
</span><span class="cx" style="display: block; padding: 0 10px"> $scripts->add( 'media-editor', "/wp-includes/js/media-editor$suffix.js", array( 'shortcode', 'media-views' ), false, 1 );
</span><span class="cx" style="display: block; padding: 0 10px"> $scripts->add( 'media-audiovideo', "/wp-includes/js/media-audiovideo$suffix.js", array( 'media-editor' ), false, 1 );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $scripts->add( 'mce-view', "/wp-includes/js/mce-view$suffix.js", array( 'shortcode', 'media-models', 'media-audiovideo', 'wp-playlist' ), false, 1 );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $scripts->add( 'mce-view', "/wp-includes/js/mce-view$suffix.js", array( 'shortcode', 'jquery', 'media-views', 'media-audiovideo' ), false, 1 );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( is_admin() ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $scripts->add( 'admin-tags', "/wp-admin/js/tags$suffix.js", array( 'jquery', 'wp-ajax-response' ), false, 1 );
</span></span></pre>
</div>
</div>
</body>
</html>