From 8811f6bb788c3198a86e10fbdc4a55d550b700e6 Mon Sep 17 00:00:00 2001 From: azaozz Date: Sun, 5 Jun 2011 18:13:15 +0000 Subject: [PATCH] DFW: don't prepend comma if content_css is empty, props duck_, fixes #17690 git-svn-id: http://svn.automattic.com/wordpress/trunk@18151 1a063a9b-81f0-0310-95a4-ce76da25c4cd --- .../plugins/wpfullscreen/editor_plugin.dev.js | 12 +++++++----- .../plugins/wpfullscreen/editor_plugin.js | 2 +- wp-includes/js/tinymce/wp-tinymce.js.gz | Bin 93409 -> 93414 bytes wp-includes/version.php | 2 +- 4 files changed, 9 insertions(+), 7 deletions(-) diff --git a/wp-includes/js/tinymce/plugins/wpfullscreen/editor_plugin.dev.js b/wp-includes/js/tinymce/plugins/wpfullscreen/editor_plugin.dev.js index ca9bcbb3e..8ff59e56b 100644 --- a/wp-includes/js/tinymce/plugins/wpfullscreen/editor_plugin.dev.js +++ b/wp-includes/js/tinymce/plugins/wpfullscreen/editor_plugin.dev.js @@ -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 //---------------------------------------------------------------- diff --git a/wp-includes/js/tinymce/plugins/wpfullscreen/editor_plugin.js b/wp-includes/js/tinymce/plugins/wpfullscreen/editor_plugin.js index e87473072..d9172afc1 100644 --- a/wp-includes/js/tinymce/plugins/wpfullscreen/editor_plugin.js +++ b/wp-includes/js/tinymce/plugins/wpfullscreen/editor_plugin.js @@ -1 +1 @@ -(function(){tinymce.create("tinymce.plugins.wpFullscreenPlugin",{init:function(b,d){var e=this,h=0,f={},g=tinymce.DOM,a=false;b.addCommand("wpFullScreenClose",function(){if(b.getParam("wp_fullscreen_is_enabled")){g.win.setTimeout(function(){tinyMCE.remove(b);g.remove("wp_mce_fullscreen_parent");tinyMCE.settings=tinyMCE.oldSettings},10)}});b.addCommand("wpFullScreenSave",function(){var i=tinyMCE.get("wp_mce_fullscreen"),j;i.focus();j=tinyMCE.get(i.getParam("wp_fullscreen_editor_id"));j.setContent(i.getContent({format:"raw"}),{format:"raw"})});b.addCommand("wpFullScreenInit",function(){var k=b.getDoc(),i=k.body,j;if(b.id=="wp_mce_fullscreen"){return}tinyMCE.oldSettings=tinyMCE.settings;tinymce.each(b.settings,function(l,m){f[m]=l});f.id="wp_mce_fullscreen";f.wp_fullscreen_is_enabled=true;f.wp_fullscreen_editor_id=b.id;f.theme_advanced_resizing=false;f.theme_advanced_statusbar_location="none";f.content_css=f.content_css+","+f.wp_fullscreen_content_css;f.height=tinymce.isIE?i.scrollHeight:i.offsetHeight;tinymce.each(b.getParam("wp_fullscreen_settings"),function(m,l){f[l]=m});j=new tinymce.Editor("wp_mce_fullscreen",f);j.onInit.add(function(l){var n=tinymce.DOM,m=n.select("a.mceButton",n.get("wp-fullscreen-buttons"));if(!b.isHidden()){l.setContent(b.getContent())}else{l.setContent(switchEditors.wpautop(l.getElement().value))}setTimeout(function(){l.onNodeChange.add(function(p,o,q){tinymce.each(m,function(t){var s,r;if(s=n.get("wp_mce_fullscreen_"+t.id.substr(6))){r=s.className;if(r){t.className=r}}})})},1000);l.dom.addClass(l.getBody(),"wp-fullscreen-editor");l.focus()});j.render();j.dom.bind(j.dom.doc,"mousemove",function(l){if("undefined"!=fullscreen){fullscreen.bounder("showToolbar","hideToolbar",2000)}})});if("undefined"!=fullscreen){b.addButton("fullscreen",{title:"fullscreen.desc",onclick:function(){fullscreen.on()}})}if(b.getParam("fullscreen_is_enabled")||!b.getParam("wp_fullscreen_is_enabled")){return}function c(){if(a){return}var k=b.getDoc(),j=tinymce.DOM,l,i;if(tinymce.isIE){i=k.body.scrollHeight}else{if(tinymce.isWebKit){i=k.height}else{i=k.documentElement.offsetHeight}}l=(i>300)?i:300;if(h!=l){h=l;a=true;setTimeout(function(){a=false},100);j.setStyle(j.get(b.id+"_ifr"),"height",l+"px")}}b.onInit.add(function(j,i){j.onChange.add(c);j.onSetContent.add(c);j.onPaste.add(c);j.onKeyUp.add(c);j.onPostRender.add(c);j.getBody().style.overflowY="hidden"});if(b.getParam("autoresize_on_init",true)){b.onLoadContent.add(function(j,i){setTimeout(function(){c()},1200)})}b.addCommand("wpAutoResize",c)},getInfo:function(){return{longname:"WP Fullscreen",author:"WordPress",authorurl:"http://wordpress.org",infourl:"",version:"1.0"}}});tinymce.PluginManager.add("wpfullscreen",tinymce.plugins.wpFullscreenPlugin)})(); \ No newline at end of file +(function(){tinymce.create("tinymce.plugins.wpFullscreenPlugin",{init:function(b,d){var e=this,h=0,f={},g=tinymce.DOM,a=false;b.addCommand("wpFullScreenClose",function(){if(b.getParam("wp_fullscreen_is_enabled")){g.win.setTimeout(function(){tinyMCE.remove(b);g.remove("wp_mce_fullscreen_parent");tinyMCE.settings=tinyMCE.oldSettings},10)}});b.addCommand("wpFullScreenSave",function(){var i=tinyMCE.get("wp_mce_fullscreen"),j;i.focus();j=tinyMCE.get(i.getParam("wp_fullscreen_editor_id"));j.setContent(i.getContent({format:"raw"}),{format:"raw"})});b.addCommand("wpFullScreenInit",function(){var k=b.getDoc(),i=k.body,j;if(b.id=="wp_mce_fullscreen"){return}tinyMCE.oldSettings=tinyMCE.settings;tinymce.each(b.settings,function(l,m){f[m]=l});f.id="wp_mce_fullscreen";f.wp_fullscreen_is_enabled=true;f.wp_fullscreen_editor_id=b.id;f.theme_advanced_resizing=false;f.theme_advanced_statusbar_location="none";f.content_css=f.content_css?f.content_css+","+f.wp_fullscreen_content_css:f.wp_fullscreen_content_css;f.height=tinymce.isIE?i.scrollHeight:i.offsetHeight;tinymce.each(b.getParam("wp_fullscreen_settings"),function(m,l){f[l]=m});j=new tinymce.Editor("wp_mce_fullscreen",f);j.onInit.add(function(l){var n=tinymce.DOM,m=n.select("a.mceButton",n.get("wp-fullscreen-buttons"));if(!b.isHidden()){l.setContent(b.getContent())}else{l.setContent(switchEditors.wpautop(l.getElement().value))}setTimeout(function(){l.onNodeChange.add(function(p,o,q){tinymce.each(m,function(t){var s,r;if(s=n.get("wp_mce_fullscreen_"+t.id.substr(6))){r=s.className;if(r){t.className=r}}})})},1000);l.dom.addClass(l.getBody(),"wp-fullscreen-editor");l.focus()});j.render();if("undefined"!=fullscreen){j.dom.bind(j.dom.doc,"mousemove",function(l){fullscreen.bounder("showToolbar","hideToolbar",2000)})}});if("undefined"!=fullscreen){b.addButton("fullscreen",{title:"fullscreen.desc",onclick:function(){fullscreen.on()}})}if(b.getParam("fullscreen_is_enabled")||!b.getParam("wp_fullscreen_is_enabled")){return}function c(){if(a){return}var k=b.getDoc(),j=tinymce.DOM,l,i;if(tinymce.isIE){i=k.body.scrollHeight}else{if(tinymce.isWebKit){i=k.height}else{i=k.documentElement.offsetHeight}}l=(i>300)?i:300;if(h!=l){h=l;a=true;setTimeout(function(){a=false},100);j.setStyle(j.get(b.id+"_ifr"),"height",l+"px")}}b.onInit.add(function(j,i){j.onChange.add(c);j.onSetContent.add(c);j.onPaste.add(c);j.onKeyUp.add(c);j.onPostRender.add(c);j.getBody().style.overflowY="hidden"});if(b.getParam("autoresize_on_init",true)){b.onLoadContent.add(function(j,i){setTimeout(function(){c()},1200)})}b.addCommand("wpAutoResize",c)},getInfo:function(){return{longname:"WP Fullscreen",author:"WordPress",authorurl:"http://wordpress.org",infourl:"",version:"1.0"}}});tinymce.PluginManager.add("wpfullscreen",tinymce.plugins.wpFullscreenPlugin)})(); \ No newline at end of file diff --git a/wp-includes/js/tinymce/wp-tinymce.js.gz b/wp-includes/js/tinymce/wp-tinymce.js.gz index 82ab57a52245d621eddea3809d3167f26714b8f6..2b67c0596d4ca6991dfdb9583ff4463c40c2838f 100644 GIT binary patch delta 704 zcmV;x0zduX*#+j=1qUCC2ngE6>wyQg2LU>2f9)uE>r!Z$YQMbv!qA#VsTEyLPf9U;l{Qw+=_s##?{4#38{Xh3+GdUs=q)xE`=g| z(!ys&0jMaHp`CqMv9ot=S(E#|^Jd5)_F2cSQ@1g9RUrxIR>-+#had4@Q^mYH3+dy5 ztBBp@ilGZ)PW)n>&XKu-eS`Usawgo~e}&AaXk3P+YpSN0Q3o?#8G5IgtQ=hp=N2S6 zn;vj_v$Qw*p*kN2Hm9}^hn760Eb8$T%vK$22aNYIEgw~W>I%`jVWyb{5Nsu@Rhf2* z$Iu6b%de?Vro zlX^TR+G)JiHw5q?D4CziF(hq*bBEv(oXLYtb&Ey&b0v=7xV(JzyY=P@tPC-P$#i8b zb9RYukFMK*bTpRlz#BCEs}CtYgF|)%dS9)B>WTgt+S9foa=0lm{Nt7-2k&Zzcxxiq zU!3d7R7VyQ>tJiJ*dp%gD1WbFf0VLgH-??mP#qWxp-!U4-)F{9CC~GP46>-0FX{V? zDB4Sg1Br{+C|z>o5*2wMhc3m8K@x?rxEha(zi_KTrgeuV+-};&x4bZO=AK_}H@$4UoM?hgpfCK=bC|DE# delta 699 zcmV;s0!01h*#+U*1qUCC2nZL)>VXHf2LU>2f2~WwWU4*!@=;e`HGO4^qe6$*`$p~j zMc}72n8B81WoB0R&f#TAb6cLK7Ze;gP>fQ9NeqSM7-ggC5!!tCd9XoTq*iVy275?V z=Zuig%^KNtz<0H?387<&W`V(M>0^H8W4?~59hL~qW{t^g=_$*1G&2F!<6BJGat_Vq zf2I60xen(4q86WhAz!GN)I8kS#)P{LP|!HA_%I=bj&$KXMNst@Xvd{c+)i4~EdGb$ zK^a=lmlf-I*OoP;?>irb95|mf=V(J>NaPl?!;ko{=~>=ah4jC5)y&+rlU%!J>={=K zT@cIR7wbxnj1cVGeT+jZskA}Od^*Kte^_dzYG4_48{?J1JGWXnkQz=S$Y(Y^w)7Tg z@99Hz>J4m8ZFddrb4pp%qa>IOIM@yt?_;_-~f?G%rp@i}un=e7tda`RaG;qZL>gVh9u8$^_=@65k$O zw_)aJEZ>3SXZlwkQhWx7?A{X#ffjc4oc;{$X$ufJ+?2%qamx~UcQr1&HEHWF&h^Bn zBX)@)ur*k05zlm#zgICe*|8hLe@<#>35K^nFGY!zIIk z#6@iEEjed==%mtw{siEdb2jmO1bxT~Pk%8z=+JVLM^H~`o_Gnqk}izHfzp;IZm z7;=6&0xJY0I~dO!SG|2>UX8Q7oN%p>kQkcyLeeJ~v~3A)T_*TbFCj