From b96c4d3fc6e404892f92ef2524a7fe085e30134e Mon Sep 17 00:00:00 2001 From: azaozz Date: Sun, 5 Jun 2011 00:06:28 +0000 Subject: [PATCH] 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 git-svn-id: http://svn.automattic.com/wordpress/trunk@18142 1a063a9b-81f0-0310-95a4-ce76da25c4cd --- .../plugins/wordpress/editor_plugin.dev.js | 3 +++ .../plugins/wordpress/editor_plugin.js | 2 +- .../wpfullscreen/css/wp-fullscreen.css | 4 +-- .../plugins/wpfullscreen/editor_plugin.dev.js | 25 +++++++++++------- .../plugins/wpfullscreen/editor_plugin.js | 2 +- .../advanced/skins/wp_theme/content.css | 23 ++++++++-------- wp-includes/js/tinymce/wp-tinymce.js.gz | Bin 93366 -> 93409 bytes wp-includes/version.php | 2 +- 8 files changed, 35 insertions(+), 26 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 86295c8ec2..6c0083c8e4 100644 --- a/wp-includes/js/tinymce/plugins/wordpress/editor_plugin.dev.js +++ b/wp-includes/js/tinymce/plugins/wordpress/editor_plugin.dev.js @@ -186,6 +186,9 @@ } }); + if ( ed.id != 'wp_mce_fullscreen' ) + ed.dom.addClass(ed.getBody(), 'wp-editor'); + // remove invalid parent paragraphs when pasting HTML and/or switching to the HTML editor and back ed.onBeforeSetContent.add(function(ed, o) { if ( o.content ) { diff --git a/wp-includes/js/tinymce/plugins/wordpress/editor_plugin.js b/wp-includes/js/tinymce/plugins/wordpress/editor_plugin.js index 8be6d77020..115661aeab 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.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 +(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)}}}}});if(i.id!="wp_mce_fullscreen"){i.dom.addClass(i.getBody(),"wp-editor")}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/plugins/wpfullscreen/css/wp-fullscreen.css b/wp-includes/js/tinymce/plugins/wpfullscreen/css/wp-fullscreen.css index 0b3fab2634..a60af77767 100644 --- a/wp-includes/js/tinymce/plugins/wpfullscreen/css/wp-fullscreen.css +++ b/wp-includes/js/tinymce/plugins/wpfullscreen/css/wp-fullscreen.css @@ -6,6 +6,6 @@ html, body { background: transparent; width: auto !important; max-width: none !important; - margin: 0 !important; - padding: 0 !important; + margin: 0; + padding: 0; } 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 ff1f55301f..ca9bcbb3ee 100644 --- a/wp-includes/js/tinymce/plugins/wpfullscreen/editor_plugin.dev.js +++ b/wp-includes/js/tinymce/plugins/wpfullscreen/editor_plugin.dev.js @@ -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 diff --git a/wp-includes/js/tinymce/plugins/wpfullscreen/editor_plugin.js b/wp-includes/js/tinymce/plugins/wpfullscreen/editor_plugin.js index 88d12ea497..e874730729 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(a,c){var d=this,g=0,e={},f=tinymce.DOM;a.addCommand("wpFullScreenClose",function(){if(a.getParam("wp_fullscreen_is_enabled")){f.win.setTimeout(function(){tinyMCE.remove(a);f.remove("wp_mce_fullscreen_parent");tinyMCE.settings=tinyMCE.oldSettings},10)}});a.addCommand("wpFullScreenSave",function(){var h=tinyMCE.get("wp_mce_fullscreen"),i;h.focus();i=tinyMCE.get(h.getParam("wp_fullscreen_editor_id"));i.setContent(h.getContent({format:"raw"}),{format:"raw"})});a.addCommand("wpFullScreenInit",function(){var j=a.getDoc(),h=j.body,i;if(a.id=="wp_mce_fullscreen"){return}tinyMCE.oldSettings=tinyMCE.settings;tinymce.each(a.settings,function(k,l){e[l]=k});e.id="wp_mce_fullscreen";e.wp_fullscreen_is_enabled=true;e.wp_fullscreen_editor_id=a.id;e.theme_advanced_resizing=false;e.theme_advanced_statusbar_location="none";e.content_css=e.content_css+","+e.wp_fullscreen_content_css;e.height=tinymce.isIE?h.scrollHeight:h.offsetHeight;tinymce.each(a.getParam("wp_fullscreen_settings"),function(m,l){e[l]=m});i=new tinymce.Editor("wp_mce_fullscreen",e);i.onInit.add(function(k){var m=tinymce.DOM,l=m.select("a.mceButton",m.get("wp-fullscreen-buttons"));if(!a.isHidden()){k.setContent(a.getContent())}else{k.setContent(switchEditors.wpautop(k.getElement().value))}setTimeout(function(){k.onNodeChange.add(function(o,n,p){tinymce.each(l,function(s){var r,q;if(r=m.get("wp_mce_fullscreen_"+s.id.substr(6))){q=r.className;if(q){s.className=q}}})})},1000);k.focus()});i.render();i.dom.bind(i.getWin(),"mousemove",function(k){if(!fullscreen.settings.toolbar_shown){fullscreen.bounder("showToolbar","hideToolbar",2000)}})});if("undefined"!=fullscreen){a.addButton("fullscreen",{title:"fullscreen.desc",onclick:function(){fullscreen.on()}})}if(a.getParam("fullscreen_is_enabled")||!a.getParam("wp_fullscreen_is_enabled")){return}function b(){var k=a.getDoc(),h=k.body,m=k.documentElement,j=tinymce.DOM,l,i;if(tinymce.isIE){i=h.scrollHeight}else{if(tinymce.isWebKit){i=h.offsetHeight}else{i=m.offsetHeight}}l=(i>300)?i:300;if(g!=l){g=l;j.setStyle(j.get(a.id+"_ifr"),"height",l+"px")}}a.onInit.add(function(i,h){i.onChange.add(b);i.onSetContent.add(b);i.onPaste.add(b);i.onKeyUp.add(b);i.onPostRender.add(b);i.getBody().style.overflowY="hidden"});if(a.getParam("autoresize_on_init",true)){a.onLoadContent.add(function(i,h){setTimeout(function(){b()},1200)})}a.addCommand("wpAutoResize",b)},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.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 diff --git a/wp-includes/js/tinymce/themes/advanced/skins/wp_theme/content.css b/wp-includes/js/tinymce/themes/advanced/skins/wp_theme/content.css index 4c85ab75d0..d5a8ef3e03 100644 --- a/wp-includes/js/tinymce/themes/advanced/skins/wp_theme/content.css +++ b/wp-includes/js/tinymce/themes/advanced/skins/wp_theme/content.css @@ -1,7 +1,12 @@ -body, td, pre {color:#000; font-family:Verdana, Arial, Helvetica, sans-serif; font-size:10px; margin:8px;} -body {background:#FFF;} +body { + font: 13px/19px Georgia, "Times New Roman", "Bitstream Charter", Times, serif; + margin: 0.6em; + background: #fff; + color: #000; +} body.mceForceColors {background:#FFF; color:#000;} body.mceBrowserDefaults {background:transparent; color:inherit; font-size:inherit; font-family:inherit;} +td {color:#000; font-family:Verdana, Arial, Helvetica, sans-serif; font-size:10px; margin:8px;} h1 {font-size: 2em} h2 {font-size: 1.5em} h3 {font-size: 1.17em} @@ -63,6 +68,10 @@ dl.aligncenter { border-radius: 3px; } +.mceIEcenter { + text-align: center; +} + .wp-caption img { margin: 0; padding: 0; @@ -76,13 +85,8 @@ dl.aligncenter { margin: 0; } -body.mceContentBody { - font: 13px/19px Georgia, "Times New Roman", "Bitstream Charter", Times, serif; - margin: 0.6em; -} - pre { - font: 12px/18px Consolas, Monaco, "Courier New", Courier, monospace; + font: 12px/18px Consolas, Monaco, monospace; } td { @@ -91,6 +95,3 @@ td { margin: 8px; } -.mceIEcenter { - text-align: center; -} diff --git a/wp-includes/js/tinymce/wp-tinymce.js.gz b/wp-includes/js/tinymce/wp-tinymce.js.gz index ecc3a3600f14badbdc805cd31bb165a606b363af..82ab57a52245d621eddea3809d3167f26714b8f6 100644 GIT binary patch delta 5255 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 W0ftr5Biw8Zp8W}#HDEe{e*^%L$~SQU diff --git a/wp-includes/version.php b/wp-includes/version.php index d18b496d35..2feba0a54c 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-20110603'; +$tinymce_version = '342-20110604'; /** * Holds the cache manifest version