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

TinyMCE wpView: ensure `contentNode` is passed to all callbacks. 

Props iseulde. Fixes #31669.
Built from https://develop.svn.wordpress.org/trunk@32255


git-svn-id: http://core.svn.wordpress.org/trunk@32226 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
Andrew Ozz 2015-04-21 18:36:24 +00:00
parent e2f084d4bd
commit f003efc8aa
3 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -322,9 +322,9 @@ window.wp = window.wp || {};
this.replaceMarkers();
if ( content ) {
this.setContent( content, function( editor, node ) {
this.setContent( content, function( editor, node, contentNode ) {
$( node ).data( 'rendered', true );
this.bindNode.call( this, editor, node );
this.bindNode.call( this, editor, node, contentNode );
}, force ? null : false );
} else {
this.setLoader();
@ -346,8 +346,8 @@ window.wp = window.wp || {};
* Runs before their content is removed from the DOM.
*/
unbind: function() {
this.getNodes( function( editor, node ) {
this.unbindNode.call( this, editor, node );
this.getNodes( function( editor, node, contentNode ) {
this.unbindNode.call( this, editor, node, contentNode );
$( node ).trigger( 'wp-mce-view-unbind' );
}, true );
},
@ -485,7 +485,7 @@ window.wp = window.wp || {};
var MutationObserver = window.MutationObserver || window.WebKitMutationObserver || window.MozMutationObserver,
self = this;
this.getNodes( function( editor, node, content ) {
this.getNodes( function( editor, node, contentNode ) {
var dom = editor.dom,
styles = '',
bodyClasses = editor.getBody().className || '',
@ -504,9 +504,9 @@ window.wp = window.wp || {};
setTimeout( function() {
var iframe, iframeDoc, observer, i;
content.innerHTML = '';
contentNode.innerHTML = '';
iframe = dom.add( content, 'iframe', {
iframe = dom.add( contentNode, 'iframe', {
/* jshint scripturl: true */
src: tinymce.Env.ie ? 'javascript:""' : '',
frameBorder: '0',
@ -519,7 +519,7 @@ window.wp = window.wp || {};
}
} );
dom.add( content, 'div', { 'class': 'wpview-overlay' } );
dom.add( contentNode, 'div', { 'class': 'wpview-overlay' } );
iframeDoc = iframe.contentWindow.document;
@ -603,7 +603,7 @@ window.wp = window.wp || {};
editor.off( 'wp-body-class-change', classChange );
} );
callback && callback.call( self, editor, node );
callback && callback.call( self, editor, node, contentNode );
}, 50 );
}, rendered );
},

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

File diff suppressed because one or more lines are too long

2
wp-includes/version.php
View File

@ -4,7 +4,7 @@
*
* @global string $wp_version
*/
$wp_version = '4.2-RC3-32249';
$wp_version = '4.2-RC3-32255';
/**
* Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.