WordPress-C
/
WordPress
mirror of https://github.com/WordPress/WordPress.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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

git-svn-id: http://core.svn.wordpress.org/trunk@20723 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
azaozz 2012-05-04 03:23:01 +00:00
parent 5030fa458d
commit d70be41ae6
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
wp-includes/js/tinymce/plugins/wpfullscreen/editor_plugin_src.js
View File

@ -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;
}
};