Changeset 31667

Timestamp:

03/07/2015 04:52:54 PM (11 years ago)

Author:

azaozz

Message:

TinyMCE wpView: improve unbinding of mutationObserver in nested iframes. Props iseulde. See #31412.

File:

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

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

@@ -468 +468 @@
                     styles = '',
                     bodyClasses = editor.getBody().className || '',
-                    iframe, iframeDoc, observer, i, resize;
+                    iframe, iframeDoc, observer, i;
 
                 content.innerHTML = '';
@@ -544 +544 @@
                     iframeDoc.close();
 
-                    resize = function() {
+                    function resize() {
                         var $iframe, iframeDocHeight;
 
@@ -557 +557 @@
                             }
                         }
-                    };
+                    }
 
                     if ( MutationObserver ) {
-                        observer = new MutationObserver( _.debounce( function() {
-                            resize();
-                        }, 100 ) );
+                        observer = new MutationObserver( _.debounce( resize, 100 ) );
 
                         observer.observe( iframeDoc.body, {
@@ -569 +567 @@
                             subtree: true
                         } );
+
+                        $( node ).one( 'wp-mce-view-unbind', function() {
+                            observer.disconnect();
+                        } );
                     } else {
                         for ( i = 1; i < 6; i++ ) {
@@ -581 +583 @@
                     if ( importStyles ) {
                         editor.on( 'wp-body-class-change', classChange );
-                    }
-
-                    $( node ).one( 'wp-mce-view-unbind', function() {
-                        observer.disconnect();
-                        editor.off( 'wp-body-class-change', classChange );
-                    } );
+
+                        $( node ).one( 'wp-mce-view-unbind', function() {
+                            editor.off( 'wp-body-class-change', classChange );
+                        } );
+                    }
                 }, 50 );