From 7e51b698c6807434f47ef85a88f8395a36910f3d Mon Sep 17 00:00:00 2001 From: Andrew Ozz Date: Thu, 9 Jul 2015 00:25:25 +0000 Subject: [PATCH] TinyMCE: when deleting an image, ensure the wrapping link (if any) is deleted too. Fixes the erroneous showing of the link toolbar after deleting an image. Also small readability fix. See #32604. Built from https://develop.svn.wordpress.org/trunk@33141 git-svn-id: http://core.svn.wordpress.org/trunk@33112 1a063a9b-81f0-0310-95a4-ce76da25c4cd --- .../js/tinymce/plugins/wordpress/plugin.js | 4 +++- .../tinymce/plugins/wordpress/plugin.min.js | 2 +- .../js/tinymce/plugins/wpeditimage/plugin.js | 8 +++----- .../tinymce/plugins/wpeditimage/plugin.min.js | 2 +- wp-includes/js/tinymce/wp-tinymce.js.gz | Bin 146466 -> 146454 bytes wp-includes/version.php | 2 +- 6 files changed, 9 insertions(+), 9 deletions(-) diff --git a/wp-includes/js/tinymce/plugins/wordpress/plugin.js b/wp-includes/js/tinymce/plugins/wordpress/plugin.js index 2ed49d175c..75e6b9085b 100644 --- a/wp-includes/js/tinymce/plugins/wordpress/plugin.js +++ b/wp-includes/js/tinymce/plugins/wordpress/plugin.js @@ -820,7 +820,9 @@ tinymce.PluginManager.add( 'wordpress', function( editor ) { clearTimeout( timeout ); timeout = setTimeout( function() { - activeToolbar && activeToolbar.show && activeToolbar.show(); + if ( activeToolbar && typeof activeToolbar.show === 'function' ) { + activeToolbar.show(); + } }, 250 ); } } diff --git a/wp-includes/js/tinymce/plugins/wordpress/plugin.min.js b/wp-includes/js/tinymce/plugins/wordpress/plugin.min.js index b919228004..38ab29c6a1 100644 --- a/wp-includes/js/tinymce/plugins/wordpress/plugin.min.js +++ b/wp-includes/js/tinymce/plugins/wordpress/plugin.min.js @@ -1 +1 @@ -!function(a){a.ui.FloatPanel.zIndex=100100,a.PluginManager.add("wordpress",function(b){function c(c){var d,f,i,j=0;f="hide"===c,b.theme.panel&&(i=b.theme.panel.find(".toolbar:not(.menubar)")),!i||i.length<2||"hide"===c&&!i[1].visible()||(!c&&i[1].visible()&&(c="hide"),h(i,function(a,b){b>0&&("hide"===c?(a.hide(),j+=30):(a.show(),j-=30))}),j&&!f&&(a.Env.iOS||(d=b.getContentAreaContainer().firstChild,g.setStyle(d,"height",d.clientHeight+j)),"hide"===c?(setUserSetting("hidetb","0"),e&&e.active(!1)):(setUserSetting("hidetb","1"),e&&e.active(!0))),b.fire("wp-toolbar-toggle"))}function d(){}var e,f,g=a.DOM,h=a.each,i=b.editorManager.i18n.translate,j=window.jQuery,k=window.wp,l=k&&k.editor&&k.editor.autop&&b.getParam("wpautop",!0);return j&&j(document).triggerHandler("tinymce-editor-setup",[b]),b.addButton("wp_adv",{tooltip:"Toolbar Toggle",cmd:"WP_Adv",onPostRender:function(){e=this,e.active("1"===getUserSetting("hidetb")?!0:!1)}}),b.on("PostRender",function(){b.getParam("wordpress_adv_hidden",!0)&&"0"===getUserSetting("hidetb","0")&&c("hide")}),b.addCommand("WP_Adv",function(){c()}),b.on("focus",function(){window.wpActiveEditor=b.id}),b.on("BeforeSetContent",function(b){var c,d=a.Env.webkit?"


":"

";b.content&&(-1!==b.content.indexOf("/g,function(b,d){return''})),-1!==b.content.indexOf("")&&(c=i("Page break"),b.content=b.content.replace(//g,'')),b.content=b.content.replace(/

(?: |\u00a0|\uFEFF|\s)+<\/p>/gi,d),b.load&&"raw"!==b.format&&l&&(b.content=k.editor.autop(b.content)))}),b.on("PostProcess",function(a){a.get&&(a.content=a.content.replace(/]+>/g,function(a){var b,c="";return-1!==a.indexOf('data-wp-more="more"')?((b=a.match(/data-wp-more-text="([^"]+)"/))&&(c=b[1]),a=""):-1!==a.indexOf('data-wp-more="nextpage"')&&(a=""),a}))}),b.on("ResolveName",function(a){var c;"IMG"===a.target.nodeName&&(c=b.dom.getAttrib(a.target,"data-wp-more"))&&(a.name=c)}),b.addCommand("WP_More",function(c){var d,e,f,g="wp-more-tag",h=b.dom,j=b.selection.getNode();return c=c||"more",g+=" mce-wp-"+c,f="more"===c?"Read more...":"Next page",f=i(f),e='',"BODY"===j.nodeName||"P"===j.nodeName&&"BODY"===j.parentNode.nodeName?void b.insertContent(e):(d=h.getParent(j,function(a){return a.parentNode&&"BODY"===a.parentNode.nodeName?!0:!1},b.getBody()),void(d&&("P"===d.nodeName?d.appendChild(h.create("p",null,e).firstChild):h.insertAfter(h.create("p",null,e),d),b.nodeChanged())))}),b.addCommand("WP_Code",function(){b.formatter.toggle("code")}),b.addCommand("WP_Page",function(){b.execCommand("WP_More","nextpage")}),b.addCommand("WP_Help",function(){function c(a){var b="";return h(a,function(a,c){b+=a?""+c+""+i(a)+"":""}),b+""}var d,e,f=i(a.Env.mac?"Ctrl + Alt + letter:":"Shift + Alt + letter:"),g=i(a.Env.mac?"Cmd + letter:":"Ctrl + letter:"),j=[],k=[];h([{c:"Copy",x:"Cut"},{v:"Paste",a:"Select all"},{z:"Undo",y:"Redo"},{b:"Bold",i:"Italic"},{u:"Underline",k:"Insert/edit link"}],function(a){j.push(c(a))}),h([{1:"Heading 1",2:"Heading 2"},{3:"Heading 3",4:"Heading 4"},{5:"Heading 5",6:"Heading 6"},{l:"Align left",c:"Align center"},{r:"Align right",j:"Justify"},{d:"Strikethrough",q:"Blockquote"},{u:"Bullet list",o:"Numbered list"},{a:"Insert/edit link",s:"Remove link"},{m:"Insert/edit image",t:"Insert Read More tag"},{h:"Keyboard Shortcuts",x:"Code"},{p:"Insert Page Break tag",w:"Distraction-free writing mode"}],function(a){k.push(c(a))}),d=[i("Letter"),i("Action"),i("Letter"),i("Action")],d=''+d.join("")+"",e='

',e=e+"

"+i("Default shortcuts,")+" "+g+'

'+d+j.join("")+"

"+i("Additional shortcuts,")+" "+f+'

'+d+k.join("")+"
",b.plugins.wptextpattern&&(e=e+"

"+i("When starting a new paragraph with one of these patterns followed by a space, the formatting will be applied automatically. Press Backspace or Escape to undo.")+"

"+c({"* or -":"Bullet list"})+c({"1. or 1)":"Numbered list"})+c({">":"Blockquote"})+c({"##":"Heading 2"})+c({"###":"Heading 3"})+c({"####":"Heading 4"})+c({"#####":"Heading 5"})+c({"######":"Heading 6"})+"
"),e=e+"

"+i("Focus shortcuts:")+"

"+c({"Alt + F8":"Inline toolbar (when an image, link or preview is selected)"})+c({"Alt + F9":"Editor menu (when enabled)"})+c({"Alt + F10":"Editor toolbar"})+c({"Alt + F11":"Elements path"})+"

"+i("To move focus to other buttons use Tab or the arrow keys. To return focus to the editor press Escape or use one of the buttons.")+"

",e+="
",b.windowManager.open({title:"Keyboard Shortcuts",items:{type:"container",classes:"wp-help",html:e},buttons:{text:"Close",onclick:"close"}})}),b.addCommand("WP_Medialib",function(){k&&k.media&&k.media.editor&&k.media.editor.open(b.id)}),b.addButton("wp_more",{tooltip:"Insert Read More tag",onclick:function(){b.execCommand("WP_More","more")}}),b.addButton("wp_page",{tooltip:"Page break",onclick:function(){b.execCommand("WP_More","nextpage")}}),b.addButton("wp_help",{tooltip:"Keyboard Shortcuts",cmd:"WP_Help"}),b.addButton("wp_code",{tooltip:"Code",cmd:"WP_Code",stateSelector:"code"}),k&&k.media&&k.media.editor&&b.addMenuItem("add_media",{text:"Add Media",icon:"wp-media-library",context:"insert",cmd:"WP_Medialib"}),b.addMenuItem("wp_more",{text:"Insert Read More tag",icon:"wp_more",context:"insert",onclick:function(){b.execCommand("WP_More","more")}}),b.addMenuItem("wp_page",{text:"Page break",icon:"wp_page",context:"insert",onclick:function(){b.execCommand("WP_More","nextpage")}}),b.on("BeforeExecCommand",function(c){!a.Env.webkit||"InsertUnorderedList"!==c.command&&"InsertOrderedList"!==c.command||(f||(f=b.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;}")),b.getDoc().head.appendChild(f))}),b.on("ExecCommand",function(c){a.Env.webkit&&f&&("InsertUnorderedList"===c.command||"InsertOrderedList"===c.command)&&b.dom.remove(f)}),b.on("init",function(){var c=a.Env,d=["mceContentBody"],e=b.getDoc(),f=b.dom;c.iOS&&f.addClass(e.documentElement,"ios"),"rtl"===b.getParam("directionality")&&(d.push("rtl"),f.setAttrib(e.documentElement,"dir","rtl")),c.ie?9===parseInt(c.ie,10)?d.push("ie9"):8===parseInt(c.ie,10)?d.push("ie8"):c.ie<8&&d.push("ie7"):c.webkit&&d.push("webkit"),d.push("wp-editor"),h(d,function(a){a&&f.addClass(e.body,a)}),b.on("BeforeSetContent",function(a){a.content&&(a.content=a.content.replace(/

\s*<(p|div|ul|ol|dl|table|blockquote|h[1-6]|fieldset|pre)( [^>]*)?>/gi,"<$1$2>").replace(/<\/(p|div|ul|ol|dl|table|blockquote|h[1-6]|fieldset|pre)>\s*<\/p>/gi,""))}),j&&j(document).triggerHandler("tinymce-editor-init",[b]),window.tinyMCEPreInit&&window.tinyMCEPreInit.dragDropUpload&&f.bind(e,"dragstart dragend dragover drop",function(a){j&&j(document).trigger(new j.Event(a))}),b.getParam("wp_paste_filters",!0)&&(a.Env.webkit||b.on("PastePreProcess",function(a){a.content=a.content.replace(/(<[^>]+) style="[^"]*"([^>]*>)/gi,"$1$2"),a.content=a.content.replace(/(<[^>]+) data-mce-style=([^>]+>)/gi,"$1 style=$2")}),b.on("PastePostProcess",function(a){h(f.select("p",a.node),function(a){f.isEmpty(a)&&f.remove(a)})}))}),b.on("SaveContent",function(a){return!b.inline&&b.isHidden()?void(a.content=a.element.value):(a.content=a.content.replace(/

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

 

"),void(l&&(a.content=k.editor.removep(a.content))))}),b.on("preInit",function(){b.schema.addValidElements("@[id|accesskey|class|dir|lang|style|tabindex|title|contenteditable|draggable|dropzone|hidden|spellcheck|translate],i,b"),a.Env.iOS&&(b.settings.height=300),a.$("#wp-"+b.id+"-wrap").hasClass("html-active")&&b.hide(),h({c:"JustifyCenter",r:"JustifyRight",l:"JustifyLeft",j:"JustifyFull",q:"mceBlockQuote",u:"InsertUnorderedList",o:"InsertOrderedList",s:"unlink",m:"WP_Medialib",z:"WP_Adv",t:"WP_More",d:"Strikethrough",h:"WP_Help",p:"WP_Page",x:"WP_Code"},function(a,c){b.shortcuts.add("access+"+c,"",a)}),b.addShortcut("meta+s","",function(){k&&k.autosave&&k.autosave.server.triggerSave()})}),b.on("preinit",function(){function c(a,c){function d(){if(!f)return this;var a,b,c=window.pageXOffset||document.documentElement.scrollLeft,d=window.pageYOffset||document.documentElement.scrollTop,e=window.innerWidth,h=window.innerHeight,i=n.getBoundingClientRect(),k=this.getEl(),l=k.offsetWidth,q=k.offsetHeight,r=f.getBoundingClientRect(),s=(r.left+r.right)/2,t=5,u=8,v=q+u+t,w=m?m.getBoundingClientRect().bottom:0,x=o?o.getBoundingClientRect().bottom:0,y=p?h-p.getBoundingClientRect().top:0,z=j?h-j.getBoundingClientRect().top:0,A=Math.max(0,w,x,i.top),B=Math.max(0,y,z,h-i.bottom),C=r.top+i.top-A,D=h-i.top-r.bottom-B,E=h-A-B,F="";return C>=E||D>=E?this.hide():(this.bottom?D>=v?(F=" mce-arrow-up",a=r.bottom+i.top+d):C>=v&&(F=" mce-arrow-down",a=r.top+i.top+d-q-u):C>=v?(F=" mce-arrow-down",a=r.top+i.top+d-q-u):D>=v&&E/2>r.bottom+i.top-A&&(F=" mce-arrow-up",a=r.bottom+i.top+d),"undefined"==typeof a&&(a=d+A+t),b=s-l/2+i.left+c,r.left<0||r.right>i.width?b=i.left+c+(i.width-l)/2:l>=e?(F+=" mce-arrow-full",b=0):0>b&&r.left+l>e||b+l>e&&r.right-l<0?b=(e-l)/2:bi.width+i.left+c&&(F+=" mce-arrow-right",b=r.right-l+i.left+c),k.className=k.className.replace(/ ?mce-arrow-[\w]+/g,"")+F,g.setStyles(k,{left:b,top:a}),this)}var e,i,q=[];return h(a,function(a){function c(){var c=b.selection;"bullist"===d&&c.selectorChanged("ul > li",function(b,c){for(var d,e=c.parents.length;e--&&(d=c.parents[e].nodeName,"OL"!==d&&"UL"!=d););a.active(b&&"UL"===d)}),"numlist"===d&&c.selectorChanged("ol > li",function(b,c){for(var d,e=c.parents.length;e--&&(d=c.parents[e].nodeName,"OL"!==d&&"UL"!==d););a.active(b&&"OL"===d)}),a.settings.stateSelector&&c.selectorChanged(a.settings.stateSelector,function(b){a.active(b)},!0),a.settings.disabledStateSelector&&c.selectorChanged(a.settings.disabledStateSelector,function(b){a.disabled(b)})}var d;"|"===a?i=null:k.has(a)?(a={type:a},l.toolbar_items_size&&(a.size=l.toolbar_items_size),q.push(a),i=null):(i||(i={type:"buttongroup",items:[]},q.push(i)),b.buttons[a]&&(d=a,a=b.buttons[d],"function"==typeof a&&(a=a()),a.type=a.type||"button",l.toolbar_items_size&&(a.size=l.toolbar_items_size),a=k.create(a),i.items.push(a),b.initialized?c():b.on("init",c)))}),e=k.create({type:"panel",layout:"stack",classes:"toolbar-grp inline-toolbar-grp",ariaRoot:!0,ariaRemember:!0,items:[{type:"toolbar",layout:"flow",items:q}]}),e.bottom=c,e.on("show",function(){this.reposition()}),e.on("keydown",function(a){27===a.keyCode&&(this.hide(),b.focus())}),e.reposition=d,e.hide().renderTo(document.body),e}function d(a){e&&(e.hide(),"hide"===a.type?e=!1:("resize"===a.type||"scroll"===a.type)&&(clearTimeout(i),i=setTimeout(function(){e&&e.show&&e.show()},250)))}var e,f,i,j,k=a.ui.Factory,l=b.settings,m=document.getElementById("wpadminbar"),n=document.getElementById(b.id+"_ifr"),o=a.$(".mce-toolbar-grp",b.getContainer())[0],p=a.$(".mce-statusbar",b.getContainer())[0];"content"===b.id&&(j=document.getElementById("post-status-info")),b.shortcuts.add("alt+119","",function(){var a;e&&(a=e.find("toolbar")[0],a&&a.focus(!0))}),b.on("nodechange",function(a){var c=b.selection.isCollapsed(),d={element:a.element,parents:a.parents,collapsed:c};b.fire("wptoolbar",d),f=d.selection||d.element,e&&e.hide(),d.toolbar?(e=d.toolbar,e.show()):e=!1}),b.on("focus",function(){e&&e.show()}),g.bind(window,"resize scroll",d),b.dom.bind(b.getWin(),"resize scroll",d),b.on("blur hide",d),b.wp=b.wp||{},b.wp._createToolbar=c},!0),{_showButtons:d,_hideButtons:d,_setEmbed:d,_getEmbed:d}})}(window.tinymce); \ No newline at end of file +!function(a){a.ui.FloatPanel.zIndex=100100,a.PluginManager.add("wordpress",function(b){function c(c){var d,f,i,j=0;f="hide"===c,b.theme.panel&&(i=b.theme.panel.find(".toolbar:not(.menubar)")),!i||i.length<2||"hide"===c&&!i[1].visible()||(!c&&i[1].visible()&&(c="hide"),h(i,function(a,b){b>0&&("hide"===c?(a.hide(),j+=30):(a.show(),j-=30))}),j&&!f&&(a.Env.iOS||(d=b.getContentAreaContainer().firstChild,g.setStyle(d,"height",d.clientHeight+j)),"hide"===c?(setUserSetting("hidetb","0"),e&&e.active(!1)):(setUserSetting("hidetb","1"),e&&e.active(!0))),b.fire("wp-toolbar-toggle"))}function d(){}var e,f,g=a.DOM,h=a.each,i=b.editorManager.i18n.translate,j=window.jQuery,k=window.wp,l=k&&k.editor&&k.editor.autop&&b.getParam("wpautop",!0);return j&&j(document).triggerHandler("tinymce-editor-setup",[b]),b.addButton("wp_adv",{tooltip:"Toolbar Toggle",cmd:"WP_Adv",onPostRender:function(){e=this,e.active("1"===getUserSetting("hidetb")?!0:!1)}}),b.on("PostRender",function(){b.getParam("wordpress_adv_hidden",!0)&&"0"===getUserSetting("hidetb","0")&&c("hide")}),b.addCommand("WP_Adv",function(){c()}),b.on("focus",function(){window.wpActiveEditor=b.id}),b.on("BeforeSetContent",function(b){var c,d=a.Env.webkit?"


":"

";b.content&&(-1!==b.content.indexOf("/g,function(b,d){return''})),-1!==b.content.indexOf("")&&(c=i("Page break"),b.content=b.content.replace(//g,'')),b.content=b.content.replace(/

(?: |\u00a0|\uFEFF|\s)+<\/p>/gi,d),b.load&&"raw"!==b.format&&l&&(b.content=k.editor.autop(b.content)))}),b.on("PostProcess",function(a){a.get&&(a.content=a.content.replace(/]+>/g,function(a){var b,c="";return-1!==a.indexOf('data-wp-more="more"')?((b=a.match(/data-wp-more-text="([^"]+)"/))&&(c=b[1]),a=""):-1!==a.indexOf('data-wp-more="nextpage"')&&(a=""),a}))}),b.on("ResolveName",function(a){var c;"IMG"===a.target.nodeName&&(c=b.dom.getAttrib(a.target,"data-wp-more"))&&(a.name=c)}),b.addCommand("WP_More",function(c){var d,e,f,g="wp-more-tag",h=b.dom,j=b.selection.getNode();return c=c||"more",g+=" mce-wp-"+c,f="more"===c?"Read more...":"Next page",f=i(f),e='',"BODY"===j.nodeName||"P"===j.nodeName&&"BODY"===j.parentNode.nodeName?void b.insertContent(e):(d=h.getParent(j,function(a){return a.parentNode&&"BODY"===a.parentNode.nodeName?!0:!1},b.getBody()),void(d&&("P"===d.nodeName?d.appendChild(h.create("p",null,e).firstChild):h.insertAfter(h.create("p",null,e),d),b.nodeChanged())))}),b.addCommand("WP_Code",function(){b.formatter.toggle("code")}),b.addCommand("WP_Page",function(){b.execCommand("WP_More","nextpage")}),b.addCommand("WP_Help",function(){function c(a){var b="";return h(a,function(a,c){b+=a?""+c+""+i(a)+"":""}),b+""}var d,e,f=i(a.Env.mac?"Ctrl + Alt + letter:":"Shift + Alt + letter:"),g=i(a.Env.mac?"Cmd + letter:":"Ctrl + letter:"),j=[],k=[];h([{c:"Copy",x:"Cut"},{v:"Paste",a:"Select all"},{z:"Undo",y:"Redo"},{b:"Bold",i:"Italic"},{u:"Underline",k:"Insert/edit link"}],function(a){j.push(c(a))}),h([{1:"Heading 1",2:"Heading 2"},{3:"Heading 3",4:"Heading 4"},{5:"Heading 5",6:"Heading 6"},{l:"Align left",c:"Align center"},{r:"Align right",j:"Justify"},{d:"Strikethrough",q:"Blockquote"},{u:"Bullet list",o:"Numbered list"},{a:"Insert/edit link",s:"Remove link"},{m:"Insert/edit image",t:"Insert Read More tag"},{h:"Keyboard Shortcuts",x:"Code"},{p:"Insert Page Break tag",w:"Distraction-free writing mode"}],function(a){k.push(c(a))}),d=[i("Letter"),i("Action"),i("Letter"),i("Action")],d=''+d.join("")+"",e='

',e=e+"

"+i("Default shortcuts,")+" "+g+'

'+d+j.join("")+"

"+i("Additional shortcuts,")+" "+f+'

'+d+k.join("")+"
",b.plugins.wptextpattern&&(e=e+"

"+i("When starting a new paragraph with one of these patterns followed by a space, the formatting will be applied automatically. Press Backspace or Escape to undo.")+"

"+c({"* or -":"Bullet list"})+c({"1. or 1)":"Numbered list"})+c({">":"Blockquote"})+c({"##":"Heading 2"})+c({"###":"Heading 3"})+c({"####":"Heading 4"})+c({"#####":"Heading 5"})+c({"######":"Heading 6"})+"
"),e=e+"

"+i("Focus shortcuts:")+"

"+c({"Alt + F8":"Inline toolbar (when an image, link or preview is selected)"})+c({"Alt + F9":"Editor menu (when enabled)"})+c({"Alt + F10":"Editor toolbar"})+c({"Alt + F11":"Elements path"})+"

"+i("To move focus to other buttons use Tab or the arrow keys. To return focus to the editor press Escape or use one of the buttons.")+"

",e+="
",b.windowManager.open({title:"Keyboard Shortcuts",items:{type:"container",classes:"wp-help",html:e},buttons:{text:"Close",onclick:"close"}})}),b.addCommand("WP_Medialib",function(){k&&k.media&&k.media.editor&&k.media.editor.open(b.id)}),b.addButton("wp_more",{tooltip:"Insert Read More tag",onclick:function(){b.execCommand("WP_More","more")}}),b.addButton("wp_page",{tooltip:"Page break",onclick:function(){b.execCommand("WP_More","nextpage")}}),b.addButton("wp_help",{tooltip:"Keyboard Shortcuts",cmd:"WP_Help"}),b.addButton("wp_code",{tooltip:"Code",cmd:"WP_Code",stateSelector:"code"}),k&&k.media&&k.media.editor&&b.addMenuItem("add_media",{text:"Add Media",icon:"wp-media-library",context:"insert",cmd:"WP_Medialib"}),b.addMenuItem("wp_more",{text:"Insert Read More tag",icon:"wp_more",context:"insert",onclick:function(){b.execCommand("WP_More","more")}}),b.addMenuItem("wp_page",{text:"Page break",icon:"wp_page",context:"insert",onclick:function(){b.execCommand("WP_More","nextpage")}}),b.on("BeforeExecCommand",function(c){!a.Env.webkit||"InsertUnorderedList"!==c.command&&"InsertOrderedList"!==c.command||(f||(f=b.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;}")),b.getDoc().head.appendChild(f))}),b.on("ExecCommand",function(c){a.Env.webkit&&f&&("InsertUnorderedList"===c.command||"InsertOrderedList"===c.command)&&b.dom.remove(f)}),b.on("init",function(){var c=a.Env,d=["mceContentBody"],e=b.getDoc(),f=b.dom;c.iOS&&f.addClass(e.documentElement,"ios"),"rtl"===b.getParam("directionality")&&(d.push("rtl"),f.setAttrib(e.documentElement,"dir","rtl")),c.ie?9===parseInt(c.ie,10)?d.push("ie9"):8===parseInt(c.ie,10)?d.push("ie8"):c.ie<8&&d.push("ie7"):c.webkit&&d.push("webkit"),d.push("wp-editor"),h(d,function(a){a&&f.addClass(e.body,a)}),b.on("BeforeSetContent",function(a){a.content&&(a.content=a.content.replace(/

\s*<(p|div|ul|ol|dl|table|blockquote|h[1-6]|fieldset|pre)( [^>]*)?>/gi,"<$1$2>").replace(/<\/(p|div|ul|ol|dl|table|blockquote|h[1-6]|fieldset|pre)>\s*<\/p>/gi,""))}),j&&j(document).triggerHandler("tinymce-editor-init",[b]),window.tinyMCEPreInit&&window.tinyMCEPreInit.dragDropUpload&&f.bind(e,"dragstart dragend dragover drop",function(a){j&&j(document).trigger(new j.Event(a))}),b.getParam("wp_paste_filters",!0)&&(a.Env.webkit||b.on("PastePreProcess",function(a){a.content=a.content.replace(/(<[^>]+) style="[^"]*"([^>]*>)/gi,"$1$2"),a.content=a.content.replace(/(<[^>]+) data-mce-style=([^>]+>)/gi,"$1 style=$2")}),b.on("PastePostProcess",function(a){h(f.select("p",a.node),function(a){f.isEmpty(a)&&f.remove(a)})}))}),b.on("SaveContent",function(a){return!b.inline&&b.isHidden()?void(a.content=a.element.value):(a.content=a.content.replace(/

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

 

"),void(l&&(a.content=k.editor.removep(a.content))))}),b.on("preInit",function(){b.schema.addValidElements("@[id|accesskey|class|dir|lang|style|tabindex|title|contenteditable|draggable|dropzone|hidden|spellcheck|translate],i,b"),a.Env.iOS&&(b.settings.height=300),a.$("#wp-"+b.id+"-wrap").hasClass("html-active")&&b.hide(),h({c:"JustifyCenter",r:"JustifyRight",l:"JustifyLeft",j:"JustifyFull",q:"mceBlockQuote",u:"InsertUnorderedList",o:"InsertOrderedList",s:"unlink",m:"WP_Medialib",z:"WP_Adv",t:"WP_More",d:"Strikethrough",h:"WP_Help",p:"WP_Page",x:"WP_Code"},function(a,c){b.shortcuts.add("access+"+c,"",a)}),b.addShortcut("meta+s","",function(){k&&k.autosave&&k.autosave.server.triggerSave()})}),b.on("preinit",function(){function c(a,c){function d(){if(!f)return this;var a,b,c=window.pageXOffset||document.documentElement.scrollLeft,d=window.pageYOffset||document.documentElement.scrollTop,e=window.innerWidth,h=window.innerHeight,i=n.getBoundingClientRect(),k=this.getEl(),l=k.offsetWidth,q=k.offsetHeight,r=f.getBoundingClientRect(),s=(r.left+r.right)/2,t=5,u=8,v=q+u+t,w=m?m.getBoundingClientRect().bottom:0,x=o?o.getBoundingClientRect().bottom:0,y=p?h-p.getBoundingClientRect().top:0,z=j?h-j.getBoundingClientRect().top:0,A=Math.max(0,w,x,i.top),B=Math.max(0,y,z,h-i.bottom),C=r.top+i.top-A,D=h-i.top-r.bottom-B,E=h-A-B,F="";return C>=E||D>=E?this.hide():(this.bottom?D>=v?(F=" mce-arrow-up",a=r.bottom+i.top+d):C>=v&&(F=" mce-arrow-down",a=r.top+i.top+d-q-u):C>=v?(F=" mce-arrow-down",a=r.top+i.top+d-q-u):D>=v&&E/2>r.bottom+i.top-A&&(F=" mce-arrow-up",a=r.bottom+i.top+d),"undefined"==typeof a&&(a=d+A+t),b=s-l/2+i.left+c,r.left<0||r.right>i.width?b=i.left+c+(i.width-l)/2:l>=e?(F+=" mce-arrow-full",b=0):0>b&&r.left+l>e||b+l>e&&r.right-l<0?b=(e-l)/2:bi.width+i.left+c&&(F+=" mce-arrow-right",b=r.right-l+i.left+c),k.className=k.className.replace(/ ?mce-arrow-[\w]+/g,"")+F,g.setStyles(k,{left:b,top:a}),this)}var e,i,q=[];return h(a,function(a){function c(){var c=b.selection;"bullist"===d&&c.selectorChanged("ul > li",function(b,c){for(var d,e=c.parents.length;e--&&(d=c.parents[e].nodeName,"OL"!==d&&"UL"!=d););a.active(b&&"UL"===d)}),"numlist"===d&&c.selectorChanged("ol > li",function(b,c){for(var d,e=c.parents.length;e--&&(d=c.parents[e].nodeName,"OL"!==d&&"UL"!==d););a.active(b&&"OL"===d)}),a.settings.stateSelector&&c.selectorChanged(a.settings.stateSelector,function(b){a.active(b)},!0),a.settings.disabledStateSelector&&c.selectorChanged(a.settings.disabledStateSelector,function(b){a.disabled(b)})}var d;"|"===a?i=null:k.has(a)?(a={type:a},l.toolbar_items_size&&(a.size=l.toolbar_items_size),q.push(a),i=null):(i||(i={type:"buttongroup",items:[]},q.push(i)),b.buttons[a]&&(d=a,a=b.buttons[d],"function"==typeof a&&(a=a()),a.type=a.type||"button",l.toolbar_items_size&&(a.size=l.toolbar_items_size),a=k.create(a),i.items.push(a),b.initialized?c():b.on("init",c)))}),e=k.create({type:"panel",layout:"stack",classes:"toolbar-grp inline-toolbar-grp",ariaRoot:!0,ariaRemember:!0,items:[{type:"toolbar",layout:"flow",items:q}]}),e.bottom=c,e.on("show",function(){this.reposition()}),e.on("keydown",function(a){27===a.keyCode&&(this.hide(),b.focus())}),e.reposition=d,e.hide().renderTo(document.body),e}function d(a){e&&(e.hide(),"hide"===a.type?e=!1:("resize"===a.type||"scroll"===a.type)&&(clearTimeout(i),i=setTimeout(function(){e&&"function"==typeof e.show&&e.show()},250)))}var e,f,i,j,k=a.ui.Factory,l=b.settings,m=document.getElementById("wpadminbar"),n=document.getElementById(b.id+"_ifr"),o=a.$(".mce-toolbar-grp",b.getContainer())[0],p=a.$(".mce-statusbar",b.getContainer())[0];"content"===b.id&&(j=document.getElementById("post-status-info")),b.shortcuts.add("alt+119","",function(){var a;e&&(a=e.find("toolbar")[0],a&&a.focus(!0))}),b.on("nodechange",function(a){var c=b.selection.isCollapsed(),d={element:a.element,parents:a.parents,collapsed:c};b.fire("wptoolbar",d),f=d.selection||d.element,e&&e.hide(),d.toolbar?(e=d.toolbar,e.show()):e=!1}),b.on("focus",function(){e&&e.show()}),g.bind(window,"resize scroll",d),b.dom.bind(b.getWin(),"resize scroll",d),b.on("blur hide",d),b.wp=b.wp||{},b.wp._createToolbar=c},!0),{_showButtons:d,_hideButtons:d,_setEmbed:d,_getEmbed:d}})}(window.tinymce); \ No newline at end of file diff --git a/wp-includes/js/tinymce/plugins/wpeditimage/plugin.js b/wp-includes/js/tinymce/plugins/wpeditimage/plugin.js index 856f429f41..662a92a1ed 100644 --- a/wp-includes/js/tinymce/plugins/wpeditimage/plugin.js +++ b/wp-includes/js/tinymce/plugins/wpeditimage/plugin.js @@ -525,12 +525,10 @@ tinymce.PluginManager.add( 'wpeditimage', function( editor ) { } function removeImage( node ) { - var wrap; + var wrap = editor.dom.getParent( node, 'div.mceTemp' ); - if ( node.nodeName === 'DIV' && editor.dom.hasClass( node, 'mceTemp' ) ) { - wrap = node; - } else if ( node.nodeName === 'IMG' || node.nodeName === 'DT' || node.nodeName === 'A' ) { - wrap = editor.dom.getParent( node, 'div.mceTemp' ); + if ( ! wrap && node.nodeName === 'IMG' ) { + wrap = editor.dom.getParent( node, 'a' ); } if ( wrap ) { diff --git a/wp-includes/js/tinymce/plugins/wpeditimage/plugin.min.js b/wp-includes/js/tinymce/plugins/wpeditimage/plugin.min.js index 8031e649ee..5ffd43b7c1 100644 --- a/wp-includes/js/tinymce/plugins/wpeditimage/plugin.min.js +++ b/wp-includes/js/tinymce/plugins/wpeditimage/plugin.min.js @@ -1 +1 @@ -tinymce.PluginManager.add("wpeditimage",function(a){function b(b){return!(!a.dom.getAttrib(b,"data-mce-placeholder")&&!a.dom.getAttrib(b,"data-mce-object"))}function c(b){return b.replace(/(?:

)?\[(?:wp_)?caption([^\]]+)\]([\s\S]+?)\[\/(?:wp_)?caption\](?:<\/p>)?/g,function(b,c,d){var e,f,g,h,i,j;return e=c.match(/id=['"]([^'"]*)['"] ?/),e&&(c=c.replace(e[0],"")),f=c.match(/align=['"]([^'"]*)['"] ?/),f&&(c=c.replace(f[0],"")),g=c.match(/class=['"]([^'"]*)['"] ?/),g&&(c=c.replace(g[0],"")),j=c.match(/width=['"]([0-9]*)['"] ?/),j&&(c=c.replace(j[0],"")),d=n(d),i=d.match(/((?:]+>)?]+>(?:<\/a>)?)([\s\S]*)/i),i&&i[2]?(h=n(i[2]),i=n(i[1])):(h=n(c).replace(/caption=['"]/,"").replace(/['"]$/,""),i=d),e=e&&e[1]?e[1].replace(/[<>&]+/g,""):"",f=f&&f[1]?f[1]:"alignnone",g=g&&g[1]?" "+g[1].replace(/[<>&]+/g,""):"",!j&&i&&(j=i.match(/width=['"]([0-9]*)['"]/)),j&&j[1]&&(j=j[1]),j&&h?(j=parseInt(j,10),a.getParam("wpeditimage_html5_captions")||(j+=10),'

'+i+'
'+h+"
"):d})}function d(a){return a.replace(/
]*>([\s\S]+?)<\/div>/g,function(a,b){var c="";return-1===b.indexOf("]+>([\s\S]+?)<\/dd>/i),c&&c[1]?"

"+c[1]+"

":""):(c=b.replace(/\s*
]+)>\s*
]+>([\s\S]+?)<\/dt>\s*
]+>([\s\S]*?)<\/dd>\s*<\/dl>\s*/gi,function(a,b,c,d){var e,f,g,h;return h=c.match(/width="([0-9]*)"/),h=h&&h[1]?h[1]:"",f=b.match(/class="([^"]*)"/),f=f&&f[1]?f[1]:"",g=f.match(/align[a-z]+/i)||"alignnone",h&&d?(e=b.match(/id="([^"]*)"/),e=e&&e[1]?e[1]:"",f=f.replace(/wp-caption ?|align[a-z]+ ?/gi,""),f&&(f=' class="'+f+'"'),d=d.replace(/\r\n|\r/g,"\n").replace(/<[a-zA-Z0-9]+( [^<>]+)?>/g,function(a){return a.replace(/[\r\n\t]+/," ")}),d=d.replace(/\s*\n\s*/g,"
"),'[caption id="'+e+'" align="'+g+'" width="'+h+'"'+f+"]"+c+" "+d+"[/caption]"):("alignnone"!==g[0]&&(c=c.replace(/>]+>)?]+>(?:<\/a>)?)(

[\s\S]*<\/p>)?[\s\S]*/gi,"

$1

$2")),c)})}function e(b){var c,d,e,f,g,h,i,j,k=[],l=a.dom,m=/^\d+$/;return e={attachment_id:!1,size:"custom",caption:"",align:"none",extraClasses:"",link:!1,linkUrl:"",linkClassName:"",linkTargetBlank:!1,linkRel:"",title:""},e.url=l.getAttrib(b,"src"),e.alt=l.getAttrib(b,"alt"),e.title=l.getAttrib(b,"title"),i=l.getAttrib(b,"width"),j=l.getAttrib(b,"height"),(!m.test(i)||parseInt(i,10)<1)&&(i=b.naturalWidth||b.width),(!m.test(j)||parseInt(j,10)<1)&&(j=b.naturalHeight||b.height),e.customWidth=e.width=i,e.customHeight=e.height=j,c=tinymce.explode(b.className," "),d=[],tinymce.each(c,function(a){/^wp-image/.test(a)?e.attachment_id=parseInt(a.replace("wp-image-",""),10):/^align/.test(a)?e.align=a.replace("align",""):/^size/.test(a)?e.size=a.replace("size-",""):d.push(a)}),e.extraClasses=d.join(" "),f=l.getParents(b,".wp-caption"),f.length&&(f=f[0],c=f.className.split(" "),tinymce.each(c,function(a){/^align/.test(a)?e.align=a.replace("align",""):a&&"wp-caption"!==a&&k.push(a)}),e.captionClassName=k.join(" "),g=l.select("dd.wp-caption-dd",f),g.length&&(g=g[0],e.caption=a.serializer.serialize(g).replace(/]*>/g,"$&\n").replace(/^

/,"").replace(/<\/p>$/,""))),b.parentNode&&"A"===b.parentNode.nodeName&&(h=b.parentNode,e.linkUrl=l.getAttrib(h,"href"),e.linkTargetBlank="_blank"===l.getAttrib(h,"target")?!0:!1,e.linkRel=l.getAttrib(h,"rel"),e.linkClassName=h.className),e}function f(a){return a&&!(!a.textContent&&!a.innerText)}function g(b){return!b||-1===b.indexOf("<")&&-1===b.indexOf(">")?b:(l||(l=new tinymce.html.Serializer({},a.schema)),l.serialize(a.parser.parse(b,{forced_root_block:!1})))}function h(b,c){var d,e,h,i,j,k,l,m,n,o,p,q,r,s,t,u,v=a.dom;d=tinymce.explode(c.extraClasses," "),d||(d=[]),c.caption||d.push("align"+c.align),c.attachment_id&&(d.push("wp-image-"+c.attachment_id),c.size&&"custom"!==c.size&&d.push("size-"+c.size)),s=c.width,t=c.height,"custom"===c.size&&(s=c.customWidth,t=c.customHeight),q={src:c.url,width:s||null,height:t||null,alt:c.alt,title:c.title||null,"class":d.join(" ")||null},v.setAttribs(b,q),r={href:c.linkUrl,rel:c.linkRel||null,target:c.linkTargetBlank?"_blank":null,"class":c.linkClassName||null},b.parentNode&&"A"===b.parentNode.nodeName&&!f(b.parentNode)?c.linkUrl?v.setAttribs(b.parentNode,r):v.remove(b.parentNode,!0):c.linkUrl&&((l=v.getParent(b,"a"))&&v.insertAfter(b,l),l=v.create("a",r),b.parentNode.insertBefore(l,b),l.appendChild(b)),m=a.dom.getParent(b,".mceTemp"),h=b.parentNode&&"A"===b.parentNode.nodeName&&!f(b.parentNode)?b.parentNode:b,c.caption?(c.caption=g(c.caption),p=c.attachment_id?"attachment_"+c.attachment_id:null,u="align"+(c.align||"none"),e="wp-caption "+u,c.captionClassName&&(e+=" "+c.captionClassName.replace(/[<>&]+/g,"")),a.getParam("wpeditimage_html5_captions")||(s=parseInt(s,10),s+=10),m?(o=v.select("dl.wp-caption",m),o.length&&v.setAttribs(o,{id:p,"class":e,style:"width: "+s+"px"}),n=v.select(".wp-caption-dd",m),n.length&&v.setHTML(n[0],c.caption)):(p=p?'id="'+p+'" ':"",i="

'+c.caption+"
",k=v.create("div",{"class":"mceTemp"},i),(j=v.getParent(h,"p"))?j.parentNode.insertBefore(k,j):h.parentNode.insertBefore(k,h),a.$(k).find("dt.wp-caption-dt").append(h),j&&v.isEmpty(j)&&v.remove(j))):m&&(j=v.create("p"),m.parentNode.insertBefore(j,m),j.appendChild(h),v.remove(m)),wp.media.events&&wp.media.events.trigger("editor:image-update",{editor:a,metadata:c,image:b}),a.nodeChanged()}function i(b){var c,d,f;return"undefined"!=typeof wp&&wp.media?(f=e(b),wp.media.events.trigger("editor:image-edit",{editor:a,metadata:f,image:b}),c=wp.media({frame:"image",state:"image-details",metadata:f}),wp.media.events.trigger("editor:frame-create",{frame:c}),d=function(d){a.focus(),a.undoManager.transact(function(){h(b,d)}),c.detach()},c.state("image-details").on("update",d),c.state("replace-image").on("replace",d),c.on("close",function(){a.focus(),c.detach()}),void c.open()):void a.execCommand("mceImage")}function j(b){var c;"DIV"===b.nodeName&&a.dom.hasClass(b,"mceTemp")?c=b:("IMG"===b.nodeName||"DT"===b.nodeName||"A"===b.nodeName)&&(c=a.dom.getParent(b,"div.mceTemp")),c?(c.nextSibling?a.selection.select(c.nextSibling):c.previousSibling?a.selection.select(c.previousSibling):a.selection.select(c.parentNode),a.selection.collapse(!0),a.dom.remove(c)):a.dom.remove(b),a.nodeChanged(),a.undoManager.add()}var k,l,m=tinymce.each,n=tinymce.trim,o=tinymce.Env.iOS;return a.addButton("wp_img_remove",{tooltip:"Remove",icon:"dashicon dashicons-no",onclick:function(){j(a.selection.getNode())}}),a.addButton("wp_img_edit",{tooltip:"Edit ",icon:"dashicon dashicons-edit",onclick:function(){i(a.selection.getNode())}}),m({alignleft:"Align left",aligncenter:"Align center",alignright:"Align right",alignnone:"No alignment"},function(b,c){var d=c.slice(5);a.addButton("wp_img_"+c,{tooltip:b,icon:"dashicon dashicons-align-"+d,cmd:"alignnone"===c?"wpAlignNone":"Justify"+d.slice(0,1).toUpperCase()+d.slice(1),onPostRender:function(){var b=this;a.on("NodeChange",function(d){var e;"IMG"===d.element.nodeName&&(e=a.dom.getParent(d.element,".wp-caption")||d.element,"alignnone"===c?b.active(!/\balign(left|center|right)\b/.test(e.className)):b.active(a.dom.hasClass(e,c)))})}})}),a.once("preinit",function(){k=a.wp._createToolbar(["wp_img_alignleft","wp_img_aligncenter","wp_img_alignright","wp_img_alignnone","wp_img_edit","wp_img_remove"])}),a.on("wptoolbar",function(a){"IMG"!==a.element.nodeName||b(a.element)||(a.toolbar=k)}),o&&a.on("click",function(b){if("IMG"===b.target.nodeName){var c=b.target;window.setTimeout(function(){a.selection.select(c),a.nodeChanged()},200)}else k.hide()}),a.on("init",function(){var b=a.dom,c=a.getParam("wpeditimage_html5_captions")?"html5-captions":"html4-captions";b.addClass(a.getBody(),c),a.on("wpLoadImageForm",function(b){if(!a.getParam("wpeditimage_disable_captions")){var c={type:"textbox",flex:1,name:"caption",minHeight:60,multiline:!0,scroll:!0,label:"Image caption"};b.data.splice(b.data.length-1,0,c)}}),a.on("wpNewImageRefresh",function(a){var c,d;(c=b.getParent(a.node,"dl.wp-caption"))&&(c.style.width||(d=parseInt(a.node.clientWidth,10)+10,d=d?d+"px":"50%",b.setStyle(c,"width",d)))}),a.on("wpImageFormSubmit",function(c){var d,e,f,h,i,j=c.imgData.data,k=c.imgData.node,l=c.imgData.caption,m="",n="",o="";return j.id="__wp-temp-img-id",c.imgData.cancel=!0,j.style||(j.style=null),j.src?(l&&(l=l.replace(/\r\n|\r/g,"\n").replace(/<\/?[a-zA-Z0-9]+( [^<>]+)?>/g,function(a){return a.replace(/[\r\n\t]+/," ")}),l=l.replace(/(]*>)\s*\n\s*/g,"$1").replace(/\s*\n\s*/g,"
"),l=g(l)),k?(i=k.id||null,b.setAttribs(k,j),d=b.getParent(k,"dl.wp-caption"),l?d?(e=b.select("dd.wp-caption-dd",d)[0])&&(e.innerHTML=l):(k.className&&(m=k.className.match(/wp-image-([0-9]+)/),n=k.className.match(/align(left|right|center|none)/)),n?(n=n[0],k.className=k.className.replace(/align(left|right|center|none)/g,"")):n="alignnone",n=' class="wp-caption '+n+'"',m&&(m=' id="attachment_'+m[1]+'"'),o=j.width||k.clientWidth,o&&(o=parseInt(o,10),a.getParam("wpeditimage_html5_captions")||(o+=10),o=' style="width: '+o+'px"'),f=k.parentNode&&"A"===k.parentNode.nodeName?k.parentNode:k,h="
'+l+"
",d=b.create("div",{"class":"mceTemp"},h),(e=b.getParent(f,"p"))?e.parentNode.insertBefore(d,e):f.parentNode.insertBefore(d,f),a.$(d).find("dt.wp-caption-dt").append(f),e&&b.isEmpty(e)&&b.remove(e)):d&&(h="A"===k.parentNode.nodeName?b.getOuterHTML(k.parentNode):b.getOuterHTML(k),e=b.create("p",{},h),b.insertAfter(e,d.parentNode),a.selection.select(e),a.nodeChanged(),b.remove(d.parentNode))):(h=b.createHTML("img",j),l?(f=a.selection.getNode(),j.width&&(o=parseInt(j.width,10),a.getParam("wpeditimage_html5_captions")||(o+=10),o=' style="width: '+o+'px"'),h='
'+h+'
'+l+"
",e="P"===f.nodeName?f:b.getParent(f,"p"),e&&"P"===e.nodeName?(d=b.create("div",{"class":"mceTemp"},h),e.parentNode.insertBefore(d,e),a.selection.select(d),a.nodeChanged(),b.isEmpty(e)&&b.remove(e)):a.selection.setContent('
'+h+"
")):a.selection.setContent(h)),k=b.get("__wp-temp-img-id"),b.setAttrib(k,"id",i),void(c.imgData.node=k)):void(k&&((d=b.getParent(k,"div.mceTemp"))?b.remove(d):"A"===k.parentNode.nodeName?b.remove(k.parentNode):b.remove(k),a.nodeChanged()))}),a.on("wpLoadImageData",function(c){var d,e=c.imgData.data,f=c.imgData.node;(d=b.getParent(f,"dl.wp-caption"))&&(d=b.select("dd.wp-caption-dd",d)[0],d&&(e.caption=a.serializer.serialize(d).replace(/]*>/g,"$&\n").replace(/^

/,"").replace(/<\/p>$/,"")))}),b.bind(a.getDoc(),"dragstart",function(c){var d=a.selection.getNode();"IMG"===d.nodeName&&b.getParent(d,".wp-caption")&&c.preventDefault()}),tinymce.Env.ie&&tinymce.Env.ie>10&&b.bind(a.getBody(),"mscontrolselect",function(c){"IMG"===c.target.nodeName&&b.getParent(c.target,".wp-caption")?a.getBody().focus():"DL"===c.target.nodeName&&b.hasClass(c.target,"wp-caption")&&c.target.focus()})}),a.on("ObjectResized",function(b){var c=b.target;"IMG"===c.nodeName&&a.undoManager.transact(function(){var d,e,f=a.dom;c.className=c.className.replace(/\bsize-[^ ]+/,""),(d=f.getParent(c,".wp-caption"))&&(e=b.width||f.getAttrib(c,"width"),e&&(e=parseInt(e,10),a.getParam("wpeditimage_html5_captions")||(e+=10),f.setStyle(d,"width",e+"px")))})}),a.on("BeforeExecCommand",function(b){var c,d,e,f,g,h=b.command,i=a.dom;if("mceInsertContent"===h)(c=i.getParent(a.selection.getNode(),"div.mceTemp"))&&(d=i.create("p"),i.insertAfter(d,c),a.selection.setCursorLocation(d,0),a.nodeChanged());else if("JustifyLeft"===h||"JustifyRight"===h||"JustifyCenter"===h||"wpAlignNone"===h){if(c=a.selection.getNode(),f="align"+h.slice(7).toLowerCase(),e=a.dom.getParent(c,".wp-caption"),"IMG"!==c.nodeName&&!e)return;c=e||c,g=a.dom.hasClass(c,f)?" alignnone":" "+f,c.className=n(c.className.replace(/ ?align(left|center|right|none)/g,"")+g),a.nodeChanged(),b.preventDefault(),k&&k.reposition(),a.fire("ExecCommand",{command:h,ui:b.ui,value:b.value})}}),a.on("keydown",function(b){var c,d,e,f,g=a.selection,h=b.keyCode,i=a.dom,k=tinymce.util.VK;if(h===k.ENTER)c=g.getNode(),d=i.getParent(c,"div.mceTemp"),d&&(i.events.cancel(b),tinymce.each(i.select("dt, dd",d),function(a){i.isEmpty(a)&&i.remove(a)}),f=tinymce.Env.ie&&tinymce.Env.ie<11?"":'
',e=i.create("p",null,f),"DD"===c.nodeName?i.insertAfter(e,d):d.parentNode.insertBefore(e,d),a.nodeChanged(),g.setCursorLocation(e,0));else if((h===k.DELETE||h===k.BACKSPACE)&&(c=g.getNode(),"DIV"===c.nodeName&&i.hasClass(c,"mceTemp")?d=c:("IMG"===c.nodeName||"DT"===c.nodeName||"A"===c.nodeName)&&(d=i.getParent(c,"div.mceTemp")),d))return i.events.cancel(b),j(c),!1}),tinymce.Env.gecko&&a.on("undo redo",function(){"IMG"===a.selection.getNode().nodeName&&a.selection.collapse()}),a.wpSetImgCaption=function(a){return c(a)},a.wpGetImgCaption=function(a){return d(a)},a.on("BeforeSetContent",function(b){"raw"!==b.format&&(b.content=a.wpSetImgCaption(b.content))}),a.on("PostProcess",function(b){b.get&&(b.content=a.wpGetImgCaption(b.content))}),a.wp=a.wp||{},a.wp.isPlaceholder=b,{_do_shcode:c,_get_shcode:d}}); \ No newline at end of file +tinymce.PluginManager.add("wpeditimage",function(a){function b(b){return!(!a.dom.getAttrib(b,"data-mce-placeholder")&&!a.dom.getAttrib(b,"data-mce-object"))}function c(b){return b.replace(/(?:

)?\[(?:wp_)?caption([^\]]+)\]([\s\S]+?)\[\/(?:wp_)?caption\](?:<\/p>)?/g,function(b,c,d){var e,f,g,h,i,j;return e=c.match(/id=['"]([^'"]*)['"] ?/),e&&(c=c.replace(e[0],"")),f=c.match(/align=['"]([^'"]*)['"] ?/),f&&(c=c.replace(f[0],"")),g=c.match(/class=['"]([^'"]*)['"] ?/),g&&(c=c.replace(g[0],"")),j=c.match(/width=['"]([0-9]*)['"] ?/),j&&(c=c.replace(j[0],"")),d=n(d),i=d.match(/((?:]+>)?]+>(?:<\/a>)?)([\s\S]*)/i),i&&i[2]?(h=n(i[2]),i=n(i[1])):(h=n(c).replace(/caption=['"]/,"").replace(/['"]$/,""),i=d),e=e&&e[1]?e[1].replace(/[<>&]+/g,""):"",f=f&&f[1]?f[1]:"alignnone",g=g&&g[1]?" "+g[1].replace(/[<>&]+/g,""):"",!j&&i&&(j=i.match(/width=['"]([0-9]*)['"]/)),j&&j[1]&&(j=j[1]),j&&h?(j=parseInt(j,10),a.getParam("wpeditimage_html5_captions")||(j+=10),'

'+i+'
'+h+"
"):d})}function d(a){return a.replace(/
]*>([\s\S]+?)<\/div>/g,function(a,b){var c="";return-1===b.indexOf("]+>([\s\S]+?)<\/dd>/i),c&&c[1]?"

"+c[1]+"

":""):(c=b.replace(/\s*
]+)>\s*
]+>([\s\S]+?)<\/dt>\s*
]+>([\s\S]*?)<\/dd>\s*<\/dl>\s*/gi,function(a,b,c,d){var e,f,g,h;return h=c.match(/width="([0-9]*)"/),h=h&&h[1]?h[1]:"",f=b.match(/class="([^"]*)"/),f=f&&f[1]?f[1]:"",g=f.match(/align[a-z]+/i)||"alignnone",h&&d?(e=b.match(/id="([^"]*)"/),e=e&&e[1]?e[1]:"",f=f.replace(/wp-caption ?|align[a-z]+ ?/gi,""),f&&(f=' class="'+f+'"'),d=d.replace(/\r\n|\r/g,"\n").replace(/<[a-zA-Z0-9]+( [^<>]+)?>/g,function(a){return a.replace(/[\r\n\t]+/," ")}),d=d.replace(/\s*\n\s*/g,"
"),'[caption id="'+e+'" align="'+g+'" width="'+h+'"'+f+"]"+c+" "+d+"[/caption]"):("alignnone"!==g[0]&&(c=c.replace(/>]+>)?]+>(?:<\/a>)?)(

[\s\S]*<\/p>)?[\s\S]*/gi,"

$1

$2")),c)})}function e(b){var c,d,e,f,g,h,i,j,k=[],l=a.dom,m=/^\d+$/;return e={attachment_id:!1,size:"custom",caption:"",align:"none",extraClasses:"",link:!1,linkUrl:"",linkClassName:"",linkTargetBlank:!1,linkRel:"",title:""},e.url=l.getAttrib(b,"src"),e.alt=l.getAttrib(b,"alt"),e.title=l.getAttrib(b,"title"),i=l.getAttrib(b,"width"),j=l.getAttrib(b,"height"),(!m.test(i)||parseInt(i,10)<1)&&(i=b.naturalWidth||b.width),(!m.test(j)||parseInt(j,10)<1)&&(j=b.naturalHeight||b.height),e.customWidth=e.width=i,e.customHeight=e.height=j,c=tinymce.explode(b.className," "),d=[],tinymce.each(c,function(a){/^wp-image/.test(a)?e.attachment_id=parseInt(a.replace("wp-image-",""),10):/^align/.test(a)?e.align=a.replace("align",""):/^size/.test(a)?e.size=a.replace("size-",""):d.push(a)}),e.extraClasses=d.join(" "),f=l.getParents(b,".wp-caption"),f.length&&(f=f[0],c=f.className.split(" "),tinymce.each(c,function(a){/^align/.test(a)?e.align=a.replace("align",""):a&&"wp-caption"!==a&&k.push(a)}),e.captionClassName=k.join(" "),g=l.select("dd.wp-caption-dd",f),g.length&&(g=g[0],e.caption=a.serializer.serialize(g).replace(/]*>/g,"$&\n").replace(/^

/,"").replace(/<\/p>$/,""))),b.parentNode&&"A"===b.parentNode.nodeName&&(h=b.parentNode,e.linkUrl=l.getAttrib(h,"href"),e.linkTargetBlank="_blank"===l.getAttrib(h,"target")?!0:!1,e.linkRel=l.getAttrib(h,"rel"),e.linkClassName=h.className),e}function f(a){return a&&!(!a.textContent&&!a.innerText)}function g(b){return!b||-1===b.indexOf("<")&&-1===b.indexOf(">")?b:(l||(l=new tinymce.html.Serializer({},a.schema)),l.serialize(a.parser.parse(b,{forced_root_block:!1})))}function h(b,c){var d,e,h,i,j,k,l,m,n,o,p,q,r,s,t,u,v=a.dom;d=tinymce.explode(c.extraClasses," "),d||(d=[]),c.caption||d.push("align"+c.align),c.attachment_id&&(d.push("wp-image-"+c.attachment_id),c.size&&"custom"!==c.size&&d.push("size-"+c.size)),s=c.width,t=c.height,"custom"===c.size&&(s=c.customWidth,t=c.customHeight),q={src:c.url,width:s||null,height:t||null,alt:c.alt,title:c.title||null,"class":d.join(" ")||null},v.setAttribs(b,q),r={href:c.linkUrl,rel:c.linkRel||null,target:c.linkTargetBlank?"_blank":null,"class":c.linkClassName||null},b.parentNode&&"A"===b.parentNode.nodeName&&!f(b.parentNode)?c.linkUrl?v.setAttribs(b.parentNode,r):v.remove(b.parentNode,!0):c.linkUrl&&((l=v.getParent(b,"a"))&&v.insertAfter(b,l),l=v.create("a",r),b.parentNode.insertBefore(l,b),l.appendChild(b)),m=a.dom.getParent(b,".mceTemp"),h=b.parentNode&&"A"===b.parentNode.nodeName&&!f(b.parentNode)?b.parentNode:b,c.caption?(c.caption=g(c.caption),p=c.attachment_id?"attachment_"+c.attachment_id:null,u="align"+(c.align||"none"),e="wp-caption "+u,c.captionClassName&&(e+=" "+c.captionClassName.replace(/[<>&]+/g,"")),a.getParam("wpeditimage_html5_captions")||(s=parseInt(s,10),s+=10),m?(o=v.select("dl.wp-caption",m),o.length&&v.setAttribs(o,{id:p,"class":e,style:"width: "+s+"px"}),n=v.select(".wp-caption-dd",m),n.length&&v.setHTML(n[0],c.caption)):(p=p?'id="'+p+'" ':"",i="

'+c.caption+"
",k=v.create("div",{"class":"mceTemp"},i),(j=v.getParent(h,"p"))?j.parentNode.insertBefore(k,j):h.parentNode.insertBefore(k,h),a.$(k).find("dt.wp-caption-dt").append(h),j&&v.isEmpty(j)&&v.remove(j))):m&&(j=v.create("p"),m.parentNode.insertBefore(j,m),j.appendChild(h),v.remove(m)),wp.media.events&&wp.media.events.trigger("editor:image-update",{editor:a,metadata:c,image:b}),a.nodeChanged()}function i(b){var c,d,f;return"undefined"!=typeof wp&&wp.media?(f=e(b),wp.media.events.trigger("editor:image-edit",{editor:a,metadata:f,image:b}),c=wp.media({frame:"image",state:"image-details",metadata:f}),wp.media.events.trigger("editor:frame-create",{frame:c}),d=function(d){a.focus(),a.undoManager.transact(function(){h(b,d)}),c.detach()},c.state("image-details").on("update",d),c.state("replace-image").on("replace",d),c.on("close",function(){a.focus(),c.detach()}),void c.open()):void a.execCommand("mceImage")}function j(b){var c=a.dom.getParent(b,"div.mceTemp");c||"IMG"!==b.nodeName||(c=a.dom.getParent(b,"a")),c?(c.nextSibling?a.selection.select(c.nextSibling):c.previousSibling?a.selection.select(c.previousSibling):a.selection.select(c.parentNode),a.selection.collapse(!0),a.dom.remove(c)):a.dom.remove(b),a.nodeChanged(),a.undoManager.add()}var k,l,m=tinymce.each,n=tinymce.trim,o=tinymce.Env.iOS;return a.addButton("wp_img_remove",{tooltip:"Remove",icon:"dashicon dashicons-no",onclick:function(){j(a.selection.getNode())}}),a.addButton("wp_img_edit",{tooltip:"Edit ",icon:"dashicon dashicons-edit",onclick:function(){i(a.selection.getNode())}}),m({alignleft:"Align left",aligncenter:"Align center",alignright:"Align right",alignnone:"No alignment"},function(b,c){var d=c.slice(5);a.addButton("wp_img_"+c,{tooltip:b,icon:"dashicon dashicons-align-"+d,cmd:"alignnone"===c?"wpAlignNone":"Justify"+d.slice(0,1).toUpperCase()+d.slice(1),onPostRender:function(){var b=this;a.on("NodeChange",function(d){var e;"IMG"===d.element.nodeName&&(e=a.dom.getParent(d.element,".wp-caption")||d.element,"alignnone"===c?b.active(!/\balign(left|center|right)\b/.test(e.className)):b.active(a.dom.hasClass(e,c)))})}})}),a.once("preinit",function(){k=a.wp._createToolbar(["wp_img_alignleft","wp_img_aligncenter","wp_img_alignright","wp_img_alignnone","wp_img_edit","wp_img_remove"])}),a.on("wptoolbar",function(a){"IMG"!==a.element.nodeName||b(a.element)||(a.toolbar=k)}),o&&a.on("click",function(b){if("IMG"===b.target.nodeName){var c=b.target;window.setTimeout(function(){a.selection.select(c),a.nodeChanged()},200)}else k.hide()}),a.on("init",function(){var b=a.dom,c=a.getParam("wpeditimage_html5_captions")?"html5-captions":"html4-captions";b.addClass(a.getBody(),c),a.on("wpLoadImageForm",function(b){if(!a.getParam("wpeditimage_disable_captions")){var c={type:"textbox",flex:1,name:"caption",minHeight:60,multiline:!0,scroll:!0,label:"Image caption"};b.data.splice(b.data.length-1,0,c)}}),a.on("wpNewImageRefresh",function(a){var c,d;(c=b.getParent(a.node,"dl.wp-caption"))&&(c.style.width||(d=parseInt(a.node.clientWidth,10)+10,d=d?d+"px":"50%",b.setStyle(c,"width",d)))}),a.on("wpImageFormSubmit",function(c){var d,e,f,h,i,j=c.imgData.data,k=c.imgData.node,l=c.imgData.caption,m="",n="",o="";return j.id="__wp-temp-img-id",c.imgData.cancel=!0,j.style||(j.style=null),j.src?(l&&(l=l.replace(/\r\n|\r/g,"\n").replace(/<\/?[a-zA-Z0-9]+( [^<>]+)?>/g,function(a){return a.replace(/[\r\n\t]+/," ")}),l=l.replace(/(]*>)\s*\n\s*/g,"$1").replace(/\s*\n\s*/g,"
"),l=g(l)),k?(i=k.id||null,b.setAttribs(k,j),d=b.getParent(k,"dl.wp-caption"),l?d?(e=b.select("dd.wp-caption-dd",d)[0])&&(e.innerHTML=l):(k.className&&(m=k.className.match(/wp-image-([0-9]+)/),n=k.className.match(/align(left|right|center|none)/)),n?(n=n[0],k.className=k.className.replace(/align(left|right|center|none)/g,"")):n="alignnone",n=' class="wp-caption '+n+'"',m&&(m=' id="attachment_'+m[1]+'"'),o=j.width||k.clientWidth,o&&(o=parseInt(o,10),a.getParam("wpeditimage_html5_captions")||(o+=10),o=' style="width: '+o+'px"'),f=k.parentNode&&"A"===k.parentNode.nodeName?k.parentNode:k,h="
'+l+"
",d=b.create("div",{"class":"mceTemp"},h),(e=b.getParent(f,"p"))?e.parentNode.insertBefore(d,e):f.parentNode.insertBefore(d,f),a.$(d).find("dt.wp-caption-dt").append(f),e&&b.isEmpty(e)&&b.remove(e)):d&&(h="A"===k.parentNode.nodeName?b.getOuterHTML(k.parentNode):b.getOuterHTML(k),e=b.create("p",{},h),b.insertAfter(e,d.parentNode),a.selection.select(e),a.nodeChanged(),b.remove(d.parentNode))):(h=b.createHTML("img",j),l?(f=a.selection.getNode(),j.width&&(o=parseInt(j.width,10),a.getParam("wpeditimage_html5_captions")||(o+=10),o=' style="width: '+o+'px"'),h='
'+h+'
'+l+"
",e="P"===f.nodeName?f:b.getParent(f,"p"),e&&"P"===e.nodeName?(d=b.create("div",{"class":"mceTemp"},h),e.parentNode.insertBefore(d,e),a.selection.select(d),a.nodeChanged(),b.isEmpty(e)&&b.remove(e)):a.selection.setContent('
'+h+"
")):a.selection.setContent(h)),k=b.get("__wp-temp-img-id"),b.setAttrib(k,"id",i),void(c.imgData.node=k)):void(k&&((d=b.getParent(k,"div.mceTemp"))?b.remove(d):"A"===k.parentNode.nodeName?b.remove(k.parentNode):b.remove(k),a.nodeChanged()))}),a.on("wpLoadImageData",function(c){var d,e=c.imgData.data,f=c.imgData.node;(d=b.getParent(f,"dl.wp-caption"))&&(d=b.select("dd.wp-caption-dd",d)[0],d&&(e.caption=a.serializer.serialize(d).replace(/]*>/g,"$&\n").replace(/^

/,"").replace(/<\/p>$/,"")))}),b.bind(a.getDoc(),"dragstart",function(c){var d=a.selection.getNode();"IMG"===d.nodeName&&b.getParent(d,".wp-caption")&&c.preventDefault()}),tinymce.Env.ie&&tinymce.Env.ie>10&&b.bind(a.getBody(),"mscontrolselect",function(c){"IMG"===c.target.nodeName&&b.getParent(c.target,".wp-caption")?a.getBody().focus():"DL"===c.target.nodeName&&b.hasClass(c.target,"wp-caption")&&c.target.focus()})}),a.on("ObjectResized",function(b){var c=b.target;"IMG"===c.nodeName&&a.undoManager.transact(function(){var d,e,f=a.dom;c.className=c.className.replace(/\bsize-[^ ]+/,""),(d=f.getParent(c,".wp-caption"))&&(e=b.width||f.getAttrib(c,"width"),e&&(e=parseInt(e,10),a.getParam("wpeditimage_html5_captions")||(e+=10),f.setStyle(d,"width",e+"px")))})}),a.on("BeforeExecCommand",function(b){var c,d,e,f,g,h=b.command,i=a.dom;if("mceInsertContent"===h)(c=i.getParent(a.selection.getNode(),"div.mceTemp"))&&(d=i.create("p"),i.insertAfter(d,c),a.selection.setCursorLocation(d,0),a.nodeChanged());else if("JustifyLeft"===h||"JustifyRight"===h||"JustifyCenter"===h||"wpAlignNone"===h){if(c=a.selection.getNode(),f="align"+h.slice(7).toLowerCase(),e=a.dom.getParent(c,".wp-caption"),"IMG"!==c.nodeName&&!e)return;c=e||c,g=a.dom.hasClass(c,f)?" alignnone":" "+f,c.className=n(c.className.replace(/ ?align(left|center|right|none)/g,"")+g),a.nodeChanged(),b.preventDefault(),k&&k.reposition(),a.fire("ExecCommand",{command:h,ui:b.ui,value:b.value})}}),a.on("keydown",function(b){var c,d,e,f,g=a.selection,h=b.keyCode,i=a.dom,k=tinymce.util.VK;if(h===k.ENTER)c=g.getNode(),d=i.getParent(c,"div.mceTemp"),d&&(i.events.cancel(b),tinymce.each(i.select("dt, dd",d),function(a){i.isEmpty(a)&&i.remove(a)}),f=tinymce.Env.ie&&tinymce.Env.ie<11?"":'
',e=i.create("p",null,f),"DD"===c.nodeName?i.insertAfter(e,d):d.parentNode.insertBefore(e,d),a.nodeChanged(),g.setCursorLocation(e,0));else if((h===k.DELETE||h===k.BACKSPACE)&&(c=g.getNode(),"DIV"===c.nodeName&&i.hasClass(c,"mceTemp")?d=c:("IMG"===c.nodeName||"DT"===c.nodeName||"A"===c.nodeName)&&(d=i.getParent(c,"div.mceTemp")),d))return i.events.cancel(b),j(c),!1}),tinymce.Env.gecko&&a.on("undo redo",function(){"IMG"===a.selection.getNode().nodeName&&a.selection.collapse()}),a.wpSetImgCaption=function(a){return c(a)},a.wpGetImgCaption=function(a){return d(a)},a.on("BeforeSetContent",function(b){"raw"!==b.format&&(b.content=a.wpSetImgCaption(b.content))}),a.on("PostProcess",function(b){b.get&&(b.content=a.wpGetImgCaption(b.content))}),a.wp=a.wp||{},a.wp.isPlaceholder=b,{_do_shcode:c,_get_shcode: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 cbafa221dcbfd6ced0aa1e3e569e350d7b8672c3..f889cbf7e1bee25adff1611d6b73854e33036117 100644 GIT binary patch delta 9833 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 Pp1J=Y4pJ=-)3^oz!D4$s delta 9826 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 IgaNq*0H-QtO8@`> diff --git a/wp-includes/version.php b/wp-includes/version.php index b084d27688..bcf3af0949 100644 --- a/wp-includes/version.php +++ b/wp-includes/version.php @@ -4,7 +4,7 @@ * * @global string $wp_version */ -$wp_version = '4.3-beta2-33140'; +$wp_version = '4.3-beta2-33141'; /** * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.