From c66f166956c8b55b535a4605c5ba3e6b34d77102 Mon Sep 17 00:00:00 2001 From: Andrew Ozz Date: Wed, 26 Mar 2014 02:08:15 +0000 Subject: [PATCH] TinyMCE: fix the More and Next Page tags behavior: - Append them inside top level

tags. - If the caret is not in a top level

, create new paragraph after the current top level tag. - Do not change placement when edited in the Text editor. See #27378 Built from https://develop.svn.wordpress.org/trunk@27729 git-svn-id: http://core.svn.wordpress.org/trunk@27566 1a063a9b-81f0-0310-95a4-ce76da25c4cd --- wp-includes/js/quicktags.js | 2 +- wp-includes/js/quicktags.min.js | 2 +- .../js/tinymce/plugins/wordpress/plugin.js | 40 ++++-------------- .../tinymce/plugins/wordpress/plugin.min.js | 2 +- wp-includes/js/tinymce/wp-tinymce.js.gz | Bin 121320 -> 121232 bytes 5 files changed, 11 insertions(+), 35 deletions(-) diff --git a/wp-includes/js/quicktags.js b/wp-includes/js/quicktags.js index 8a2228f3af..a013b94735 100644 --- a/wp-includes/js/quicktags.js +++ b/wp-includes/js/quicktags.js @@ -643,7 +643,7 @@ function edButton(id, display, tagStart, tagEnd, access) { edButtons[90] = new qt.TagButton('ol','ol','

    \n','
\n\n','o'), edButtons[100] = new qt.TagButton('li','li','\t
  • ','
    • \n','l'), edButtons[110] = new qt.TagButton('code','code','','','c'), - edButtons[120] = new qt.TagButton('more','more','\n\n\n\n','','t'), + edButtons[120] = new qt.TagButton('more','more','\n\n','','t'), edButtons[140] = new qt.CloseButton(); })(); diff --git a/wp-includes/js/quicktags.min.js b/wp-includes/js/quicktags.min.js index bde0329c13..0a8f3e3ed5 100644 --- a/wp-includes/js/quicktags.min.js +++ b/wp-includes/js/quicktags.min.js @@ -1 +1 @@ -function quicktags(a){return new QTags(a)}function edInsertContent(a,b){return QTags.insertContent(b)}function edButton(a,b,c,d,e){return QTags.addButton(a,b,c,d,e,"",-1)}var QTags,edCanvas,edButtons=[],edAddTag=function(){},edCheckOpenTags=function(){},edCloseAllTags=function(){},edInsertImage=function(){},edInsertLink=function(){},edInsertTag=function(){},edLink=function(){},edQuickLink=function(){},edRemoveTag=function(){},edShowButton=function(){},edShowLinks=function(){},edSpell=function(){},edToolbar=function(){};!function(){var a,b=function(a){var c,d,e,f;"undefined"!=typeof jQuery?jQuery(document).ready(a):(c=b,c.funcs=[],c.ready=function(){if(!c.isReady)for(c.isReady=!0,d=0;d0){for(;"undefined"!=typeof edButtons[h];)h++;edButtons[h]=j}else edButtons[edButtons.length]=j;this.buttonsInitDone&&this._buttonsInit()}},a.insertContent=function(a){var b,c,d,e,f,g=document.getElementById(wpActiveEditor);return g?(document.selection?(g.focus(),b=document.selection.createRange(),b.text=a,g.focus()):g.selectionStart||0===g.selectionStart?(f=g.value,c=g.selectionStart,d=g.selectionEnd,e=g.scrollTop,g.value=f.substring(0,c)+a+f.substring(d,f.length),g.focus(),g.selectionStart=c+a.length,g.selectionEnd=c+a.length,g.scrollTop=e):(g.value+=a,g.focus()),!0):!1},a.Button=function(a,b,c,d,e){var f=this;f.id=a,f.display=b,f.access=c,f.title=d||"",f.instance=e||""},a.Button.prototype.html=function(a){var b=this.access?' accesskey="'+this.access+'"':"";return''},a.Button.prototype.callback=function(){},a.TagButton=function(b,c,d,e,f,g,h){var i=this;a.Button.call(i,b,c,f,g,h),i.tagStart=d,i.tagEnd=e},a.TagButton.prototype=new a.Button,a.TagButton.prototype.openTag=function(a,b){var c=this;b.openTags||(b.openTags=[]),c.tagEnd&&(b.openTags.push(c.id),a.value="/"+a.value)},a.TagButton.prototype.closeTag=function(a,b){var c=this,d=c.isOpen(b);d!==!1&&b.openTags.splice(d,1),a.value=c.display},a.TagButton.prototype.isOpen=function(a){var b=this,c=0,d=!1;if(a.openTags)for(;d===!1&&c0?k.text=l.tagEnd?l.tagStart+k.text+n:k.text+l.tagStart:l.tagEnd?l.isOpen(c)===!1?(k.text=l.tagStart,l.openTag(a,c)):(k.text=n,l.closeTag(a,c)):k.text=l.tagStart,b.focus()):b.selectionStart||0===b.selectionStart?(d=b.selectionStart,e=b.selectionEnd,f=e,g=b.scrollTop,h=m.substring(0,d),i=m.substring(e,m.length),j=m.substring(d,e),d!==e?l.tagEnd?(b.value=h+l.tagStart+j+n+i,f+=l.tagStart.length+n.length):(b.value=h+j+l.tagStart+i,f+=l.tagStart.length):l.tagEnd?l.isOpen(c)===!1?(b.value=h+l.tagStart+i,l.openTag(a,c),f=d+l.tagStart.length):(b.value=h+n+i,f=d+n.length,l.closeTag(a,c)):(b.value=h+l.tagStart+i,f=d+l.tagStart.length),b.focus(),b.selectionStart=f,b.selectionEnd=f,b.scrollTop=g):(n?l.isOpen(c)!==!1?(b.value+=l.tagStart,l.openTag(a,c)):(b.value+=n,l.closeTag(a,c)):b.value+=l.tagStart,b.focus())},a.SpellButton=function(){},a.CloseButton=function(){a.Button.call(this,"close",quicktagsL10n.closeTags,"",quicktagsL10n.closeAllOpenTags)},a.CloseButton.prototype=new a.Button,a._close=function(a,b,c){var d,e,f=c.openTags;if(f)for(;f.length>0;)d=c.getButton(f[f.length-1]),e=document.getElementById(c.name+"_"+d.id),a?d.callback.call(d,e,b,c):d.closeTag(e,c)},a.CloseButton.prototype.callback=a._close,a.closeAllTags=function(b){var c=this.getInstance(b);a._close("",c.canvas,c)},a.LinkButton=function(){a.TagButton.call(this,"link","link","","","a")},a.LinkButton.prototype=new a.TagButton,a.LinkButton.prototype.callback=function(b,c,d,e){var f,g=this;return"undefined"!=typeof wpLink?void wpLink.open(d.id):(e||(e="http://"),void(g.isOpen(d)===!1?(f=prompt(quicktagsL10n.enterURL,e),f&&(g.tagStart='',a.TagButton.prototype.callback.call(g,b,c,d))):a.TagButton.prototype.callback.call(g,b,c,d)))},a.ImgButton=function(){a.TagButton.call(this,"img","img","","","m")},a.ImgButton.prototype=new a.TagButton,a.ImgButton.prototype.callback=function(b,c,d,e){e||(e="http://");var f,g=prompt(quicktagsL10n.enterImageURL,e);g&&(f=prompt(quicktagsL10n.enterImageDescription,""),this.tagStart=''+f+'',a.TagButton.prototype.callback.call(this,b,c,d))},a.FullscreenButton=function(){a.Button.call(this,"fullscreen",quicktagsL10n.fullscreen,"f",quicktagsL10n.toggleFullscreen)},a.FullscreenButton.prototype=new a.Button,a.FullscreenButton.prototype.callback=function(a,b){b.id&&"undefined"!=typeof wp&&wp.editor&&wp.editor.fullscreen&&wp.editor.fullscreen.on()},a.TextDirectionButton=function(){a.Button.call(this,"textdirection",quicktagsL10n.textdirection,"",quicktagsL10n.toggleTextdirection)},a.TextDirectionButton.prototype=new a.Button,a.TextDirectionButton.prototype.callback=function(a,b){var c="rtl"===document.getElementsByTagName("html")[0].dir,d=b.style.direction;d||(d=c?"rtl":"ltr"),b.style.direction="rtl"===d?"ltr":"rtl",b.focus()},edButtons[10]=new a.TagButton("strong","b","","","b"),edButtons[20]=new a.TagButton("em","i","","","i"),edButtons[30]=new a.LinkButton,edButtons[40]=new a.TagButton("block","b-quote","\n\n
    ","
    \n\n","q"),edButtons[50]=new a.TagButton("del","del",'',"","d"),edButtons[60]=new a.TagButton("ins","ins",'',"","s"),edButtons[70]=new a.ImgButton,edButtons[80]=new a.TagButton("ul","ul","
      \n","
    \n\n","u"),edButtons[90]=new a.TagButton("ol","ol","
      \n","
    \n\n","o"),edButtons[100]=new a.TagButton("li","li","
  • ","
    • \n","l"),edButtons[110]=new a.TagButton("code","code","","","c"),edButtons[120]=new a.TagButton("more","more","\n\n\n\n","","t"),edButtons[140]=new a.CloseButton}(); \ No newline at end of file +function quicktags(a){return new QTags(a)}function edInsertContent(a,b){return QTags.insertContent(b)}function edButton(a,b,c,d,e){return QTags.addButton(a,b,c,d,e,"",-1)}var QTags,edCanvas,edButtons=[],edAddTag=function(){},edCheckOpenTags=function(){},edCloseAllTags=function(){},edInsertImage=function(){},edInsertLink=function(){},edInsertTag=function(){},edLink=function(){},edQuickLink=function(){},edRemoveTag=function(){},edShowButton=function(){},edShowLinks=function(){},edSpell=function(){},edToolbar=function(){};!function(){var a,b=function(a){var c,d,e,f;"undefined"!=typeof jQuery?jQuery(document).ready(a):(c=b,c.funcs=[],c.ready=function(){if(!c.isReady)for(c.isReady=!0,d=0;d0){for(;"undefined"!=typeof edButtons[h];)h++;edButtons[h]=j}else edButtons[edButtons.length]=j;this.buttonsInitDone&&this._buttonsInit()}},a.insertContent=function(a){var b,c,d,e,f,g=document.getElementById(wpActiveEditor);return g?(document.selection?(g.focus(),b=document.selection.createRange(),b.text=a,g.focus()):g.selectionStart||0===g.selectionStart?(f=g.value,c=g.selectionStart,d=g.selectionEnd,e=g.scrollTop,g.value=f.substring(0,c)+a+f.substring(d,f.length),g.focus(),g.selectionStart=c+a.length,g.selectionEnd=c+a.length,g.scrollTop=e):(g.value+=a,g.focus()),!0):!1},a.Button=function(a,b,c,d,e){var f=this;f.id=a,f.display=b,f.access=c,f.title=d||"",f.instance=e||""},a.Button.prototype.html=function(a){var b=this.access?' accesskey="'+this.access+'"':"";return''},a.Button.prototype.callback=function(){},a.TagButton=function(b,c,d,e,f,g,h){var i=this;a.Button.call(i,b,c,f,g,h),i.tagStart=d,i.tagEnd=e},a.TagButton.prototype=new a.Button,a.TagButton.prototype.openTag=function(a,b){var c=this;b.openTags||(b.openTags=[]),c.tagEnd&&(b.openTags.push(c.id),a.value="/"+a.value)},a.TagButton.prototype.closeTag=function(a,b){var c=this,d=c.isOpen(b);d!==!1&&b.openTags.splice(d,1),a.value=c.display},a.TagButton.prototype.isOpen=function(a){var b=this,c=0,d=!1;if(a.openTags)for(;d===!1&&c0?k.text=l.tagEnd?l.tagStart+k.text+n:k.text+l.tagStart:l.tagEnd?l.isOpen(c)===!1?(k.text=l.tagStart,l.openTag(a,c)):(k.text=n,l.closeTag(a,c)):k.text=l.tagStart,b.focus()):b.selectionStart||0===b.selectionStart?(d=b.selectionStart,e=b.selectionEnd,f=e,g=b.scrollTop,h=m.substring(0,d),i=m.substring(e,m.length),j=m.substring(d,e),d!==e?l.tagEnd?(b.value=h+l.tagStart+j+n+i,f+=l.tagStart.length+n.length):(b.value=h+j+l.tagStart+i,f+=l.tagStart.length):l.tagEnd?l.isOpen(c)===!1?(b.value=h+l.tagStart+i,l.openTag(a,c),f=d+l.tagStart.length):(b.value=h+n+i,f=d+n.length,l.closeTag(a,c)):(b.value=h+l.tagStart+i,f=d+l.tagStart.length),b.focus(),b.selectionStart=f,b.selectionEnd=f,b.scrollTop=g):(n?l.isOpen(c)!==!1?(b.value+=l.tagStart,l.openTag(a,c)):(b.value+=n,l.closeTag(a,c)):b.value+=l.tagStart,b.focus())},a.SpellButton=function(){},a.CloseButton=function(){a.Button.call(this,"close",quicktagsL10n.closeTags,"",quicktagsL10n.closeAllOpenTags)},a.CloseButton.prototype=new a.Button,a._close=function(a,b,c){var d,e,f=c.openTags;if(f)for(;f.length>0;)d=c.getButton(f[f.length-1]),e=document.getElementById(c.name+"_"+d.id),a?d.callback.call(d,e,b,c):d.closeTag(e,c)},a.CloseButton.prototype.callback=a._close,a.closeAllTags=function(b){var c=this.getInstance(b);a._close("",c.canvas,c)},a.LinkButton=function(){a.TagButton.call(this,"link","link","","    ","a")},a.LinkButton.prototype=new a.TagButton,a.LinkButton.prototype.callback=function(b,c,d,e){var f,g=this;return"undefined"!=typeof wpLink?void wpLink.open(d.id):(e||(e="http://"),void(g.isOpen(d)===!1?(f=prompt(quicktagsL10n.enterURL,e),f&&(g.tagStart='',a.TagButton.prototype.callback.call(g,b,c,d))):a.TagButton.prototype.callback.call(g,b,c,d)))},a.ImgButton=function(){a.TagButton.call(this,"img","img","","","m")},a.ImgButton.prototype=new a.TagButton,a.ImgButton.prototype.callback=function(b,c,d,e){e||(e="http://");var f,g=prompt(quicktagsL10n.enterImageURL,e);g&&(f=prompt(quicktagsL10n.enterImageDescription,""),this.tagStart=''+f+'',a.TagButton.prototype.callback.call(this,b,c,d))},a.FullscreenButton=function(){a.Button.call(this,"fullscreen",quicktagsL10n.fullscreen,"f",quicktagsL10n.toggleFullscreen)},a.FullscreenButton.prototype=new a.Button,a.FullscreenButton.prototype.callback=function(a,b){b.id&&"undefined"!=typeof wp&&wp.editor&&wp.editor.fullscreen&&wp.editor.fullscreen.on()},a.TextDirectionButton=function(){a.Button.call(this,"textdirection",quicktagsL10n.textdirection,"",quicktagsL10n.toggleTextdirection)},a.TextDirectionButton.prototype=new a.Button,a.TextDirectionButton.prototype.callback=function(a,b){var c="rtl"===document.getElementsByTagName("html")[0].dir,d=b.style.direction;d||(d=c?"rtl":"ltr"),b.style.direction="rtl"===d?"ltr":"rtl",b.focus()},edButtons[10]=new a.TagButton("strong","b","","","b"),edButtons[20]=new a.TagButton("em","i","","","i"),edButtons[30]=new a.LinkButton,edButtons[40]=new a.TagButton("block","b-quote","\n\n
    ","
    \n\n","q"),edButtons[50]=new a.TagButton("del","del",'',"","d"),edButtons[60]=new a.TagButton("ins","ins",'',"","s"),edButtons[70]=new a.ImgButton,edButtons[80]=new a.TagButton("ul","ul","
      \n","
    \n\n","u"),edButtons[90]=new a.TagButton("ol","ol","
      \n","
    \n\n","o"),edButtons[100]=new a.TagButton("li","li","
  • ","
    • \n","l"),edButtons[110]=new a.TagButton("code","code","","","c"),edButtons[120]=new a.TagButton("more","more","\n\n","","t"),edButtons[140]=new a.CloseButton}(); \ No newline at end of file diff --git a/wp-includes/js/tinymce/plugins/wordpress/plugin.js b/wp-includes/js/tinymce/plugins/wordpress/plugin.js index d17f11411e..303f20d646 100644 --- a/wp-includes/js/tinymce/plugins/wordpress/plugin.js +++ b/wp-includes/js/tinymce/plugins/wordpress/plugin.js @@ -130,32 +130,10 @@ tinymce.PluginManager.add( 'wordpress', function( editor ) { } }); - // Make sure the "more" tag is in a separate paragraph - editor.on( 'PreProcess', function( event ) { - var more; - - if ( event.save ) { - more = editor.dom.select( 'img.wp-more-tag', event.node ); - - if ( more.length ) { - tinymce.each( more, function( node ) { - var parent = node.parentNode, p; - - if ( parent.nodeName === 'P' && parent.childNodes.length > 1 ) { - p = editor.dom.create('p'); - parent.parentNode.insertBefore( p, parent ); - p.appendChild( node ); - } - }); - } - } - }); - // Register commands editor.addCommand( 'WP_More', function( tag ) { - var parent, html, title, p1, p2, + var parent, html, title, classname = 'wp-more-tag', - spacer = tinymce.Env.ie ? '' : '
    ', dom = editor.dom, node = editor.selection.getNode(); @@ -165,8 +143,9 @@ tinymce.PluginManager.add( 'wordpress', function( editor ) { html = ''; - if ( node.nodeName === 'BODY' ) { - editor.insertContent( '

    ' + html + '

    ' ); + // Most common case + if ( node.nodeName === 'BODY' || ( node.nodeName === 'P' && node.parentNode.nodeName === 'BODY' ) ) { + editor.insertContent( html ); return; } @@ -180,16 +159,13 @@ tinymce.PluginManager.add( 'wordpress', function( editor ) { }, editor.getBody() ); if ( parent ) { - p1 = dom.create( 'p', null, html ); - dom.insertAfter( p1, parent ); - - if ( ! ( p2 = p1.nextSibling ) ) { - p2 = dom.create( 'p', null, spacer ); - dom.insertAfter( p2, p1 ); + if ( parent.nodeName === 'P' ) { + parent.appendChild( dom.create( 'p', null, html ).firstChild ); + } else { + dom.insertAfter( dom.create( 'p', null, html ), parent ); } editor.nodeChanged(); - editor.selection.setCursorLocation( p2, 0 ); } }); diff --git a/wp-includes/js/tinymce/plugins/wordpress/plugin.min.js b/wp-includes/js/tinymce/plugins/wordpress/plugin.min.js index ec32168e94..29bfdee7fe 100644 --- a/wp-includes/js/tinymce/plugins/wordpress/plugin.min.js +++ b/wp-includes/js/tinymce/plugins/wordpress/plugin.min.js @@ -1 +1 @@ -tinymce.ui.FloatPanel.zIndex=100100,tinymce.PluginManager.add("wordpress",function(a){function b(b){var c,d,e,f=0;d="hide"===b,a.theme.panel&&(e=a.theme.panel.find(".toolbar:not(.menubar)")),!e||e.length<2||"hide"===b&&!e[1].visible()||(!b&&e[1].visible()&&(b="hide"),tinymce.each(e,function(a,c){c>0&&("hide"===b?(a.hide(),f+=30):(a.show(),f-=30))}),f&&!d&&(c=a.getContentAreaContainer().firstChild,j.setStyle(c,"height",c.clientHeight+f),"hide"===b?(setUserSetting("hidetb","0"),g&&g.active(!1)):(setUserSetting("hidetb","1"),g&&g.active(!0))))}function c(a){return a.replace(/\[embed\]([\s\S]+?)\[\/embed\][\s\u00a0]*/g,function(a,b){return''+b+''})}function d(a){return a.replace(/]+>/g,function(a){if(-1!==a.indexOf('class="wp-oembed')){var b=a.match(/alt="([^\"]+)"/);b[1]&&(a="[embed]"+b[1]+"[/embed]")}return a})}function e(b,c){var d,e,f,g,h;f=a.dom.getViewPort(a.getWin()),d=j.getPos(a.getContentAreaContainer()),e=a.dom.getPos(b),g=Math.max(e.x-f.x,0)+d.x,h=Math.max(e.y-f.y,0)+d.y,j.setStyles(c,{top:h+5+"px",left:g+5+"px",display:"block"})}function f(){j.hide(j.select("#wp_editbtns, #wp_gallerybtns"))}var g,h,i,j=tinymce.DOM,k=0;return a.addButton("wp_adv",{tooltip:"Toolbar Toggle",cmd:"WP_Adv",onPostRender:function(){g=this}}),a.on("PostRender",function(){"0"===getUserSetting("hidetb","0")&&b("hide")}),a.addCommand("WP_Adv",function(){b()}),a.on("focus",function(){window.wpActiveEditor=a.id}),a.on("BeforeSetContent",function(a){a.content&&(-1!==a.content.indexOf("/g,function(a,b){return''})),-1!==a.content.indexOf("")&&(a.content=a.content.replace(//g,'')))}),a.on("PostProcess",function(a){a.get&&(a.content=a.content.replace(/]+>/g,function(a){var b,c="";return-1!==a.indexOf("wp-more-tag")&&(-1!==a.indexOf("mce-wp-more")?((b=a.match(/data-wp-more="([^"]+)"/))&&(c=b[1]),a=""):-1!==a.indexOf("mce-wp-nextpage")&&(a="")),a}))}),a.on("ResolveName",function(b){var c=a.dom,d=b.target;"IMG"===d.nodeName&&c.hasClass(d,"wp-more-tag")&&(c.hasClass(d,"mce-wp-more")?b.name="more":c.hasClass(d,"mce-wp-nextpage")&&(b.name="nextpage"))}),a.on("PreProcess",function(b){var c;b.save&&(c=a.dom.select("img.wp-more-tag",b.node),c.length&&tinymce.each(c,function(b){var c,d=b.parentNode;"P"===d.nodeName&&d.childNodes.length>1&&(c=a.dom.create("p"),d.parentNode.insertBefore(c,d),c.appendChild(b))}))}),a.addCommand("WP_More",function(b){var c,d,e,f,g,h="wp-more-tag",i=tinymce.Env.ie?"":'
    ',j=a.dom,k=a.selection.getNode();return b=b||"more",h+=" mce-wp-"+b,e="more"===b?"More...":"Next Page",d='',"BODY"===k.nodeName?void a.insertContent("

    "+d+"

    "):(c=j.getParent(k,function(a){return a.parentNode&&"BODY"===a.parentNode.nodeName?!0:!1},a.getBody()),void(c&&(f=j.create("p",null,d),j.insertAfter(f,c),(g=f.nextSibling)||(g=j.create("p",null,i),j.insertAfter(g,f)),a.nodeChanged(),a.selection.setCursorLocation(g,0))))}),a.addCommand("WP_Code",function(){a.formatter.toggle("code")}),a.addCommand("WP_Page",function(){a.execCommand("WP_More","nextpage")}),a.addCommand("WP_Help",function(){a.windowManager.open({url:tinymce.baseURL+"/wp-mce-help.php",width:450,height:420,inline:1})}),a.addCommand("WP_Medialib",function(){"undefined"!=typeof wp&&wp.media&&wp.media.editor&&wp.media.editor.open(a.id)}),a.addButton("wp_more",{tooltip:"Insert Read More tag",onclick:function(){a.execCommand("WP_More","more")}}),a.addButton("wp_page",{tooltip:"Page break",onclick:function(){a.execCommand("WP_More","nextpage")}}),a.addButton("wp_help",{tooltip:"Help",cmd:"WP_Help"}),a.addButton("wp_code",{tooltip:"Code",cmd:"WP_Code",stateSelector:"code"}),"undefined"!=typeof wp&&wp.media&&wp.media.editor&&a.addMenuItem("add_media",{text:"Add Media",icon:"wp-media-library",context:"insert",cmd:"WP_Medialib"}),a.addMenuItem("wp_more",{text:"Insert Read More tag",icon:"wp_more",context:"insert",onclick:function(){a.execCommand("WP_More","more")}}),a.addMenuItem("wp_page",{text:"Page break",icon:"wp_page",context:"insert",onclick:function(){a.execCommand("WP_More","nextpage")}}),a.on("BeforeExecCommand",function(b){!tinymce.Env.webkit||"InsertUnorderedList"!==b.command&&"InsertOrderedList"!==b.command||(i||(i=a.dom.create("style",{type:"text/css"},"#tinymce,#tinymce span,#tinymce li,#tinymce li>span,#tinymce p,#tinymce p>span{font:medium sans-serif;color:#000;line-height:normal;}")),a.getDoc().head.appendChild(i))}),a.on("ExecCommand",function(b){tinymce.Env.webkit&&i&&("InsertUnorderedList"===b.command||"InsertOrderedList"===b.command)&&a.dom.remove(i)}),a.on("init",function(){var b,c,d=tinymce.Env,e=0,f=["mceContentBody"],g=a.getDoc(),h=a.dom;"rtl"===a.getParam("directionality")&&f.push("rtl"),d.ie&&(9===parseInt(d.ie,10)?f.push("ie9"):8===parseInt(d.ie,10)?f.push("ie8"):d.ie<8&&f.push("ie7")),f.push("wp-editor"),tinymce.each(f,function(a){a&&h.addClass(g.body,a)}),a.on("BeforeSetContent",function(a){a.content&&(a.content=a.content.replace(/

    \s*<(p|div|ul|ol|dl|table|blockquote|h[1-6]|fieldset|pre|address)( [^>]*)?>/gi,"<$1$2>"),a.content=a.content.replace(/<\/(p|div|ul|ol|dl|table|blockquote|h[1-6]|fieldset|pre|address)>\s*<\/p>/gi,""))}),"undefined"!=typeof window.jQuery&&window.jQuery(document).triggerHandler("tinymce-editor-init",[a]),"ontouchstart"in window||h.bind(g,"onwheel"in g?"wheel":"mousewheel",function(f){var h,i,j=g.documentElement;a.settings.wp_fullscreen||("function"!=typeof g.hasFocus||g.hasFocus())&&("undefined"!=typeof f.deltaY?(h=f.deltaY,"undefined"!=typeof f.deltaMode&&f.deltaMode===f.DOM_DELTA_LINE&&(h*=20)):h=-f.wheelDelta,d.webkit?g.body.scrollTop+=h:j.scrollTop+=h,i=j.scrollTop||g.body.scrollTop,b===i?(e+=h,window.clearTimeout(c),c=window.setTimeout(function(){e=0},1e3)):e=0,b=i,e>1e3||-1e3>e||f.preventDefault())}),h.bind(g,"dragstart dragend dragover drop",function(a){"undefined"!=typeof window.jQuery&&window.jQuery(document).triggerHandler(a.type)})}),"undefined"!=typeof window.jQuery&&a.on("keyup",function(b){var c=b.keyCode||b.charCode;c!==k&&((13===c||8===k||46===k)&&window.jQuery(document).triggerHandler("wpcountwords",[a.getContent({format:"raw"})]),k=c)}),a.on("SaveContent",function(b){return a.isHidden()?void(b.content=b.element.value):(b.content=b.content.replace(/

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

     

    "),void(a.getParam("wpautop",!0)&&"undefined"!=typeof window.switchEditors&&(b.content=window.switchEditors.pre_wpautop(b.content))))}),a.on("preInit",function(){a.schema.addValidElements("@[id|accesskey|class|dir|lang|style|tabindex|title|contenteditable|draggable|dropzone|hidden|spellcheck|translate],i,b")}),h="alt+shift",a.addShortcut(h+"+c","","JustifyCenter"),a.addShortcut(h+"+r","","JustifyRight"),a.addShortcut(h+"+l","","JustifyLeft"),a.addShortcut(h+"+j","","JustifyFull"),a.addShortcut(h+"+q","","mceBlockQuote"),a.addShortcut(h+"+u","","InsertUnorderedList"),a.addShortcut(h+"+o","","InsertOrderedList"),a.addShortcut(h+"+n","","mceSpellCheck"),a.addShortcut(h+"+s","","unlink"),a.addShortcut(h+"+m","","WP_Medialib"),a.addShortcut(h+"+z","","WP_Adv"),a.addShortcut(h+"+t","","WP_More"),a.addShortcut(h+"+d","","Strikethrough"),a.addShortcut(h+"+h","","WP_Help"),a.addShortcut(h+"+p","","WP_Page"),a.addShortcut(h+"+x","","WP_Code"),a.addShortcut("ctrl+s","",function(){"undefined"!=typeof wp&&wp.autosave&&wp.autosave.server.triggerSave()}),a.on("init",function(){a.dom.bind(a.getWin(),"scroll",function(){f()}),a.dom.bind(a.getBody(),"dragstart",function(){f()})}),a.on("BeforeExecCommand",function(){f()}),a.on("SaveContent",function(){f()}),a.on("MouseDown",function(a){"IMG"!==a.target.nodeName&&f()}),a.on("keydown",function(a){(a.which===tinymce.util.VK.DELETE||a.which===tinymce.util.VK.BACKSPACE)&&f()}),{_showButtons:e,_hideButtons:f,_setEmbed:c,_getEmbed:d}}); \ No newline at end of file +tinymce.ui.FloatPanel.zIndex=100100,tinymce.PluginManager.add("wordpress",function(a){function b(b){var c,d,e,f=0;d="hide"===b,a.theme.panel&&(e=a.theme.panel.find(".toolbar:not(.menubar)")),!e||e.length<2||"hide"===b&&!e[1].visible()||(!b&&e[1].visible()&&(b="hide"),tinymce.each(e,function(a,c){c>0&&("hide"===b?(a.hide(),f+=30):(a.show(),f-=30))}),f&&!d&&(c=a.getContentAreaContainer().firstChild,j.setStyle(c,"height",c.clientHeight+f),"hide"===b?(setUserSetting("hidetb","0"),g&&g.active(!1)):(setUserSetting("hidetb","1"),g&&g.active(!0))))}function c(a){return a.replace(/\[embed\]([\s\S]+?)\[\/embed\][\s\u00a0]*/g,function(a,b){return''+b+''})}function d(a){return a.replace(/]+>/g,function(a){if(-1!==a.indexOf('class="wp-oembed')){var b=a.match(/alt="([^\"]+)"/);b[1]&&(a="[embed]"+b[1]+"[/embed]")}return a})}function e(b,c){var d,e,f,g,h;f=a.dom.getViewPort(a.getWin()),d=j.getPos(a.getContentAreaContainer()),e=a.dom.getPos(b),g=Math.max(e.x-f.x,0)+d.x,h=Math.max(e.y-f.y,0)+d.y,j.setStyles(c,{top:h+5+"px",left:g+5+"px",display:"block"})}function f(){j.hide(j.select("#wp_editbtns, #wp_gallerybtns"))}var g,h,i,j=tinymce.DOM,k=0;return a.addButton("wp_adv",{tooltip:"Toolbar Toggle",cmd:"WP_Adv",onPostRender:function(){g=this}}),a.on("PostRender",function(){"0"===getUserSetting("hidetb","0")&&b("hide")}),a.addCommand("WP_Adv",function(){b()}),a.on("focus",function(){window.wpActiveEditor=a.id}),a.on("BeforeSetContent",function(a){a.content&&(-1!==a.content.indexOf("/g,function(a,b){return''})),-1!==a.content.indexOf("")&&(a.content=a.content.replace(//g,'')))}),a.on("PostProcess",function(a){a.get&&(a.content=a.content.replace(/]+>/g,function(a){var b,c="";return-1!==a.indexOf("wp-more-tag")&&(-1!==a.indexOf("mce-wp-more")?((b=a.match(/data-wp-more="([^"]+)"/))&&(c=b[1]),a=""):-1!==a.indexOf("mce-wp-nextpage")&&(a="")),a}))}),a.on("ResolveName",function(b){var c=a.dom,d=b.target;"IMG"===d.nodeName&&c.hasClass(d,"wp-more-tag")&&(c.hasClass(d,"mce-wp-more")?b.name="more":c.hasClass(d,"mce-wp-nextpage")&&(b.name="nextpage"))}),a.addCommand("WP_More",function(b){var c,d,e,f="wp-more-tag",g=a.dom,h=a.selection.getNode();return b=b||"more",f+=" mce-wp-"+b,e="more"===b?"More...":"Next Page",d='',"BODY"===h.nodeName||"P"===h.nodeName&&"BODY"===h.parentNode.nodeName?void a.insertContent(d):(c=g.getParent(h,function(a){return a.parentNode&&"BODY"===a.parentNode.nodeName?!0:!1},a.getBody()),void(c&&("P"===c.nodeName?c.appendChild(g.create("p",null,d).firstChild):g.insertAfter(g.create("p",null,d),c),a.nodeChanged())))}),a.addCommand("WP_Code",function(){a.formatter.toggle("code")}),a.addCommand("WP_Page",function(){a.execCommand("WP_More","nextpage")}),a.addCommand("WP_Help",function(){a.windowManager.open({url:tinymce.baseURL+"/wp-mce-help.php",width:450,height:420,inline:1})}),a.addCommand("WP_Medialib",function(){"undefined"!=typeof wp&&wp.media&&wp.media.editor&&wp.media.editor.open(a.id)}),a.addButton("wp_more",{tooltip:"Insert Read More tag",onclick:function(){a.execCommand("WP_More","more")}}),a.addButton("wp_page",{tooltip:"Page break",onclick:function(){a.execCommand("WP_More","nextpage")}}),a.addButton("wp_help",{tooltip:"Help",cmd:"WP_Help"}),a.addButton("wp_code",{tooltip:"Code",cmd:"WP_Code",stateSelector:"code"}),"undefined"!=typeof wp&&wp.media&&wp.media.editor&&a.addMenuItem("add_media",{text:"Add Media",icon:"wp-media-library",context:"insert",cmd:"WP_Medialib"}),a.addMenuItem("wp_more",{text:"Insert Read More tag",icon:"wp_more",context:"insert",onclick:function(){a.execCommand("WP_More","more")}}),a.addMenuItem("wp_page",{text:"Page break",icon:"wp_page",context:"insert",onclick:function(){a.execCommand("WP_More","nextpage")}}),a.on("BeforeExecCommand",function(b){!tinymce.Env.webkit||"InsertUnorderedList"!==b.command&&"InsertOrderedList"!==b.command||(i||(i=a.dom.create("style",{type:"text/css"},"#tinymce,#tinymce span,#tinymce li,#tinymce li>span,#tinymce p,#tinymce p>span{font:medium sans-serif;color:#000;line-height:normal;}")),a.getDoc().head.appendChild(i))}),a.on("ExecCommand",function(b){tinymce.Env.webkit&&i&&("InsertUnorderedList"===b.command||"InsertOrderedList"===b.command)&&a.dom.remove(i)}),a.on("init",function(){var b,c,d=tinymce.Env,e=0,f=["mceContentBody"],g=a.getDoc(),h=a.dom;"rtl"===a.getParam("directionality")&&f.push("rtl"),d.ie&&(9===parseInt(d.ie,10)?f.push("ie9"):8===parseInt(d.ie,10)?f.push("ie8"):d.ie<8&&f.push("ie7")),f.push("wp-editor"),tinymce.each(f,function(a){a&&h.addClass(g.body,a)}),a.on("BeforeSetContent",function(a){a.content&&(a.content=a.content.replace(/

    \s*<(p|div|ul|ol|dl|table|blockquote|h[1-6]|fieldset|pre|address)( [^>]*)?>/gi,"<$1$2>"),a.content=a.content.replace(/<\/(p|div|ul|ol|dl|table|blockquote|h[1-6]|fieldset|pre|address)>\s*<\/p>/gi,""))}),"undefined"!=typeof window.jQuery&&window.jQuery(document).triggerHandler("tinymce-editor-init",[a]),"ontouchstart"in window||h.bind(g,"onwheel"in g?"wheel":"mousewheel",function(f){var h,i,j=g.documentElement;a.settings.wp_fullscreen||("function"!=typeof g.hasFocus||g.hasFocus())&&("undefined"!=typeof f.deltaY?(h=f.deltaY,"undefined"!=typeof f.deltaMode&&f.deltaMode===f.DOM_DELTA_LINE&&(h*=20)):h=-f.wheelDelta,d.webkit?g.body.scrollTop+=h:j.scrollTop+=h,i=j.scrollTop||g.body.scrollTop,b===i?(e+=h,window.clearTimeout(c),c=window.setTimeout(function(){e=0},1e3)):e=0,b=i,e>1e3||-1e3>e||f.preventDefault())}),h.bind(g,"dragstart dragend dragover drop",function(a){"undefined"!=typeof window.jQuery&&window.jQuery(document).triggerHandler(a.type)})}),"undefined"!=typeof window.jQuery&&a.on("keyup",function(b){var c=b.keyCode||b.charCode;c!==k&&((13===c||8===k||46===k)&&window.jQuery(document).triggerHandler("wpcountwords",[a.getContent({format:"raw"})]),k=c)}),a.on("SaveContent",function(b){return a.isHidden()?void(b.content=b.element.value):(b.content=b.content.replace(/

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

     

    "),void(a.getParam("wpautop",!0)&&"undefined"!=typeof window.switchEditors&&(b.content=window.switchEditors.pre_wpautop(b.content))))}),a.on("preInit",function(){a.schema.addValidElements("@[id|accesskey|class|dir|lang|style|tabindex|title|contenteditable|draggable|dropzone|hidden|spellcheck|translate],i,b")}),h="alt+shift",a.addShortcut(h+"+c","","JustifyCenter"),a.addShortcut(h+"+r","","JustifyRight"),a.addShortcut(h+"+l","","JustifyLeft"),a.addShortcut(h+"+j","","JustifyFull"),a.addShortcut(h+"+q","","mceBlockQuote"),a.addShortcut(h+"+u","","InsertUnorderedList"),a.addShortcut(h+"+o","","InsertOrderedList"),a.addShortcut(h+"+n","","mceSpellCheck"),a.addShortcut(h+"+s","","unlink"),a.addShortcut(h+"+m","","WP_Medialib"),a.addShortcut(h+"+z","","WP_Adv"),a.addShortcut(h+"+t","","WP_More"),a.addShortcut(h+"+d","","Strikethrough"),a.addShortcut(h+"+h","","WP_Help"),a.addShortcut(h+"+p","","WP_Page"),a.addShortcut(h+"+x","","WP_Code"),a.addShortcut("ctrl+s","",function(){"undefined"!=typeof wp&&wp.autosave&&wp.autosave.server.triggerSave()}),a.on("init",function(){a.dom.bind(a.getWin(),"scroll",function(){f()}),a.dom.bind(a.getBody(),"dragstart",function(){f()})}),a.on("BeforeExecCommand",function(){f()}),a.on("SaveContent",function(){f()}),a.on("MouseDown",function(a){"IMG"!==a.target.nodeName&&f()}),a.on("keydown",function(a){(a.which===tinymce.util.VK.DELETE||a.which===tinymce.util.VK.BACKSPACE)&&f()}),{_showButtons:e,_hideButtons:f,_setEmbed:c,_getEmbed:d}}); \ 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 9ecc9c0e10cb1754386a822faec9862dbeb6d29a..aa8ca9a53df4e6a462d3fdb5c808220c0012337d 100644 GIT binary patch delta 7747 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 delta 7838 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 w-w%!