DFW: don't prepend comma if content_css is empty, props duck_, fixes #17690

git-svn-id: https://develop.svn.wordpress.org/trunk@18151 602fd350-edb4-49c9-b593-d223f7449a82
This commit is contained in:
Andrew Ozz
2011-06-05 18:13:15 +00:00
parent b6eed7bea8
commit 9565d6364b
4 changed files with 9 additions and 7 deletions
@@ -49,7 +49,7 @@
s.wp_fullscreen_editor_id = ed.id;
s.theme_advanced_resizing = false;
s.theme_advanced_statusbar_location = 'none';
s.content_css = s.content_css + ',' + s.wp_fullscreen_content_css;
s.content_css = s.content_css ? s.content_css + ',' + s.wp_fullscreen_content_css : s.wp_fullscreen_content_css;
s.height = tinymce.isIE ? b.scrollHeight : b.offsetHeight;
tinymce.each(ed.getParam('wp_fullscreen_settings'), function(v, k) {
@@ -86,18 +86,20 @@
fsed.render();
fsed.dom.bind( fsed.dom.doc, 'mousemove', function(e){
if ( 'undefined' != fullscreen )
if ( 'undefined' != fullscreen ) {
fsed.dom.bind( fsed.dom.doc, 'mousemove', function(e){
fullscreen.bounder( 'showToolbar', 'hideToolbar', 2000 );
});
});
}
});
// Register buttons
if ( 'undefined' != fullscreen )
if ( 'undefined' != fullscreen ) {
ed.addButton('fullscreen', {
title : 'fullscreen.desc',
onclick : function(){ fullscreen.on(); }
});
}
// END fullscreen
//----------------------------------------------------------------