sergiotarxz/Wordpress
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Persisting <track> elements as the body of a [video] shortcode in MCE Views:

Browse Source 
* When generating the view's HTML, ensure that the shortcode's `content` is added to the model
* Add a `PostProcess` event in the `wpview` plugin to properly return the shortcode when the editor mode is toggled, ensuring that elements in the body are not dropped.

Props azaozz, wonderboymusic.
See #27915.




git-svn-id: https://develop.svn.wordpress.org/trunk@28183 602fd350-edb4-49c9-b593-d223f7449a82
This commit is contained in:
Scott Taylor 2014-04-22 18:20:54 +00:00
parent 97c497abc2
commit 4507f1e04f
2 changed files with 20 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/wp-includes/js/mce-view.js
View File

@ -483,11 +483,13 @@ window.wp = window.wp || {};
* @returns {string} * @returns {string}
*/ */
getHtml: function() { getHtml: function() {
var attrs = _.defaults( var attrs = this.shortcode.attrs.named;
this.shortcode.attrs.named, attrs.content = this.shortcode.content;
wp.media[ this.shortcode.tag ].defaults
); return this.template({ model: _.defaults(
return this.template({ model: attrs }); attrs,
wp.media[ this.shortcode.tag ].defaults )
});
}, },
unbind: function() { unbind: function() {

19
src/wp-includes/js/tinymce/plugins/wpview/plugin.js
View File

@ -332,17 +332,24 @@ tinymce.PluginManager.add( 'wpview', function( editor ) {
tinymce.each( dom.select( 'div[data-wpview-text]', event.node ), function( node ) { tinymce.each( dom.select( 'div[data-wpview-text]', event.node ), function( node ) {
// Empty the wrap node // Empty the wrap node
if ( 'textContent' in node ) { if ( 'textContent' in node ) {
node.textContent = ''; node.textContent = '\u00a0';
} else { } else {
node.innerText = ''; node.innerText = '\u00a0';
} }
// This makes all views into block tags (as we use <div>).
// Can use 'PostProcess' and a regex instead.
dom.replace( dom.create( 'p', null, window.decodeURIComponent( dom.getAttrib( node, 'data-wpview-text' ) ) ), node );
}); });
}); });
editor.on( 'PostProcess', function( event ) {
if ( event.content ) {
event.content = event.content.replace( /<div [^>]*?data-wpview-text="([^"]*)"[^>]*>[\s\S]*?<\/div>/g, function( match, shortcode ) {
if ( shortcode ) {
return '<p>' + window.decodeURIComponent( shortcode ) + '</p>';
}
return ''; // If error, remove the view wrapper
});
}
});
editor.on( 'keydown', function( event ) { editor.on( 'keydown', function( event ) {
var keyCode = event.keyCode, var keyCode = event.keyCode,
body = editor.getBody(), body = editor.getBody(),