From 20e753a8c7b67b25131931cb7c6222e86462ab72 Mon Sep 17 00:00:00 2001 From: Andrew Ozz Date: Tue, 25 Nov 2014 01:22:21 +0000 Subject: [PATCH] TinyMCE: use the actual image node when calculating the position of the toolbar. Fixes a bug in old IE. See #30147. Built from https://develop.svn.wordpress.org/trunk@30558 git-svn-id: http://core.svn.wordpress.org/trunk@30547 1a063a9b-81f0-0310-95a4-ce76da25c4cd --- .../js/tinymce/plugins/wpeditimage/plugin.js | 2 +- .../tinymce/plugins/wpeditimage/plugin.min.js | 2 +- wp-includes/js/tinymce/wp-tinymce.js.gz | Bin 135884 -> 135882 bytes wp-includes/version.php | 2 +- 4 files changed, 3 insertions(+), 3 deletions(-) diff --git a/wp-includes/js/tinymce/plugins/wpeditimage/plugin.js b/wp-includes/js/tinymce/plugins/wpeditimage/plugin.js index ae112aa3f8..2b1c803fbb 100644 --- a/wp-includes/js/tinymce/plugins/wpeditimage/plugin.js +++ b/wp-includes/js/tinymce/plugins/wpeditimage/plugin.js @@ -166,7 +166,7 @@ tinymce.PluginManager.add( 'wpeditimage', function( editor ) { adminbar = tinymce.$( '#wpadminbar' )[0], mceToolbar = tinymce.$( '.mce-tinymce .mce-toolbar-grp' )[0], adminbarHeight = 0, - boundary = editor.selection.getRng().getBoundingClientRect(), + boundary = editor.selection.getNode().getBoundingClientRect(), boundaryMiddle = ( boundary.left + boundary.right ) / 2, boundaryVerticalMiddle = ( boundary.top + boundary.bottom ) / 2, spaceTop = boundary.top, diff --git a/wp-includes/js/tinymce/plugins/wpeditimage/plugin.min.js b/wp-includes/js/tinymce/plugins/wpeditimage/plugin.min.js index d019dabe9f..2901d9f1ac 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(){var b,c=[];return r(["wp_img_alignleft","wp_img_aligncenter","wp_img_alignright","wp_img_alignnone","wp_img_edit","wp_img_remove"],function(d){function e(){var b=a.selection;d.settings.stateSelector&&b.selectorChanged(d.settings.stateSelector,function(a){d.active(a)},!0),d.settings.disabledStateSelector&&b.selectorChanged(d.settings.disabledStateSelector,function(a){d.disabled(a)})}var f;"|"===d?b=null:q.has(d)?(d={type:d},p.toolbar_items_size&&(d.size=p.toolbar_items_size),c.push(d),b=null):(b||(b={type:"buttongroup",items:[]},c.push(b)),a.buttons[d]&&(f=d,d=a.buttons[f],"function"==typeof d&&(d=d()),d.type=d.type||"button",p.toolbar_items_size&&(d.size=p.toolbar_items_size),d=q.create(d),b.items.push(d),a.initialized?e():a.on("init",e)))}),{type:"panel",layout:"stack",classes:"toolbar-grp inline-toolbar-grp wp-image-toolbar",ariaRoot:!0,ariaRemember:!0,items:[{type:"toolbar",layout:"flow",items:c}]}}function d(){t||m.hide()}function e(b){return b.replace(/(?:

)?\[(?:wp_)?caption([^\]]+)\]([\s\S]+?)\[\/(?:wp_)?caption\](?:<\/p>)?/g,function(b,c,d){var e,f,g,h,i,j,k=tinymce.trim;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=k(d),i=d.match(/((?:]+>)?]+>(?:<\/a>)?)([\s\S]*)/i),i&&i[2]?(h=k(i[2]),i=k(i[1])):(h=k(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 f(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]:"",h&&d?(e=b.match(/id="([^"]*)"/),e=e&&e[1]?e[1]:"",f=b.match(/class="([^"]*)"/),f=f&&f[1]?f[1]:"",g=f.match(/align[a-z]+/i)||"alignnone",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]"):c}),-1===c.indexOf("[caption")&&(c=b.replace(/[\s\S]*?((?:]+>)?]+>(?:<\/a>)?)(

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

$1

$2")),c)})}function g(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 h(a){return a&&!(!a.textContent&&!a.innerText)}function i(b){return!b||-1===b.indexOf("<")&&-1===b.indexOf(">")?b:(n||(n=new tinymce.html.Serializer({},a.schema)),n.serialize(a.parser.parse(b,{forced_root_block:!1})))}function j(b,c){var d,e,f,g,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&&!h(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"),f=b.parentNode&&"A"===b.parentNode.nodeName&&!h(b.parentNode)?b.parentNode:b,c.caption?(c.caption=i(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+'" ':"",g="

'+c.caption+"
",k=v.create("div",{"class":"mceTemp"},g),(j=v.getParent(f,"p"))?(j.parentNode.insertBefore(k,j),v.isEmpty(j)&&v.remove(j)):f.parentNode.insertBefore(k,f),a.$(k).find("dt.wp-caption-dt").append(f))):m&&(j=v.create("p"),m.parentNode.insertBefore(j,m),j.appendChild(f),v.remove(m)),wp.media.events&&wp.media.events.trigger("editor:image-update",{editor:a,metadata:c,image:b}),a.nodeChanged()}function k(b){var c,d,e;return"undefined"!=typeof wp&&wp.media?(e=g(b),wp.media.events.trigger("editor:image-edit",{editor:a,metadata:e,image:b}),c=wp.media({frame:"image",state:"image-details",metadata:e}),wp.media.events.trigger("editor:frame-create",{frame:c}),d=function(d){a.focus(),a.undoManager.transact(function(){j(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 l(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?(a.selection.select(c.nextSibling?c.nextSibling:c.previousSibling?c.previousSibling:c.parentNode),a.selection.collapse(!0),a.dom.remove(c)):a.dom.remove(b),a.nodeChanged(),a.undoManager.add()}var m,n,o=tinymce.DOM,p=a.settings,q=tinymce.ui.Factory,r=tinymce.each,s=tinymce.Env.iOS,t=!0,u=tinymce.$("#postdivrich");return a.addButton("wp_img_remove",{tooltip:"Remove",icon:"dashicon dashicons-no",onclick:function(){l(a.selection.getNode())}}),a.addButton("wp_img_edit",{tooltip:"Edit",icon:"dashicon dashicons-edit",onclick:function(){k(a.selection.getNode())}}),r({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,b.active("alignnone"===c?!/\balign(left|center|right)\b/.test(e.className):a.dom.hasClass(e,c)))})}})}),m=q.create(c()).renderTo(document.body).hide(),m.reposition=function(){var b,c,d,e,f=this.getEl(),g=5,h=8,i=window.pageYOffset||document.documentElement.scrollTop,j=tinymce.$("#wpadminbar")[0],k=tinymce.$(".mce-tinymce .mce-toolbar-grp")[0],l=0,m=a.selection.getRng().getBoundingClientRect(),n=(m.left+m.right)/2,p=(m.top+m.bottom)/2,q=m.top,r=z-m.bottom,t=window.innerWidth,u=f.offsetWidth,v=u/2,w=a.getContentAreaContainer().firstChild,x=o.getPos(w),y=w.offsetWidth,z=w.offsetHeight,A=f.offsetHeight,B=A+h+g;return s?b=m.top+x.y+h:q>=B?(e=" mce-arrow-down",b=m.top+x.y-A-h):r>=B?(e=" mce-arrow-up",b=m.bottom+x.y):(b=g,e=p>=B?" mce-arrow-down":" mce-arrow-up"),d=k?o.getPos(k).y+k.clientHeight:x.y,i&&(j&&0===j.getBoundingClientRect().top&&(l=j.clientHeight),i+l>d&&(d=i+l)),b&&d&&d+g>b&&(b=d+g,e=""),c=n-v,c+=x.x,u>=t?(e+=" mce-arrow-full",c=0):0>c&&m.left+u>t||c+u>t&&m.right-u<0?c=(t-u)/2:cy+x.x&&(e+=" mce-arrow-right",c=m.right-u+x.x),s||(f.className=f.className.replace(/ ?mce-arrow-[\w]+/g,""),f.className+=e),o.setStyles(f,{left:c,top:b}),this},s&&a.on("click",function(b){if("IMG"===b.target.nodeName){var c=b.target;window.setTimeout(function(){a.selection.select(c)},200)}else m.hide()}),a.on("nodechange",function(c){var d=s?350:100;return"IMG"!==c.element.nodeName||b(c.element)?void m.hide():void setTimeout(function(){var c=a.selection.getNode();"IMG"!==c.nodeName||b(c)?m.hide():m._visible?m.reposition():m.show()},d)}),m.on("show",function(){var a=this;t=!1,setTimeout(function(){a._visible&&(o.addClass(a.getEl(),"mce-inline-toolbar-grp-active"),a.reposition())},100)}),m.on("hide",function(){t=!0,o.removeClass(this.getEl(),"mce-inline-toolbar-grp-active")}),o.bind(window,"resize scroll",function(){!t&&u.hasClass("wp-editor-expand")&&d()}),a.on("init",function(){o.bind(a.getWin(),"resize scroll",d)}),a.on("blur hide",d),a.shortcuts.add("Alt+119","",function(){var a=m.find("toolbar")[0];a&&a.focus(!0)}),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,g,h,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=i(l)),k?(h=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,g="
'+l+"
",d=b.create("div",{"class":"mceTemp"},g),(e=b.getParent(f,"p"))?(e.parentNode.insertBefore(d,e),b.isEmpty(e)&&b.remove(e)):f.parentNode.insertBefore(d,f),a.$(d).find("dt.wp-caption-dt").append(f)):d&&(g=b.getOuterHTML("A"===k.parentNode.nodeName?k.parentNode:k),e=b.create("p",{},g),b.insertAfter(e,d.parentNode),a.selection.select(e),a.nodeChanged(),b.remove(d.parentNode))):(g=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"'),g='
'+g+'
'+l+"
",e="P"===f.nodeName?f:b.getParent(f,"p"),e&&"P"===e.nodeName?(d=b.create("div",{"class":"mceTemp"},g),e.parentNode.insertBefore(d,e),a.selection.select(d),a.nodeChanged(),b.isEmpty(e)&&b.remove(e)):a.selection.setContent('
'+g+"
")):a.selection.setContent(g)),k=b.get("__wp-temp-img-id"),b.setAttrib(k,"id",h),void(c.imgData.node=k)):void(k&&(b.remove((d=b.getParent(k,"div.mceTemp"))?d:"A"===k.parentNode.nodeName?k.parentNode: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=c.className.replace(/ ?align(left|center|right|none)/g,"")+g,a.nodeChanged(),b.preventDefault(),m&&m.reposition()}}),a.on("keydown",function(b){var c,d,e,f,g=a.selection,h=b.keyCode,i=a.dom,j=tinymce.util.VK;if(h===j.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===j.DELETE||h===j.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),l(c),!1}),tinymce.Env.gecko&&a.on("undo redo",function(){"IMG"===a.selection.getNode().nodeName&&a.selection.collapse()}),a.wpSetImgCaption=function(a){return e(a)},a.wpGetImgCaption=function(a){return f(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))}),{_do_shcode:e,_get_shcode:f}}); \ 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(){var b,c=[];return r(["wp_img_alignleft","wp_img_aligncenter","wp_img_alignright","wp_img_alignnone","wp_img_edit","wp_img_remove"],function(d){function e(){var b=a.selection;d.settings.stateSelector&&b.selectorChanged(d.settings.stateSelector,function(a){d.active(a)},!0),d.settings.disabledStateSelector&&b.selectorChanged(d.settings.disabledStateSelector,function(a){d.disabled(a)})}var f;"|"===d?b=null:q.has(d)?(d={type:d},p.toolbar_items_size&&(d.size=p.toolbar_items_size),c.push(d),b=null):(b||(b={type:"buttongroup",items:[]},c.push(b)),a.buttons[d]&&(f=d,d=a.buttons[f],"function"==typeof d&&(d=d()),d.type=d.type||"button",p.toolbar_items_size&&(d.size=p.toolbar_items_size),d=q.create(d),b.items.push(d),a.initialized?e():a.on("init",e)))}),{type:"panel",layout:"stack",classes:"toolbar-grp inline-toolbar-grp wp-image-toolbar",ariaRoot:!0,ariaRemember:!0,items:[{type:"toolbar",layout:"flow",items:c}]}}function d(){t||m.hide()}function e(b){return b.replace(/(?:

)?\[(?:wp_)?caption([^\]]+)\]([\s\S]+?)\[\/(?:wp_)?caption\](?:<\/p>)?/g,function(b,c,d){var e,f,g,h,i,j,k=tinymce.trim;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=k(d),i=d.match(/((?:]+>)?]+>(?:<\/a>)?)([\s\S]*)/i),i&&i[2]?(h=k(i[2]),i=k(i[1])):(h=k(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 f(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]:"",h&&d?(e=b.match(/id="([^"]*)"/),e=e&&e[1]?e[1]:"",f=b.match(/class="([^"]*)"/),f=f&&f[1]?f[1]:"",g=f.match(/align[a-z]+/i)||"alignnone",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]"):c}),-1===c.indexOf("[caption")&&(c=b.replace(/[\s\S]*?((?:]+>)?]+>(?:<\/a>)?)(

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

$1

$2")),c)})}function g(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 h(a){return a&&!(!a.textContent&&!a.innerText)}function i(b){return!b||-1===b.indexOf("<")&&-1===b.indexOf(">")?b:(n||(n=new tinymce.html.Serializer({},a.schema)),n.serialize(a.parser.parse(b,{forced_root_block:!1})))}function j(b,c){var d,e,f,g,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&&!h(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"),f=b.parentNode&&"A"===b.parentNode.nodeName&&!h(b.parentNode)?b.parentNode:b,c.caption?(c.caption=i(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+'" ':"",g="

'+c.caption+"
",k=v.create("div",{"class":"mceTemp"},g),(j=v.getParent(f,"p"))?(j.parentNode.insertBefore(k,j),v.isEmpty(j)&&v.remove(j)):f.parentNode.insertBefore(k,f),a.$(k).find("dt.wp-caption-dt").append(f))):m&&(j=v.create("p"),m.parentNode.insertBefore(j,m),j.appendChild(f),v.remove(m)),wp.media.events&&wp.media.events.trigger("editor:image-update",{editor:a,metadata:c,image:b}),a.nodeChanged()}function k(b){var c,d,e;return"undefined"!=typeof wp&&wp.media?(e=g(b),wp.media.events.trigger("editor:image-edit",{editor:a,metadata:e,image:b}),c=wp.media({frame:"image",state:"image-details",metadata:e}),wp.media.events.trigger("editor:frame-create",{frame:c}),d=function(d){a.focus(),a.undoManager.transact(function(){j(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 l(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?(a.selection.select(c.nextSibling?c.nextSibling:c.previousSibling?c.previousSibling:c.parentNode),a.selection.collapse(!0),a.dom.remove(c)):a.dom.remove(b),a.nodeChanged(),a.undoManager.add()}var m,n,o=tinymce.DOM,p=a.settings,q=tinymce.ui.Factory,r=tinymce.each,s=tinymce.Env.iOS,t=!0,u=tinymce.$("#postdivrich");return a.addButton("wp_img_remove",{tooltip:"Remove",icon:"dashicon dashicons-no",onclick:function(){l(a.selection.getNode())}}),a.addButton("wp_img_edit",{tooltip:"Edit",icon:"dashicon dashicons-edit",onclick:function(){k(a.selection.getNode())}}),r({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,b.active("alignnone"===c?!/\balign(left|center|right)\b/.test(e.className):a.dom.hasClass(e,c)))})}})}),m=q.create(c()).renderTo(document.body).hide(),m.reposition=function(){var b,c,d,e,f=this.getEl(),g=5,h=8,i=window.pageYOffset||document.documentElement.scrollTop,j=tinymce.$("#wpadminbar")[0],k=tinymce.$(".mce-tinymce .mce-toolbar-grp")[0],l=0,m=a.selection.getNode().getBoundingClientRect(),n=(m.left+m.right)/2,p=(m.top+m.bottom)/2,q=m.top,r=z-m.bottom,t=window.innerWidth,u=f.offsetWidth,v=u/2,w=a.getContentAreaContainer().firstChild,x=o.getPos(w),y=w.offsetWidth,z=w.offsetHeight,A=f.offsetHeight,B=A+h+g;return s?b=m.top+x.y+h:q>=B?(e=" mce-arrow-down",b=m.top+x.y-A-h):r>=B?(e=" mce-arrow-up",b=m.bottom+x.y):(b=g,e=p>=B?" mce-arrow-down":" mce-arrow-up"),d=k?o.getPos(k).y+k.clientHeight:x.y,i&&(j&&0===j.getBoundingClientRect().top&&(l=j.clientHeight),i+l>d&&(d=i+l)),b&&d&&d+g>b&&(b=d+g,e=""),c=n-v,c+=x.x,u>=t?(e+=" mce-arrow-full",c=0):0>c&&m.left+u>t||c+u>t&&m.right-u<0?c=(t-u)/2:cy+x.x&&(e+=" mce-arrow-right",c=m.right-u+x.x),s||(f.className=f.className.replace(/ ?mce-arrow-[\w]+/g,""),f.className+=e),o.setStyles(f,{left:c,top:b}),this},s&&a.on("click",function(b){if("IMG"===b.target.nodeName){var c=b.target;window.setTimeout(function(){a.selection.select(c)},200)}else m.hide()}),a.on("nodechange",function(c){var d=s?350:100;return"IMG"!==c.element.nodeName||b(c.element)?void m.hide():void setTimeout(function(){var c=a.selection.getNode();"IMG"!==c.nodeName||b(c)?m.hide():m._visible?m.reposition():m.show()},d)}),m.on("show",function(){var a=this;t=!1,setTimeout(function(){a._visible&&(o.addClass(a.getEl(),"mce-inline-toolbar-grp-active"),a.reposition())},100)}),m.on("hide",function(){t=!0,o.removeClass(this.getEl(),"mce-inline-toolbar-grp-active")}),o.bind(window,"resize scroll",function(){!t&&u.hasClass("wp-editor-expand")&&d()}),a.on("init",function(){o.bind(a.getWin(),"resize scroll",d)}),a.on("blur hide",d),a.shortcuts.add("Alt+119","",function(){var a=m.find("toolbar")[0];a&&a.focus(!0)}),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,g,h,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=i(l)),k?(h=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,g="
'+l+"
",d=b.create("div",{"class":"mceTemp"},g),(e=b.getParent(f,"p"))?(e.parentNode.insertBefore(d,e),b.isEmpty(e)&&b.remove(e)):f.parentNode.insertBefore(d,f),a.$(d).find("dt.wp-caption-dt").append(f)):d&&(g=b.getOuterHTML("A"===k.parentNode.nodeName?k.parentNode:k),e=b.create("p",{},g),b.insertAfter(e,d.parentNode),a.selection.select(e),a.nodeChanged(),b.remove(d.parentNode))):(g=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"'),g='
'+g+'
'+l+"
",e="P"===f.nodeName?f:b.getParent(f,"p"),e&&"P"===e.nodeName?(d=b.create("div",{"class":"mceTemp"},g),e.parentNode.insertBefore(d,e),a.selection.select(d),a.nodeChanged(),b.isEmpty(e)&&b.remove(e)):a.selection.setContent('
'+g+"
")):a.selection.setContent(g)),k=b.get("__wp-temp-img-id"),b.setAttrib(k,"id",h),void(c.imgData.node=k)):void(k&&(b.remove((d=b.getParent(k,"div.mceTemp"))?d:"A"===k.parentNode.nodeName?k.parentNode: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=c.className.replace(/ ?align(left|center|right|none)/g,"")+g,a.nodeChanged(),b.preventDefault(),m&&m.reposition()}}),a.on("keydown",function(b){var c,d,e,f,g=a.selection,h=b.keyCode,i=a.dom,j=tinymce.util.VK;if(h===j.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===j.DELETE||h===j.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),l(c),!1}),tinymce.Env.gecko&&a.on("undo redo",function(){"IMG"===a.selection.getNode().nodeName&&a.selection.collapse()}),a.wpSetImgCaption=function(a){return e(a)},a.wpGetImgCaption=function(a){return f(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))}),{_do_shcode:e,_get_shcode:f}}); \ 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 0d14b7ad811bf96c8f5d67453a05d8871e46309c..7cef24f83aaf8ff4c92272c0ee7b4bce11948d8b 100644 GIT binary patch delta 5141 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 E0JZ@ixc~qF diff --git a/wp-includes/version.php b/wp-includes/version.php index 9dfb04ed55..9243681272 100644 --- a/wp-includes/version.php +++ b/wp-includes/version.php @@ -4,7 +4,7 @@ * * @global string $wp_version */ -$wp_version = '4.1-beta2-30557'; +$wp_version = '4.1-beta2-30558'; /** * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.