Changeset 20723

Timestamp:

05/04/2012 03:23:01 AM (12 years ago)

Author:

azaozz

Message:

DFW: fix auto-resize in WebKit, fixes #20608

File:

• trunk/wp-includes/js/tinymce/plugins/wpfullscreen/editor_plugin_src.js (modified) (2 diffs)

trunk/wp-includes/js/tinymce/plugins/wpfullscreen/editor_plugin_src.js

@@ -116 +116 @@
                     return;
 
-                var d = ed.getDoc(), DOM = tinymce.DOM, resizeHeight, myHeight;
+                var d = ed.getDoc(), body = d.body, DOM = tinymce.DOM, resizeHeight, myHeight;
 
                 // Get height differently depending on the browser used
-                if ( tinymce.isIE )
+                if ( tinymce.isIE || tinymce.isWebKit )
                     myHeight = d.body.scrollHeight;
                 else
-                    myHeight = d.documentElement.offsetHeight;
+                    myHeight = body.offsetHeight;
 
                 // Don't make it smaller than 300px
@@ -129 +129 @@
                 // Resize content element
                 if ( oldHeight != resizeHeight ) {
-                    oldHeight = resizeHeight;
                     resized = true;
                     setTimeout(function(){ resized = false; }, 100);
-
                     DOM.setStyle(DOM.get(ed.id + '_ifr'), 'height', resizeHeight + 'px');
+                    oldHeight = resizeHeight;
                 }
             };