From c8892dfaa2e65928d2bcecddb5fb01f3efa4a238 Mon Sep 17 00:00:00 2001 From: Andrew Ozz Date: Fri, 6 Feb 2015 23:00:23 +0000 Subject: [PATCH] TinyMCE: ensure the image toolbar stays visible when the image is much wider than the editor. Props iseulde, fixes #20696 for trunk. Built from https://develop.svn.wordpress.org/trunk@31362 git-svn-id: http://core.svn.wordpress.org/trunk@31343 1a063a9b-81f0-0310-95a4-ce76da25c4cd --- .../js/tinymce/plugins/wpeditimage/plugin.js | 4 +++- .../tinymce/plugins/wpeditimage/plugin.min.js | 2 +- wp-includes/js/tinymce/wp-tinymce.js.gz | Bin 136226 -> 136243 bytes wp-includes/version.php | 2 +- 4 files changed, 5 insertions(+), 3 deletions(-) diff --git a/wp-includes/js/tinymce/plugins/wpeditimage/plugin.js b/wp-includes/js/tinymce/plugins/wpeditimage/plugin.js index 3b1667d425..d8b735fb9d 100644 --- a/wp-includes/js/tinymce/plugins/wpeditimage/plugin.js +++ b/wp-includes/js/tinymce/plugins/wpeditimage/plugin.js @@ -238,7 +238,9 @@ tinymce.PluginManager.add( 'wpeditimage', function( editor ) { left = boundaryMiddle - toolbarHalf; left += iframePos.x; - if ( toolbarWidth >= windowWidth ) { + if ( boundary.left < 0 || boundary.right > iframeWidth ) { + left = iframePos.x + ( iframeWidth - toolbarWidth ) / 2; + } else if ( toolbarWidth >= windowWidth ) { className += ' mce-arrow-full'; left = 0; } else if ( ( left < 0 && boundary.left + toolbarWidth > windowWidth ) || diff --git a/wp-includes/js/tinymce/plugins/wpeditimage/plugin.min.js b/wp-includes/js/tinymce/plugins/wpeditimage/plugin.min.js index 81caeb1c52..09e5c7ddbe 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,g,h,i,j,k,l,m,n,p,q,r,t,u,v,w,x,y=this.getEl(),z=5,A=8,B=0,C=a.selection.getNode();return C&&"IMG"===C.nodeName?(f=window.pageYOffset||document.documentElement.scrollTop,g=tinymce.$("#wpadminbar")[0],h=tinymce.$(".mce-toolbar-grp",a.getContainer())[0],i=C.getBoundingClientRect(),j=(i.left+i.right)/2,k=(i.top+i.bottom)/2,l=i.top,m=v-i.bottom,n=window.innerWidth,p=y.offsetWidth,q=p/2,r=document.getElementById(a.id+"_ifr"),t=o.getPos(r),u=r.offsetWidth,v=r.offsetHeight,w=y.offsetHeight,x=w+A+z,s?b=i.top+t.y+A:l>=x?(e=" mce-arrow-down",b=i.top+t.y-w-A):m>=x?(e=" mce-arrow-up",b=i.bottom+t.y):(b=z,e=k>=x?" mce-arrow-down":" mce-arrow-up"),d=h?o.getPos(h).y+h.clientHeight:t.y,f&&(g&&0===g.getBoundingClientRect().top&&(B=g.clientHeight),f+B>d&&(d=f+B)),b&&d&&d+z>b&&(b=d+z,e=""),c=j-q,c+=t.x,p>=n?(e+=" mce-arrow-full",c=0):0>c&&i.left+p>n||c+p>n&&i.right-p<0?c=(n-p)/2:cu+t.x&&(e+=" mce-arrow-right",c=i.right-p+t.x),s||(y.className=y.className.replace(/ ?mce-arrow-[\w]+/g,""),y.className+=e),o.setStyles(y,{left:c,top:b}),this):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(){t=!1,this._visible&&(this.reposition(),o.addClass(this.getEl(),"mce-inline-toolbar-grp-active"))}),m.on("hide",function(){t=!0,o.removeClass(this.getEl(),"mce-inline-toolbar-grp-active")}),m.on("keydown",function(b){27===b.keyCode&&(d(),a.focus())}),o.bind(window,"resize scroll",function(){!t&&u.hasClass("wp-editor-expand")&&d()}),a.on("init",function(){a.dom.bind(a.getWin(),"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.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,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,g,h,i,j,k,l,m,n,p,q,r,t,u,v,w,x,y=this.getEl(),z=5,A=8,B=0,C=a.selection.getNode();return C&&"IMG"===C.nodeName?(f=window.pageYOffset||document.documentElement.scrollTop,g=tinymce.$("#wpadminbar")[0],h=tinymce.$(".mce-toolbar-grp",a.getContainer())[0],i=C.getBoundingClientRect(),j=(i.left+i.right)/2,k=(i.top+i.bottom)/2,l=i.top,m=v-i.bottom,n=window.innerWidth,p=y.offsetWidth,q=p/2,r=document.getElementById(a.id+"_ifr"),t=o.getPos(r),u=r.offsetWidth,v=r.offsetHeight,w=y.offsetHeight,x=w+A+z,s?b=i.top+t.y+A:l>=x?(e=" mce-arrow-down",b=i.top+t.y-w-A):m>=x?(e=" mce-arrow-up",b=i.bottom+t.y):(b=z,e=k>=x?" mce-arrow-down":" mce-arrow-up"),d=h?o.getPos(h).y+h.clientHeight:t.y,f&&(g&&0===g.getBoundingClientRect().top&&(B=g.clientHeight),f+B>d&&(d=f+B)),b&&d&&d+z>b&&(b=d+z,e=""),c=j-q,c+=t.x,i.left<0||i.right>u?c=t.x+(u-p)/2:p>=n?(e+=" mce-arrow-full",c=0):0>c&&i.left+p>n||c+p>n&&i.right-p<0?c=(n-p)/2:cu+t.x&&(e+=" mce-arrow-right",c=i.right-p+t.x),s||(y.className=y.className.replace(/ ?mce-arrow-[\w]+/g,""),y.className+=e),o.setStyles(y,{left:c,top:b}),this):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(){t=!1,this._visible&&(this.reposition(),o.addClass(this.getEl(),"mce-inline-toolbar-grp-active"))}),m.on("hide",function(){t=!0,o.removeClass(this.getEl(),"mce-inline-toolbar-grp-active")}),m.on("keydown",function(b){27===b.keyCode&&(d(),a.focus())}),o.bind(window,"resize scroll",function(){!t&&u.hasClass("wp-editor-expand")&&d()}),a.on("init",function(){a.dom.bind(a.getWin(),"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.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,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 b1b8279297392b29ef022c73af0f9e0dd1a3bebb..d5f03f326b1273d7727cf48d6bb0772e25322837 100644 GIT binary patch delta 5221 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 delta 5204 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 O!2bZ2EXq{;Jq7?LUqizH diff --git a/wp-includes/version.php b/wp-includes/version.php index 722584890d..697c60ac87 100644 --- a/wp-includes/version.php +++ b/wp-includes/version.php @@ -4,7 +4,7 @@ * * @global string $wp_version */ -$wp_version = '4.2-alpha-31361'; +$wp_version = '4.2-alpha-31362'; /** * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.