sergiotarxz
/
Wordpress
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Main editor: when setting or saving the height, look only at elements that have style="height:..." set. Reset a previously saved erroneous "ed_size" value (over 5000px) to the default height of 360px. Fixes #23042 for trunk. 

git-svn-id: https://develop.svn.wordpress.org/trunk@23302 602fd350-edb4-49c9-b593-d223f7449a82
This commit is contained in:
Andrew Ozz 2013-01-16 19:10:38 +00:00
parent 77cdc0ce65
commit 8cf528d255
1 changed files with 49 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

66
wp-admin/js/post.js
View File

@ -687,7 +687,7 @@ jQuery(document).ready( function($) {
(function() { (function() {
var textarea = $('textarea#content'), offset = null, el; var textarea = $('textarea#content'), offset = null, el;
// No point for touch devices // No point for touch devices
if ( 'ontouchstart' in window ) if ( !textarea.length || 'ontouchstart' in window )
return; return;
function dragging(e) { function dragging(e) {
@ -696,14 +696,15 @@ jQuery(document).ready( function($) {
} }
function endDrag(e) { function endDrag(e) {
var height = $('#wp-content-editor-container').height(); var height;
textarea.focus(); textarea.focus();
$(document).unbind('mousemove', dragging).unbind('mouseup', endDrag); $(document).unbind('mousemove', dragging).unbind('mouseup', endDrag);
height -= 33; // compensate for toolbars, padding... height = parseInt( textarea.css('height'), 10 );
// sanity check // sanity check
if ( height > 50 && height < 5000 && height != getUserSetting( 'ed_size' ) ) if ( height && height > 50 && height < 5000 )
setUserSetting( 'ed_size', height ); setUserSetting( 'ed_size', height );
} }
@ -724,44 +725,67 @@ jQuery(document).ready( function($) {
if ( ed.id != 'content' || tinymce.isIOS5 ) if ( ed.id != 'content' || tinymce.isIOS5 )
return; return;
// resize TinyMCE to match the textarea height when switching Text -> Visual function getHeight() {
ed.onLoadContent.add( function(ed, o) { var height, node = document.getElementById('content_ifr'),
var ifr_height, height = parseInt( $('#content').css('height'), 10 ), ifr_height = node ? parseInt( node.style.height, 10 ) : 0,
tb_height = $('#content_tbl tr.mceFirst').height(); tb_height = $('#content_tbl tr.mceFirst').height();
if ( height && !isNaN(height) && tb_height ) { if ( !ifr_height || !tb_height )
ifr_height = (height - tb_height) + 12; // compensate for padding in the textarea return false;
// total height including toolbar and statusbar
height = ifr_height + tb_height + 21;
// textarea height = total height - 33px toolbar
height -= 33;
return height;
}
// resize TinyMCE to match the textarea height when switching Text -> Visual
ed.onLoadContent.add( function(ed, o) {
var ifr_height, node = document.getElementById('content'),
height = node ? parseInt( node.style.height, 10 ) : 0,
tb_height = $('#content_tbl tr.mceFirst').height() || 33;
// height cannot be under 50 or over 5000
if ( !height || height < 50 || height > 5000 )
height = 360; // default height for the main editor
if ( getUserSetting( 'ed_size' ) > 5000 )
setUserSetting( 'ed_size', 360 );
// compensate for padding and toolbars
ifr_height = ( height - tb_height ) + 12;
// sanity check // sanity check
if ( ifr_height > 50 && ifr_height < 5000 ) { if ( ifr_height > 50 && ifr_height < 5000 ) {
$('#content_tbl').css('height', '' ); $('#content_tbl').css('height', '' );
$('#content_ifr').css('height', ifr_height + 'px' ); $('#content_ifr').css('height', ifr_height + 'px' );
} }
}
}); });
// resize the textarea to match TinyMCE's height when switching Visual -> Text // resize the textarea to match TinyMCE's height when switching Visual -> Text
ed.onSaveContent.add( function(ed, o) { ed.onSaveContent.add( function(ed, o) {
var height = $('#content_tbl').height(); var height = getHeight();
if ( height && height > 83 && height < 5000 ) { if ( !height || height < 50 || height > 5000 )
height -= 33; return;
$('#content').css( 'height', height + 'px' ); $('textarea#content').css( 'height', height + 'px' );
}
}); });
// save on resizing TinyMCE // save on resizing TinyMCE
ed.onPostRender.add(function() { ed.onPostRender.add(function() {
$('#content_resize').on('mousedown.wp-mce-resize', function(e){ $('#content_resize').on('mousedown.wp-mce-resize', function(e){
$(document).on('mouseup.wp-mce-resize', function(e){ $(document).on('mouseup.wp-mce-resize', function(e){
var height = $('#wp-content-editor-container').height(); var height;
height -= 33;
// sanity check
if ( height > 50 && height < 5000 && height != getUserSetting( 'ed_size' ) )
setUserSetting( 'ed_size', height );
$(document).off('mouseup.wp-mce-resize'); $(document).off('mouseup.wp-mce-resize');
height = getHeight();
// sanity check
if ( height && height > 50 && height < 5000 )
setUserSetting( 'ed_size', height );
}); });
}); });
}); });