From 0ad0b4d8298c411ce3427a3cff3a2cd08ca6eb2f Mon Sep 17 00:00:00 2001 From: Andrew Ozz Date: Fri, 4 May 2012 03:23:01 +0000 Subject: [PATCH] DFW: fix auto-resize in WebKit, fixes #20608 git-svn-id: https://develop.svn.wordpress.org/trunk@20723 602fd350-edb4-49c9-b593-d223f7449a82 --- .../js/tinymce/plugins/wpfullscreen/editor_plugin_src.js | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/wp-includes/js/tinymce/plugins/wpfullscreen/editor_plugin_src.js b/wp-includes/js/tinymce/plugins/wpfullscreen/editor_plugin_src.js index 3f43229348..a282ee0351 100644 --- a/wp-includes/js/tinymce/plugins/wpfullscreen/editor_plugin_src.js +++ b/wp-includes/js/tinymce/plugins/wpfullscreen/editor_plugin_src.js @@ -115,24 +115,23 @@ if ( resized ) 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 resizeHeight = (myHeight > 300) ? myHeight : 300; // 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; } };