Changeset 32255

Timestamp:

04/21/2015 06:35:50 PM (11 years ago)

Author:

azaozz

Message:

TinyMCE wpView: ensure contentNode is passed to all callbacks.
Props iseulde. Fixes #31669.

File:

• trunk/src/wp-includes/js/mce-view.js (modified) (6 diffs)

trunk/src/wp-includes/js/mce-view.js

@@ -323 +323 @@
 
                         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 {
@@ -347 +347 @@
                  */
                 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 );
@@ -486 +486 @@
                                 self = this;
 
-                        this.getNodes( function( editor, node, content ) {
+                        this.getNodes( function( editor, node, contentNode ) {
                                 var dom = editor.dom,
                                         styles = '',
@@ -505 +505 @@
                                         var iframe, iframeDoc, observer, i;
 
-                                        content.innerHTML = '';
-
-                                        iframe = dom.add( content, 'iframe', {
+                                        contentNode.innerHTML = '';
+
+                                        iframe = dom.add( contentNode, 'iframe', {
                                                 /* jshint scripturl: true */
                                                 src: tinymce.Env.ie ? 'javascript:""' : '',
@@ -520 +520 @@
                                         } );
 
-                                        dom.add( content, 'div', { 'class': 'wpview-overlay' } );
+                                        dom.add( contentNode, 'div', { 'class': 'wpview-overlay' } );
 
                                         iframeDoc = iframe.contentWindow.document;
@@ -604 +604 @@
                                         } );
 
-                                        callback && callback.call( self, editor, node );
+                                        callback && callback.call( self, editor, node, contentNode );
                                 }, 50 );
                         }, rendered );