WordPress-C
/
WordPress
mirror of https://github.com/WordPress/WordPress.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Cleanup after [29179]: 

* `_WP_Editors::editor_settings()` no longer needs to load MEjs styles
* Make sure each identical shortcode with multiple instances also has an iframe sandbox for each instance
* For the time being, make audio and video shortcodes bypass the loading placeholder to avoid whiplash visually

Props avryl, wonderboymusic.
See #28905.

Built from https://develop.svn.wordpress.org/trunk@29187


git-svn-id: http://core.svn.wordpress.org/trunk@28971 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
Scott Taylor 2014-07-16 15:40:14 +00:00
parent a97559bf57
commit 57e966100f
3 changed files with 104 additions and 78 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
wp-includes/class-wp-editor.php
View File

@ -503,14 +503,10 @@ final class _WP_Editors {
$suffix = defined( 'SCRIPT_DEBUG' ) && SCRIPT_DEBUG ? '' : '.min'; $suffix = defined( 'SCRIPT_DEBUG' ) && SCRIPT_DEBUG ? '' : '.min';
$version = 'ver=' . $GLOBALS['wp_version']; $version = 'ver=' . $GLOBALS['wp_version'];
$dashicons = includes_url( "css/dashicons$suffix.css?$version" ); $dashicons = includes_url( "css/dashicons$suffix.css?$version" );
$mediaelement = includes_url( "js/mediaelement/mediaelementplayer.min.css?$version" );
$wpmediaelement = includes_url( "js/mediaelement/wp-mediaelement.css?$version" );
// WordPress default stylesheet and dashicons // WordPress default stylesheet and dashicons
$mce_css = array( $mce_css = array(
$dashicons, $dashicons,
$mediaelement,
$wpmediaelement,
self::$baseurl . '/skins/wordpress/wp-content.css?' . $version self::$baseurl . '/skins/wordpress/wp-content.css?' . $version
); );

60
wp-includes/js/mce-view.js
View File

@ -69,13 +69,29 @@ window.wp = window.wp || {};
); );
}, },
unbind: function() {}, unbind: function() {},
setContent: function( html, callback, option ) { getNodes: function( callback ) {
var nodes = [];
_.each( tinymce.editors, function( editor ) { _.each( tinymce.editors, function( editor ) {
var self = this;
if ( editor.plugins.wpview ) { if ( editor.plugins.wpview ) {
$( editor.getBody() ) $( editor.getBody() )
.find( '[data-wpview-text="' + this.encodedText + '"]' ) .find( '[data-wpview-text="' + this.encodedText + '"]' )
.each( function ( i, element ) { .each( function ( i, node ) {
if ( callback ) {
callback( editor, node );
}
nodes.push( node );
} );
}
}, this );
return nodes;
},
setContent: function( html, callback, option ) {
var self = this;
this.getNodes( function ( editor, element ) {
var contentWrap = $( element ).find( '.wpview-content' ), var contentWrap = $( element ).find( '.wpview-content' ),
wrap = element; wrap = element;
@ -101,18 +117,22 @@ window.wp = window.wp || {};
callback( self, editor, $( element ).find( '.wpview-content' )[0] ); callback( self, editor, $( element ).find( '.wpview-content' )[0] );
} }
} ); } );
}
}, this );
}, },
/* jshint scripturl: true */ /* jshint scripturl: true */
createIframe: function ( content ) { createIframe: function ( content ) {
var MutationObserver = window.MutationObserver || window.WebKitMutationObserver || window.MozMutationObserver, var MutationObserver = window.MutationObserver || window.WebKitMutationObserver || window.MozMutationObserver;
iframe, iframeDoc, i, resize,
dom = tinymce.DOM;
if ( content.indexOf( '<script' ) !== -1 ) { if ( content.indexOf( '<script' ) !== -1 ) {
iframe = dom.create( 'iframe', { this.getNodes( function ( editor, node ) {
var dom = editor.dom,
iframe, iframeDoc, i, resize;
node = $( node ).find( '.wpview-content' )[0];
node.innerHTML = '';
iframe = dom.add( node, 'iframe', {
src: tinymce.Env.ie ? 'javascript:""' : '', src: tinymce.Env.ie ? 'javascript:""' : '',
frameBorder: '0', frameBorder: '0',
allowTransparency: 'true', allowTransparency: 'true',
@ -123,7 +143,6 @@ window.wp = window.wp || {};
} }
} ); } );
this.setContent( iframe );
iframeDoc = iframe.contentWindow.document; iframeDoc = iframe.contentWindow.document;
iframeDoc.open(); iframeDoc.open();
@ -133,7 +152,7 @@ window.wp = window.wp || {};
'<head>' + '<head>' +
'<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />' + '<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />' +
'</head>' + '</head>' +
'<body style="padding: 0; margin: 0;" class="' + dom.doc.body.className + '">' + '<body style="padding: 0; margin: 0;" class="' + /* editor.getBody().className + */ '">' +
content + content +
'</body>' + '</body>' +
'</html>' '</html>'
@ -158,6 +177,7 @@ window.wp = window.wp || {};
setTimeout( resize, i * 700 ); setTimeout( resize, i * 700 );
} }
} }
});
} else { } else {
this.setContent( content ); this.setContent( content );
} }
@ -478,8 +498,6 @@ window.wp = window.wp || {};
* @mixin * @mixin
*/ */
wp.mce.av = { wp.mce.av = {
loaded: false,
View: { View: {
overlay: true, overlay: true,
@ -537,13 +555,13 @@ window.wp = window.wp || {};
}, },
/** /**
* Pass data to the View's Underscore template and return the compiled output * Return parsed response
* *
* @returns {string} * @returns {string}
*/ */
getHtml: function() { getHtml: function() {
if ( ! this.parsed ) { if ( ! this.parsed ) {
return ''; return ' ';
} }
return this.parsed; return this.parsed;
} }
@ -639,6 +657,18 @@ window.wp = window.wp || {};
_.bindAll( this, 'createIframe', 'setNode', 'fetch' ); _.bindAll( this, 'createIframe', 'setNode', 'fetch' );
$( this ).on( 'ready', this.setNode ); $( this ).on( 'ready', this.setNode );
},
/**
* Return parsed response
*
* @returns {string}
*/
getHtml: function() {
if ( ! this.parsed ) {
return '';
}
return this.parsed;
} }
} ), } ),
edit: function( node ) { edit: function( node ) {

2
wp-includes/js/mce-view.min.js vendored
View File

File diff suppressed because one or more lines are too long