From 41a001a6820b61e48fab89ebff83a5fbb0a625ea Mon Sep 17 00:00:00 2001 From: azaozz Date: Fri, 27 May 2011 19:27:19 +0000 Subject: [PATCH] Fix regression: the visual editor removes empty paragraphs, fix CSS for the spellchecker button, fixes #17368 git-svn-id: http://svn.automattic.com/wordpress/trunk@18064 1a063a9b-81f0-0310-95a4-ce76da25c4cd --- .../plugins/wordpress/editor_plugin.dev.js | 5 +++++ .../plugins/wordpress/editor_plugin.js | 2 +- .../themes/advanced/skins/wp_theme/ui.css | 9 +++++---- wp-includes/js/tinymce/wp-tinymce.js.gz | Bin 93279 -> 93314 bytes wp-includes/version.php | 2 +- 5 files changed, 12 insertions(+), 6 deletions(-) diff --git a/wp-includes/js/tinymce/plugins/wordpress/editor_plugin.dev.js b/wp-includes/js/tinymce/plugins/wordpress/editor_plugin.dev.js index 5b10bd273..86295c8ec 100644 --- a/wp-includes/js/tinymce/plugins/wordpress/editor_plugin.dev.js +++ b/wp-includes/js/tinymce/plugins/wordpress/editor_plugin.dev.js @@ -210,6 +210,11 @@ }); }; + // keep empty paragraphs :( + ed.onSaveContent.addToTop(function(ed, o) { + o.content = o.content.replace(/

(
|\u00a0|\uFEFF)?<\/p>/g, '

 

'); + }); + ed.onSaveContent.add(function(ed, o) { if ( typeof(switchEditors) == 'object' ) { if ( ed.isHidden() ) diff --git a/wp-includes/js/tinymce/plugins/wordpress/editor_plugin.js b/wp-includes/js/tinymce/plugins/wordpress/editor_plugin.js index 1ff5cb34f..8be6d7702 100644 --- a/wp-includes/js/tinymce/plugins/wordpress/editor_plugin.js +++ b/wp-includes/js/tinymce/plugins/wordpress/editor_plugin.js @@ -1 +1 @@ -(function(){var a=tinymce.DOM;tinymce.create("tinymce.plugins.WordPress",{mceTout:0,init:function(c,d){var e=this,h=c.getParam("wordpress_adv_toolbar","toolbar2"),g=0,f,b;f='';b='';if(getUserSetting("hidetb","0")=="1"){c.settings.wordpress_adv_hidden=0}c.onPostRender.add(function(){var i=c.controlManager.get(h);if(c.getParam("wordpress_adv_hidden",1)&&i){a.hide(i.id);e._resizeIframe(c,h,28)}});c.addCommand("WP_More",function(){c.execCommand("mceInsertContent",0,f)});c.addCommand("WP_Page",function(){c.execCommand("mceInsertContent",0,b)});c.addCommand("WP_Help",function(){c.windowManager.open({url:tinymce.baseURL+"/wp-mce-help.php",width:450,height:420,inline:1})});c.addCommand("WP_Adv",function(){var i=c.controlManager,j=i.get(h).id;if("undefined"==j){return}if(a.isHidden(j)){i.setActive("wp_adv",1);a.show(j);e._resizeIframe(c,h,-28);c.settings.wordpress_adv_hidden=0;setUserSetting("hidetb","1")}else{i.setActive("wp_adv",0);a.hide(j);e._resizeIframe(c,h,28);c.settings.wordpress_adv_hidden=1;setUserSetting("hidetb","0")}});c.addButton("wp_more",{title:"wordpress.wp_more_desc",cmd:"WP_More"});c.addButton("wp_page",{title:"wordpress.wp_page_desc",image:d+"/img/page.gif",cmd:"WP_Page"});c.addButton("wp_help",{title:"wordpress.wp_help_desc",cmd:"WP_Help"});c.addButton("wp_adv",{title:"wordpress.wp_adv_desc",cmd:"WP_Adv"});c.addButton("add_media",{title:"wordpress.add_media",image:d+"/img/media.gif",onclick:function(){tb_show("",tinymce.DOM.get("add_media").href);tinymce.DOM.setStyle(["TB_overlay","TB_window","TB_load"],"z-index","999999")}});c.addButton("add_image",{title:"wordpress.add_image",image:d+"/img/image.gif",onclick:function(){tb_show("",tinymce.DOM.get("add_image").href);tinymce.DOM.setStyle(["TB_overlay","TB_window","TB_load"],"z-index","999999")}});c.addButton("add_video",{title:"wordpress.add_video",image:d+"/img/video.gif",onclick:function(){tb_show("",tinymce.DOM.get("add_video").href);tinymce.DOM.setStyle(["TB_overlay","TB_window","TB_load"],"z-index","999999")}});c.addButton("add_audio",{title:"wordpress.add_audio",image:d+"/img/audio.gif",onclick:function(){tb_show("",tinymce.DOM.get("add_audio").href);tinymce.DOM.setStyle(["TB_overlay","TB_window","TB_load"],"z-index","999999")}});c.onBeforeExecCommand.add(function(p,m,s,l,j){var v=tinymce.DOM,k,i,r,u,t,q;if("mceFullScreen"==m){if("mce_fullscreen"!=p.id&&v.get("add_audio")&&v.get("add_video")&&v.get("add_image")&&v.get("add_media")){p.settings.theme_advanced_buttons1+=",|,add_image,add_video,add_audio,add_media"}}if("JustifyLeft"==m||"JustifyRight"==m||"JustifyCenter"==m){k=p.selection.getNode();if(k.nodeName=="IMG"){q=m.substr(7).toLowerCase();t="align"+q;i=p.dom.getParent(k,"dl.wp-caption");r=p.dom.getParent(k,"div.mceTemp");if(i&&r){u=p.dom.hasClass(i,t)?"alignnone":t;i.className=i.className.replace(/align[^ '"]+\s?/g,"");p.dom.addClass(i,u);if(u=="aligncenter"){p.dom.addClass(r,"mceIEcenter")}else{p.dom.removeClass(r,"mceIEcenter")}j.terminate=true;p.execCommand("mceRepaint")}else{if(p.dom.hasClass(k,t)){p.dom.addClass(k,"alignnone")}else{p.dom.removeClass(k,"alignnone")}}}}});c.onInit.add(function(i){i.onNodeChange.add(function(k,j,m){var l;if(m.nodeName=="IMG"){l=k.dom.getParent(m,"dl.wp-caption")}else{if(m.nodeName=="DIV"&&k.dom.hasClass(m,"mceTemp")){l=m.firstChild;if(!k.dom.hasClass(l,"wp-caption")){l=false}}}if(l){if(k.dom.hasClass(l,"alignleft")){j.setActive("justifyleft",1)}else{if(k.dom.hasClass(l,"alignright")){j.setActive("justifyright",1)}else{if(k.dom.hasClass(l,"aligncenter")){j.setActive("justifycenter",1)}}}}});i.onBeforeSetContent.add(function(j,k){if(k.content){k.content=k.content.replace(/

\s*<(p|div|ul|ol|dl|table|blockquote|h[1-6]|fieldset|pre|address)( [^>]*)?>/gi,"<$1$2>");k.content=k.content.replace(/<\/(p|div|ul|ol|dl|table|blockquote|h[1-6]|fieldset|pre|address)>\s*<\/p>/gi,"")}})});if("undefined"!=typeof(jQuery)){c.onKeyUp.add(function(j,l){var i=l.keyCode||l.charCode;if(i==g){return}if(13==i||8==g||46==g){jQuery(document).triggerHandler("wpcountwords",[j.getContent({format:"raw"})])}g=i})}c.onSaveContent.add(function(i,j){if(typeof(switchEditors)=="object"){if(i.isHidden()){j.content=j.element.value}else{j.content=switchEditors.pre_wpautop(j.content)}}});e._handleMoreBreak(c,d);c.addShortcut("alt+shift+c",c.getLang("justifycenter_desc"),"JustifyCenter");c.addShortcut("alt+shift+r",c.getLang("justifyright_desc"),"JustifyRight");c.addShortcut("alt+shift+l",c.getLang("justifyleft_desc"),"JustifyLeft");c.addShortcut("alt+shift+j",c.getLang("justifyfull_desc"),"JustifyFull");c.addShortcut("alt+shift+q",c.getLang("blockquote_desc"),"mceBlockQuote");c.addShortcut("alt+shift+u",c.getLang("bullist_desc"),"InsertUnorderedList");c.addShortcut("alt+shift+o",c.getLang("numlist_desc"),"InsertOrderedList");c.addShortcut("alt+shift+d",c.getLang("striketrough_desc"),"Strikethrough");c.addShortcut("alt+shift+n",c.getLang("spellchecker.desc"),"mceSpellCheck");c.addShortcut("alt+shift+a",c.getLang("link_desc"),"mceLink");c.addShortcut("alt+shift+s",c.getLang("unlink_desc"),"unlink");c.addShortcut("alt+shift+m",c.getLang("image_desc"),"mceImage");c.addShortcut("alt+shift+g",c.getLang("fullscreen.desc"),"mceFullScreen");c.addShortcut("alt+shift+z",c.getLang("wp_adv_desc"),"WP_Adv");c.addShortcut("alt+shift+h",c.getLang("help_desc"),"WP_Help");c.addShortcut("alt+shift+t",c.getLang("wp_more_desc"),"WP_More");c.addShortcut("alt+shift+p",c.getLang("wp_page_desc"),"WP_Page");c.addShortcut("ctrl+s",c.getLang("save_desc"),function(){if("function"==typeof autosave){autosave()}});if(tinymce.isWebKit){c.addShortcut("alt+shift+b",c.getLang("bold_desc"),"Bold");c.addShortcut("alt+shift+i",c.getLang("italic_desc"),"Italic")}c.onInit.add(function(i){tinymce.dom.Event.add(i.getWin(),"scroll",function(j){i.plugins.wordpress._hideButtons()});tinymce.dom.Event.add(i.getBody(),"dragstart",function(j){i.plugins.wordpress._hideButtons()})});c.onBeforeExecCommand.add(function(i,k,j,l){i.plugins.wordpress._hideButtons()});c.onSaveContent.add(function(i,j){i.plugins.wordpress._hideButtons()});c.onMouseDown.add(function(i,j){if(j.target.nodeName!="IMG"){i.plugins.wordpress._hideButtons()}})},getInfo:function(){return{longname:"WordPress Plugin",author:"WordPress",authorurl:"http://wordpress.org",infourl:"http://wordpress.org",version:"3.0"}},_setEmbed:function(b){return b.replace(/\[embed\]([\s\S]+?)\[\/embed\][\s\u00a0]*/g,function(d,c){return''+c+''})},_getEmbed:function(b){return b.replace(/]+>/g,function(c){if(c.indexOf('class="wp-oembed')!=-1){var d=c.match(/alt="([^\"]+)"/);if(d[1]){c="[embed]"+d[1]+"[/embed]"}}return c})},_showButtons:function(f,d){var g=tinyMCE.activeEditor,i,h,b,j=tinymce.DOM,e,c;b=g.dom.getViewPort(g.getWin());i=j.getPos(g.getContentAreaContainer());h=g.dom.getPos(f);e=Math.max(h.x-b.x,0)+i.x;c=Math.max(h.y-b.y,0)+i.y;j.setStyles(d,{top:c+5+"px",left:e+5+"px",display:"block"});if(this.mceTout){clearTimeout(this.mceTout)}this.mceTout=setTimeout(function(){g.plugins.wordpress._hideButtons()},5000)},_hideButtons:function(){if(!this.mceTout){return}if(document.getElementById("wp_editbtns")){tinymce.DOM.hide("wp_editbtns")}if(document.getElementById("wp_gallerybtns")){tinymce.DOM.hide("wp_gallerybtns")}clearTimeout(this.mceTout);this.mceTout=0},_resizeIframe:function(c,e,b){var d=c.getContentAreaContainer().firstChild;a.setStyle(d,"height",d.clientHeight+b);c.theme.deltaHeight+=b},_handleMoreBreak:function(c,d){var e,b;e='$1';b='';c.onInit.add(function(){c.dom.loadCSS(d+"/css/content.css")});c.onPostRender.add(function(){if(c.theme.onResolveName){c.theme.onResolveName.add(function(f,g){if(g.node.nodeName=="IMG"){if(c.dom.hasClass(g.node,"mceWPmore")){g.name="wpmore"}if(c.dom.hasClass(g.node,"mceWPnextpage")){g.name="wppage"}}})}});c.onBeforeSetContent.add(function(f,g){if(g.content){g.content=g.content.replace(//g,e);g.content=g.content.replace(//g,b)}});c.onPostProcess.add(function(f,g){if(g.get){g.content=g.content.replace(/]+>/g,function(i){if(i.indexOf('class="mceWPmore')!==-1){var h,j=(h=i.match(/alt="(.*?)"/))?h[1]:"";i=""}if(i.indexOf('class="mceWPnextpage')!==-1){i=""}return i})}});c.onNodeChange.add(function(g,f,h){f.setActive("wp_page",h.nodeName==="IMG"&&g.dom.hasClass(h,"mceWPnextpage"));f.setActive("wp_more",h.nodeName==="IMG"&&g.dom.hasClass(h,"mceWPmore"))})}});tinymce.PluginManager.add("wordpress",tinymce.plugins.WordPress)})(); \ No newline at end of file +(function(){var a=tinymce.DOM;tinymce.create("tinymce.plugins.WordPress",{mceTout:0,init:function(c,d){var e=this,h=c.getParam("wordpress_adv_toolbar","toolbar2"),g=0,f,b;f='';b='';if(getUserSetting("hidetb","0")=="1"){c.settings.wordpress_adv_hidden=0}c.onPostRender.add(function(){var i=c.controlManager.get(h);if(c.getParam("wordpress_adv_hidden",1)&&i){a.hide(i.id);e._resizeIframe(c,h,28)}});c.addCommand("WP_More",function(){c.execCommand("mceInsertContent",0,f)});c.addCommand("WP_Page",function(){c.execCommand("mceInsertContent",0,b)});c.addCommand("WP_Help",function(){c.windowManager.open({url:tinymce.baseURL+"/wp-mce-help.php",width:450,height:420,inline:1})});c.addCommand("WP_Adv",function(){var i=c.controlManager,j=i.get(h).id;if("undefined"==j){return}if(a.isHidden(j)){i.setActive("wp_adv",1);a.show(j);e._resizeIframe(c,h,-28);c.settings.wordpress_adv_hidden=0;setUserSetting("hidetb","1")}else{i.setActive("wp_adv",0);a.hide(j);e._resizeIframe(c,h,28);c.settings.wordpress_adv_hidden=1;setUserSetting("hidetb","0")}});c.addButton("wp_more",{title:"wordpress.wp_more_desc",cmd:"WP_More"});c.addButton("wp_page",{title:"wordpress.wp_page_desc",image:d+"/img/page.gif",cmd:"WP_Page"});c.addButton("wp_help",{title:"wordpress.wp_help_desc",cmd:"WP_Help"});c.addButton("wp_adv",{title:"wordpress.wp_adv_desc",cmd:"WP_Adv"});c.addButton("add_media",{title:"wordpress.add_media",image:d+"/img/media.gif",onclick:function(){tb_show("",tinymce.DOM.get("add_media").href);tinymce.DOM.setStyle(["TB_overlay","TB_window","TB_load"],"z-index","999999")}});c.addButton("add_image",{title:"wordpress.add_image",image:d+"/img/image.gif",onclick:function(){tb_show("",tinymce.DOM.get("add_image").href);tinymce.DOM.setStyle(["TB_overlay","TB_window","TB_load"],"z-index","999999")}});c.addButton("add_video",{title:"wordpress.add_video",image:d+"/img/video.gif",onclick:function(){tb_show("",tinymce.DOM.get("add_video").href);tinymce.DOM.setStyle(["TB_overlay","TB_window","TB_load"],"z-index","999999")}});c.addButton("add_audio",{title:"wordpress.add_audio",image:d+"/img/audio.gif",onclick:function(){tb_show("",tinymce.DOM.get("add_audio").href);tinymce.DOM.setStyle(["TB_overlay","TB_window","TB_load"],"z-index","999999")}});c.onBeforeExecCommand.add(function(p,m,s,l,j){var v=tinymce.DOM,k,i,r,u,t,q;if("mceFullScreen"==m){if("mce_fullscreen"!=p.id&&v.get("add_audio")&&v.get("add_video")&&v.get("add_image")&&v.get("add_media")){p.settings.theme_advanced_buttons1+=",|,add_image,add_video,add_audio,add_media"}}if("JustifyLeft"==m||"JustifyRight"==m||"JustifyCenter"==m){k=p.selection.getNode();if(k.nodeName=="IMG"){q=m.substr(7).toLowerCase();t="align"+q;i=p.dom.getParent(k,"dl.wp-caption");r=p.dom.getParent(k,"div.mceTemp");if(i&&r){u=p.dom.hasClass(i,t)?"alignnone":t;i.className=i.className.replace(/align[^ '"]+\s?/g,"");p.dom.addClass(i,u);if(u=="aligncenter"){p.dom.addClass(r,"mceIEcenter")}else{p.dom.removeClass(r,"mceIEcenter")}j.terminate=true;p.execCommand("mceRepaint")}else{if(p.dom.hasClass(k,t)){p.dom.addClass(k,"alignnone")}else{p.dom.removeClass(k,"alignnone")}}}}});c.onInit.add(function(i){i.onNodeChange.add(function(k,j,m){var l;if(m.nodeName=="IMG"){l=k.dom.getParent(m,"dl.wp-caption")}else{if(m.nodeName=="DIV"&&k.dom.hasClass(m,"mceTemp")){l=m.firstChild;if(!k.dom.hasClass(l,"wp-caption")){l=false}}}if(l){if(k.dom.hasClass(l,"alignleft")){j.setActive("justifyleft",1)}else{if(k.dom.hasClass(l,"alignright")){j.setActive("justifyright",1)}else{if(k.dom.hasClass(l,"aligncenter")){j.setActive("justifycenter",1)}}}}});i.onBeforeSetContent.add(function(j,k){if(k.content){k.content=k.content.replace(/

\s*<(p|div|ul|ol|dl|table|blockquote|h[1-6]|fieldset|pre|address)( [^>]*)?>/gi,"<$1$2>");k.content=k.content.replace(/<\/(p|div|ul|ol|dl|table|blockquote|h[1-6]|fieldset|pre|address)>\s*<\/p>/gi,"")}})});if("undefined"!=typeof(jQuery)){c.onKeyUp.add(function(j,l){var i=l.keyCode||l.charCode;if(i==g){return}if(13==i||8==g||46==g){jQuery(document).triggerHandler("wpcountwords",[j.getContent({format:"raw"})])}g=i})}c.onSaveContent.addToTop(function(i,j){j.content=j.content.replace(/

(
|\u00a0|\uFEFF)?<\/p>/g,"

 

")});c.onSaveContent.add(function(i,j){if(typeof(switchEditors)=="object"){if(i.isHidden()){j.content=j.element.value}else{j.content=switchEditors.pre_wpautop(j.content)}}});e._handleMoreBreak(c,d);c.addShortcut("alt+shift+c",c.getLang("justifycenter_desc"),"JustifyCenter");c.addShortcut("alt+shift+r",c.getLang("justifyright_desc"),"JustifyRight");c.addShortcut("alt+shift+l",c.getLang("justifyleft_desc"),"JustifyLeft");c.addShortcut("alt+shift+j",c.getLang("justifyfull_desc"),"JustifyFull");c.addShortcut("alt+shift+q",c.getLang("blockquote_desc"),"mceBlockQuote");c.addShortcut("alt+shift+u",c.getLang("bullist_desc"),"InsertUnorderedList");c.addShortcut("alt+shift+o",c.getLang("numlist_desc"),"InsertOrderedList");c.addShortcut("alt+shift+d",c.getLang("striketrough_desc"),"Strikethrough");c.addShortcut("alt+shift+n",c.getLang("spellchecker.desc"),"mceSpellCheck");c.addShortcut("alt+shift+a",c.getLang("link_desc"),"mceLink");c.addShortcut("alt+shift+s",c.getLang("unlink_desc"),"unlink");c.addShortcut("alt+shift+m",c.getLang("image_desc"),"mceImage");c.addShortcut("alt+shift+g",c.getLang("fullscreen.desc"),"mceFullScreen");c.addShortcut("alt+shift+z",c.getLang("wp_adv_desc"),"WP_Adv");c.addShortcut("alt+shift+h",c.getLang("help_desc"),"WP_Help");c.addShortcut("alt+shift+t",c.getLang("wp_more_desc"),"WP_More");c.addShortcut("alt+shift+p",c.getLang("wp_page_desc"),"WP_Page");c.addShortcut("ctrl+s",c.getLang("save_desc"),function(){if("function"==typeof autosave){autosave()}});if(tinymce.isWebKit){c.addShortcut("alt+shift+b",c.getLang("bold_desc"),"Bold");c.addShortcut("alt+shift+i",c.getLang("italic_desc"),"Italic")}c.onInit.add(function(i){tinymce.dom.Event.add(i.getWin(),"scroll",function(j){i.plugins.wordpress._hideButtons()});tinymce.dom.Event.add(i.getBody(),"dragstart",function(j){i.plugins.wordpress._hideButtons()})});c.onBeforeExecCommand.add(function(i,k,j,l){i.plugins.wordpress._hideButtons()});c.onSaveContent.add(function(i,j){i.plugins.wordpress._hideButtons()});c.onMouseDown.add(function(i,j){if(j.target.nodeName!="IMG"){i.plugins.wordpress._hideButtons()}})},getInfo:function(){return{longname:"WordPress Plugin",author:"WordPress",authorurl:"http://wordpress.org",infourl:"http://wordpress.org",version:"3.0"}},_setEmbed:function(b){return b.replace(/\[embed\]([\s\S]+?)\[\/embed\][\s\u00a0]*/g,function(d,c){return''+c+''})},_getEmbed:function(b){return b.replace(/]+>/g,function(c){if(c.indexOf('class="wp-oembed')!=-1){var d=c.match(/alt="([^\"]+)"/);if(d[1]){c="[embed]"+d[1]+"[/embed]"}}return c})},_showButtons:function(f,d){var g=tinyMCE.activeEditor,i,h,b,j=tinymce.DOM,e,c;b=g.dom.getViewPort(g.getWin());i=j.getPos(g.getContentAreaContainer());h=g.dom.getPos(f);e=Math.max(h.x-b.x,0)+i.x;c=Math.max(h.y-b.y,0)+i.y;j.setStyles(d,{top:c+5+"px",left:e+5+"px",display:"block"});if(this.mceTout){clearTimeout(this.mceTout)}this.mceTout=setTimeout(function(){g.plugins.wordpress._hideButtons()},5000)},_hideButtons:function(){if(!this.mceTout){return}if(document.getElementById("wp_editbtns")){tinymce.DOM.hide("wp_editbtns")}if(document.getElementById("wp_gallerybtns")){tinymce.DOM.hide("wp_gallerybtns")}clearTimeout(this.mceTout);this.mceTout=0},_resizeIframe:function(c,e,b){var d=c.getContentAreaContainer().firstChild;a.setStyle(d,"height",d.clientHeight+b);c.theme.deltaHeight+=b},_handleMoreBreak:function(c,d){var e,b;e='$1';b='';c.onInit.add(function(){c.dom.loadCSS(d+"/css/content.css")});c.onPostRender.add(function(){if(c.theme.onResolveName){c.theme.onResolveName.add(function(f,g){if(g.node.nodeName=="IMG"){if(c.dom.hasClass(g.node,"mceWPmore")){g.name="wpmore"}if(c.dom.hasClass(g.node,"mceWPnextpage")){g.name="wppage"}}})}});c.onBeforeSetContent.add(function(f,g){if(g.content){g.content=g.content.replace(//g,e);g.content=g.content.replace(//g,b)}});c.onPostProcess.add(function(f,g){if(g.get){g.content=g.content.replace(/]+>/g,function(i){if(i.indexOf('class="mceWPmore')!==-1){var h,j=(h=i.match(/alt="(.*?)"/))?h[1]:"";i=""}if(i.indexOf('class="mceWPnextpage')!==-1){i=""}return i})}});c.onNodeChange.add(function(g,f,h){f.setActive("wp_page",h.nodeName==="IMG"&&g.dom.hasClass(h,"mceWPnextpage"));f.setActive("wp_more",h.nodeName==="IMG"&&g.dom.hasClass(h,"mceWPmore"))})}});tinymce.PluginManager.add("wordpress",tinymce.plugins.WordPress)})(); \ No newline at end of file diff --git a/wp-includes/js/tinymce/themes/advanced/skins/wp_theme/ui.css b/wp-includes/js/tinymce/themes/advanced/skins/wp_theme/ui.css index d00470ed3..c5d1b30a3 100644 --- a/wp-includes/js/tinymce/themes/advanced/skins/wp_theme/ui.css +++ b/wp-includes/js/tinymce/themes/advanced/skins/wp_theme/ui.css @@ -65,17 +65,18 @@ border:0; margin:0; padding:0; white-space:nowrap; text-decoration:none; font-we .wp_themeSkin span.mce_unlink, .wp_themeSkin span.mce_help, .wp_themeSkin span.mce_removeformat, -.wp_themeSkin span.mce_forecolor, -.wp_themeSkin .mce_forecolorpicker, .wp_themeSkin span.mce_fullscreen, .wp_themeSkin span.mce_media, .wp_themeSkin span.mce_pastetext, .wp_themeSkin span.mce_pasteword, -.wp_themeSkin span.mce_spellchecker, .wp_themeSkin span.mce_wp_help, .wp_themeSkin span.mce_wp_adv, .wp_themeSkin span.mce_wp_more, .wp_themeSkin span.mce_strikethrough, +.wp_themeSkin span.mce_spellchecker, +.wp_themeSkin span.mce_forecolor, +.wp_themeSkin .mce_forecolorpicker, +.wp_themeSkin .mceSplitButton .mce_spellchecker span.mce_spellchecker, .wp_themeSkin .mceSplitButton .mce_forecolor span.mce_forecolor { background: url(../../img/wpicons.png) no-repeat 20px 20px; } @@ -274,7 +275,7 @@ border:0; margin:0; padding:0; white-space:nowrap; text-decoration:none; font-we .wp_themeSkin .mceColorSplitMenu a.mceMoreColors {width:100%; height:auto; text-align:center; font-family:Tahoma,Verdana,Arial,Helvetica; font-size:11px; line-height:20px;} .wp_themeSkin .mceColorSplitMenu a.mceMoreColors:hover {} .wp_themeSkin a.mceMoreColors:hover {} -.wp_themeSkin .mceColorPreview {margin: -4px 0 0 2px; width:16px; height:4px; overflow:hidden} +.wp_themeSkin .mceColorPreview {margin: -5px 0 0 2px; width:16px; height:4px; overflow:hidden} /* Menu */ .wp_themeSkin .mceMenu {position:absolute; left:0; top:0; z-index:1000;} diff --git a/wp-includes/js/tinymce/wp-tinymce.js.gz b/wp-includes/js/tinymce/wp-tinymce.js.gz index bdcb329bcd28fb91aed8a28b6474ef4e39d65b43..30f9b7c3644230ce2848f901ae7b589bc399537d 100644 GIT binary patch delta 5105 zcmVw1qUCC2nfpc-+>3U2LYd01;cX2Xj7M~SOG47UwKn=0wX>cQ3%Ak792@8}2;qNSv8hf87<5>; z;JB|1tUlDMuME7pQ?di^}HRMLAl=h@UKfD3V;mV=UruC(aGmZHRkjL>cMkK@MvyYHNO<*3a5o9|((qUboC_ zd#_p6JQ2Jc*P&|z3h&@F6wb0x*j)KMHz7wTgN_jo9VncHPRNvo&RKCE8GV~jc$Sku zI46R^7}x-TpV#cSJq5*O)Ya#=;$9+$Z&u7NtawA1dXrt~2AKnJz8MDL|5fnYi}tzn<&OslPS9uHP0aGwfH9vI z@GZA{tIT+`eGvv3T)p;?Ek28s4{u_6!D!rRW& zhQGjn@Z%nFqMwjdf0Cu}kGELt@zHA!bf_)Dc-ksWEm=g>L>TabYioSdKm>1X)O5MJ zh=+~J4mk+;P0erXi?#AgDSS)1iec=qZ42-FW)+?u@;^j1<{_0f*BglQq+wxnz#!L0 ztw1PqFDMpq(qMEh;Mk?C+-cdSCOVf3GxCXl^+Mr(D)%e≦>EJ@!jjH_`LvdB%n> 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 delta 5070 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 diff --git a/wp-includes/version.php b/wp-includes/version.php index 3d1821507..454c7f7f5 100644 --- a/wp-includes/version.php +++ b/wp-includes/version.php @@ -36,7 +36,7 @@ $wp_db_version = 17517; * * @global string $tinymce_version */ -$tinymce_version = '342-20110518'; +$tinymce_version = '342-20110527'; /** * Holds the cache manifest version