Skip to content

Commit

Permalink
DFW: another attempt to get auto-resize working right, see #20608, se…
Browse files Browse the repository at this point in the history
…e #20684

git-svn-id: http://core.svn.wordpress.org/trunk@20804 1a063a9b-81f0-0310-95a4-ce76da25c4cd
  • Loading branch information
azaozz committed May 16, 2012
1 parent 5181e0a commit bf0154a
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 13 deletions.
Original file line number Diff line number Diff line change
@@ -1,11 +1,13 @@
/*
Distraction Free Writing mode TinyMCE Styles
*/

html, body {

html,
body {
background: transparent;
width: auto !important;
max-width: none !important;
margin: 0;
padding: 0;
margin: 0 !important;
padding: 0 !important;
min-height: 0 !important;
}
14 changes: 5 additions & 9 deletions wp-includes/js/tinymce/plugins/wpfullscreen/editor_plugin_src.js
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
tinymce.create('tinymce.plugins.wpFullscreenPlugin', {

init : function(ed, url) {
var t = this, oldHeight = 0, s = {}, DOM = tinymce.DOM, resized = false;
var t = this, oldHeight = 0, s = {}, DOM = tinymce.DOM;

// Register commands
ed.addCommand('wpFullScreenClose', function() {
Expand Down Expand Up @@ -112,26 +112,22 @@
* This method gets executed each time the editor needs to resize.
*/
function resize() {
if ( resized )
return;

var d = ed.getDoc(), DOM = tinymce.DOM, resizeHeight, myHeight;

// Get height differently depending on the browser used
if ( tinymce.isIE || tinymce.isWebKit )
myHeight = d.body.scrollHeight;
else
if ( tinymce.isWebKit )
myHeight = d.body.offsetHeight;
else
myHeight = d.body.scrollHeight;

// Don't make it smaller than 300px
resizeHeight = (myHeight > 300) ? myHeight : 300;

// Resize content element
if ( oldHeight != resizeHeight ) {
resized = true;
setTimeout(function(){ resized = false; }, 100);
DOM.setStyle(DOM.get(ed.id + '_ifr'), 'height', resizeHeight + 'px');
oldHeight = resizeHeight;
ed.getWin().scrollTo(0,0);
}
};

Expand Down

0 comments on commit bf0154a

Please sign in to comment.