Changeset 32711

Timestamp:

06/08/2015 09:31:39 PM (11 years ago)

Author:

iseulde

Message:

TinyMCE: wpviews: cache iframe heights

Cache iframe heights per instance so it can be reused. This will prevent to content from moving in the editor when undoing or redoing changes.

Fixes #32593.

File:

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

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

@@ -502 +502 @@
                                 } );
 
+                                if ( self.iframeHeight ) {
+                                        dom.add( contentNode, 'div', { style: {
+                                                width: '100%',
+                                                height: self.iframeHeight
+                                        } } );
+                                }
+
                                 // Seems the browsers need a bit of time to insert/set the view nodes,
                                 // or the iframe will fail especially when switching Text => Visual.
                                 setTimeout( function() {
-                                        var iframe, iframeDoc, observer, i;
+                                        var iframe, iframeDoc, observer, i, block;
 
                                         contentNode.innerHTML = '';
@@ -519 +526 @@
                                                         width: '100%',
                                                         display: 'block'
-                                                }
+                                                },
+                                                height: self.iframeHeight
                                         } );
 
@@ -562 +570 @@
 
                                         function resize() {
-                                                var $iframe, iframeDocHeight;
+                                                var $iframe;
+
+                                                if ( block ) {
+                                                        return;
+                                                }
 
                                                 // Make sure the iframe still exists.
                                                 if ( iframe.contentWindow ) {
                                                         $iframe = $( iframe );
-                                                        iframeDocHeight = $( iframeDoc.body ).height();
-
-                                                        if ( $iframe.height() !== iframeDocHeight ) {
-                                                                $iframe.height( iframeDocHeight );
+                                                        self.iframeHeight = $( iframeDoc.body ).height();
+
+                                                        if ( $iframe.height() !== self.iframeHeight ) {
+                                                                $iframe.height( self.iframeHeight );
                                                                 editor.nodeChanged();
                                                         }
                                                 }
+                                        }
+
+                                        if ( self.iframeHeight ) {
+                                                block = true;
+
+                                                setTimeout( function() {
+                                                        block = false;
+                                                        resize();
+                                                }, 3000 );
                                         }