vhad/wordpress-develop
1
0
Fork 0
mirror of https://github.com/gosticks/wordpress-develop.git synced 2026-04-05 05:04:31 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix WebKit browsers reporting document.body height shorter than it is, add classes to TinyMCE's body: 'wp-editor' or 'wp-fullscreen-editor', fix mousemove event in IE, fixes #17664

Browse Source 
git-svn-id: https://develop.svn.wordpress.org/trunk@18142 602fd350-edb4-49c9-b593-d223f7449a82
This commit is contained in:
Andrew Ozz
2011-06-05 00:06:28 +00:00
parent 3e27653486
commit 98d58b4edd
8 changed files with 35 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
wp-includes/js/tinymce/plugins/wpfullscreen/editor_plugin.dev.js
View File

@@ -8,7 +8,7 @@
tinymce.create('tinymce.plugins.wpFullscreenPlugin', {
init : function(ed, url) {
var t = this, oldHeight = 0, s = {}, DOM = tinymce.DOM;
var t = this, oldHeight = 0, s = {}, DOM = tinymce.DOM, resized = false;
// Register commands
ed.addCommand('wpFullScreenClose', function() {
@@ -80,13 +80,14 @@
});
}, 1000);
edd.dom.addClass(edd.getBody(), 'wp-fullscreen-editor');
edd.focus();
});
fsed.render();
fsed.dom.bind( fsed.getWin(), 'mousemove', function(e){
if ( !fullscreen.settings.toolbar_shown )
fsed.dom.bind( fsed.dom.doc, 'mousemove', function(e){
if ( 'undefined' != fullscreen )
fullscreen.bounder( 'showToolbar', 'hideToolbar', 2000 );
});
});
@@ -109,22 +110,28 @@
* This method gets executed each time the editor needs to resize.
*/
function resize() {
var d = ed.getDoc(), b = d.body, de = d.documentElement, DOM = tinymce.DOM, resizeHeight, myHeight;
if ( resized )
return;
var d = ed.getDoc(), DOM = tinymce.DOM, resizeHeight, myHeight;
// Get height differently depending on the browser used
if ( tinymce.isIE )
myHeight = b.scrollHeight;
myHeight = d.body.scrollHeight;
else if ( tinymce.isWebKit )
myHeight = b.offsetHeight;
myHeight = d.height;
else
myHeight = de.offsetHeight;
myHeight = d.documentElement.offsetHeight;
// Don't make it smaller than the minimum height
// 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');
}
};
@@ -142,8 +149,6 @@
if (ed.getParam('autoresize_on_init', true)) {
ed.onLoadContent.add(function(ed, l) {
// resize(); // runs before onInit, useless?
// Because the content area resizes when its content CSS loads,
// and we can't easily add a listener to its onload event,
// we'll just trigger a resize after a short loading period