From cb489f5a9c0f61f4b31fe365bfca95b38023fa94 Mon Sep 17 00:00:00 2001
From: Andrew Ozz <admin@laptoptips.ca>
Date: Thu, 27 Mar 2014 00:07:14 +0000
Subject: [PATCH] Add the 'attachment_' prefix to caption IDs after editing,
 see #24409 Built from https://develop.svn.wordpress.org/trunk@27764

git-svn-id: http://core.svn.wordpress.org/trunk@27601 1a063a9b-81f0-0310-95a4-ce76da25c4cd
---
 .../js/tinymce/plugins/wpeditimage/plugin.js  |   7 +++----
 .../tinymce/plugins/wpeditimage/plugin.min.js |   2 +-
 wp-includes/js/tinymce/wp-tinymce.js.gz       | Bin 121242 -> 121260 bytes
 3 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/wp-includes/js/tinymce/plugins/wpeditimage/plugin.js b/wp-includes/js/tinymce/plugins/wpeditimage/plugin.js
index 9e448b782a..3ba19b47bc 100644
--- a/wp-includes/js/tinymce/plugins/wpeditimage/plugin.js
+++ b/wp-includes/js/tinymce/plugins/wpeditimage/plugin.js
@@ -186,7 +186,7 @@ tinymce.PluginManager.add( 'wpeditimage', function( editor ) {
 	}
 
 	function updateImage( imageNode, imageData ) {
-		var className, width, node, html, captionNode, nodeToReplace, uid, editedImg;
+		var className, width, node, html, captionNode, nodeToReplace, uid, editedImg, id;
 
 		if ( imageData.caption ) {
 
@@ -199,11 +199,10 @@ tinymce.PluginManager.add( 'wpeditimage', function( editor ) {
 			}
 
 			className = 'align' + imageData.align;
-
-			//TODO: shouldn't add the id attribute if it isn't an attachment
+			id = imageData.attachment_id ? 'id="attachment_'+ imageData.attachment_id +'" ' : '';
 
 			// should create a new function for generating the caption markup
-			html =  '<dl id="'+ imageData.attachment_id +'" class="wp-caption '+ className +'" style="width: '+ width +'px">' +
+			html =  '<dl ' + id + 'class="wp-caption '+ className +'" style="width: '+ width +'px">' +
 				'<dt class="wp-caption-dt">'+ html + '</dt><dd class="wp-caption-dd">'+ imageData.caption +'</dd></dl>';
 
 			node = editor.dom.create( 'div', { 'class': 'mceTemp' }, html );
diff --git a/wp-includes/js/tinymce/plugins/wpeditimage/plugin.min.js b/wp-includes/js/tinymce/plugins/wpeditimage/plugin.min.js
index 431d762e8c..8278033506 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 b.replace(/(?:<p>)?\[(?: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(/width=['"]([0-9]*)['"] ?/),g&&(c=c.replace(g[0],"")),d=k(d),i=d.match(/((?:<a [^>]+>)?<img [^>]+>(?:<\/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]:"",f=f&&f[1]?f[1]:"alignnone",!g&&i&&(g=i.match(/width=['"]([0-9]*)['"]/)),g&&g[1]&&(g=g[1]),g&&h?(j=parseInt(g,10),a.getParam("wpeditimage_html5_captions")||(j+=10),'<div class="mceTemp"><dl id="'+e+'" class="wp-caption '+f+'" style="width: '+j+'px"><dt class="wp-caption-dt">'+i+'</dt><dd class="wp-caption-dd">'+h+"</dd></dl></div>"):d})}function c(a){return a.replace(/<div (?:id="attachment_|class="mceTemp)[^>]*>([\s\S]+?)<\/div>/g,function(a,b){var c="";return-1===b.indexOf("<img ")?(c=b.match(/<dd [^>]+>([\s\S]+?)<\/dd>/i),c&&c[1]?"<p>"+c[1]+"</p>":""):(c=b.replace(/<dl ([^>]+)>\s*<dt [^>]+>([\s\S]+?)<\/dt>\s*<dd [^>]+>([\s\S]*?)<\/dd>\s*<\/dl>/gi,function(a,b,c,d){var e,f,g;return g=c.match(/width="([0-9]*)"/),g=g&&g[1]?g[1]:"",g&&d?(e=b.match(/id="([^"]*)"/),e=e&&e[1]?e[1]:"",f=b.match(/class="([^"]*)"/),f=f&&f[1]?f[1]:"",f=f.match(/align[a-z]+/)||"alignnone",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,"<br />"),'[caption id="'+e+'" align="'+f+'" width="'+g+'"]'+c+" "+d+"[/caption]"):c}),0!==c.indexOf("[caption")&&(c=b.replace(/[\s\S]*?((?:<a [^>]+>)?<img [^>]+>(?:<\/a>)?)(<p>[\s\S]*<\/p>)?[\s\S]*/gi,"<p>$1</p>$2")),c)})}function d(b){var c,d,e,f,g=a.dom;return d={attachment_id:!1,url:!1,height:"",width:"",size:"none",caption:"",alt:"",align:"none",link:!1,linkUrl:""},d.url=g.getAttrib(b,"src"),d.alt=g.getAttrib(b,"alt"),d.width=parseInt(g.getAttrib(b,"width"),10),d.height=parseInt(g.getAttrib(b,"height"),10),c=b.className.split(" "),tinymce.each(c,function(a){/^wp-image/.test(a)&&(d.attachment_id=parseInt(a.replace("wp-image-",""),10)),/^align/.test(a)&&(d.align=a.replace("align","")),/^size/.test(a)&&(d.size=a.replace("size-",""))}),e=g.getParents(b,".wp-caption"),e.length&&(e=e[0],c=e.className.split(" "),tinymce.each(c,function(a){/^align/.test(a)&&(d.align=a.replace("align",""))}),f=g.select("dd.wp-caption-dd",e),f.length&&(f=f[0],d.caption=a.serializer.serialize(f).replace(/<br[^>]*>/g,"$&\n").replace(/^<p>/,"").replace(/<\/p>$/,""))),b.parentNode&&"A"===b.parentNode.nodeName&&(d.linkUrl=g.getAttrib(b.parentNode,"href")),d}function e(b,c){var d,e,g,h,j,k,l,m;c.caption?(h=f(c,"html"),e=parseInt(c.width,10),a.getParam("wpeditimage_html5_captions")||(e+=10),d="align"+c.align,h='<dl id="'+c.attachment_id+'" class="wp-caption '+d+'" style="width: '+e+'px"><dt class="wp-caption-dt">'+h+'</dt><dd class="wp-caption-dd">'+c.caption+"</dd></dl>",g=a.dom.create("div",{"class":"mceTemp"},h)):g=f(c,"node"),k=b,j=a.dom.getParent(b,".mceTemp"),j?k=j:"A"===b.parentNode.nodeName&&(k=b.parentNode),l=a.dom.uniqueId("wp_"),a.dom.setAttrib(g,"data-wp-replace-id",l),a.dom.replace(g,k),g=a.dom.select('[data-wp-replace-id="'+l+'"]')[0],a.dom.setAttrib(g,"data-wp-replace-id",""),a.nodeChanged(),m="IMG"===g.nodeName?g:a.dom.select("img",g)[0],m&&(a.selection.select(m),i(m))}function f(b,c){var d,e=[];if(c=c?c:"node",b.caption||e.push("align"+b.align),b.attachment_id&&(e.push("wp-image-"+b.attachment_id),b.size&&e.push("size-"+b.size)),d={src:b.url,width:b.width,height:b.height,alt:b.alt},e.length&&(d["class"]=e.join(" ")),b.linkUrl){if("node"===c)return a.dom.create("a",{href:b.linkUrl},a.dom.createHTML("img",d));if("html"===c)return a.dom.createHTML("a",{href:b.linkUrl},a.dom.createHTML("img",d))}else{if("node"===c)return a.dom.create("img",d);if("html"===c)return a.dom.createHTML("img",d)}}function g(b){var c,f;return"undefined"!=typeof wp&&wp.media?(a.undoManager.add(),c=wp.media({frame:"image",state:"image-details",metadata:d(b)}),f=function(d){e(b,d),a.focus(),c.detach()},c.state("image-details").on("update",f),c.state("replace-image").on("replace",f),c.on("close",function(){a.focus(),c.detach()}),void c.open()):void a.execCommand("mceImage")}function h(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.nodeChanged(),a.dom.remove(c)):a.dom.remove(b)}function i(b){var c,d,e,f,g=a.dom;j(),b&&"IMG"===b.nodeName&&!k(b)&&(g.setAttrib(b,"data-wp-imgselect",1),c=g.getRect(b),d='<div class="dashicons dashicons-edit edit" data-mce-bogus="1"></div><div class="dashicons dashicons-no-alt remove" data-mce-bogus="1"></div>',e=g.create("div",{id:"wp-image-toolbar","data-mce-bogus":"1",contenteditable:!1},d),a.getBody().appendChild(e),f=g.getSize(e),g.setStyles(e,{top:c.y,left:c.x+c.w-f.w}))}function j(){var b=a.dom.get("wp-image-toolbar");b&&a.dom.remove(b),a.dom.setAttrib(a.dom.select("img[data-wp-imgselect]"),"data-wp-imgselect",null)}function k(b){var c=a.dom;return c.hasClass(b,"mceItem")||c.getAttrib(b,"data-mce-placeholder")||c.getAttrib(b,"data-mce-object")?!0:!1}return 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,i=c.imgData.data,j=c.imgData.node,k=c.imgData.caption,l="",m="",n="";return i.id="__wp-temp-img-id",c.imgData.cancel=!0,i.style||(i.style=null),i.src?(k&&(k=k.replace(/\r\n|\r/g,"\n").replace(/<\/?[a-zA-Z0-9]+( [^<>]+)?>/g,function(a){return a.replace(/[\r\n\t]+/," ")}),k=k.replace(/(<br[^>]*>)\s*\n\s*/g,"$1").replace(/\s*\n\s*/g,"<br />")),j?(h=j.id||null,b.setAttribs(j,i),d=b.getParent(j,"dl.wp-caption"),k?d?(e=b.select("dd.wp-caption-dd",d)[0])&&(e.innerHTML=k):(j.className&&(l=j.className.match(/wp-image-([0-9]+)/),m=j.className.match(/align(left|right|center|none)/)),m?(m=m[0],j.className=j.className.replace(/align(left|right|center|none)/g,"")):m="alignnone",m=' class="wp-caption '+m+'"',l&&(l=' id="attachment_'+l[1]+'"'),n=i.width||j.clientWidth,n&&(n=parseInt(n,10),a.getParam("wpeditimage_html5_captions")||(n+=10),n=' style="width: '+n+'px"'),j.parentNode&&"A"===j.parentNode.nodeName?(g=b.getOuterHTML(j.parentNode),f=j.parentNode):(g=b.getOuterHTML(j),f=j),g="<dl "+l+m+n+'><dt class="wp-caption-dt">'+g+'</dt><dd class="wp-caption-dd">'+k+"</dd></dl>",(e=b.getParent(j,"p"))?(d=b.create("div",{"class":"mceTemp"},g),b.insertAfter(d,e),a.selection.select(d),a.nodeChanged(),b.remove(f),b.isEmpty(e)&&b.remove(e)):a.selection.setContent('<div class="mceTemp">'+g+"</div>")):d&&(g=b.getOuterHTML("A"===j.parentNode.nodeName?j.parentNode:j),e=b.create("p",{},g),b.insertAfter(e,d.parentNode),a.selection.select(e),a.nodeChanged(),b.remove(d.parentNode))):(g=b.createHTML("img",i),k?(f=a.selection.getNode(),i.width&&(n=parseInt(i.width,10),a.getParam("wpeditimage_html5_captions")||(n+=10),n=' style="width: '+n+'px"'),g='<dl class="wp-caption alignnone"'+n+'><dt class="wp-caption-dt">'+g+'</dt><dd class="wp-caption-dd">'+k+"</dd></dl>",e="P"===f.nodeName?f:b.getParent(f,"p"),e&&"P"===e.nodeName?(d=b.create("div",{"class":"mceTemp"},g),b.insertAfter(d,e),a.selection.select(d),a.nodeChanged(),b.isEmpty(e)&&b.remove(e)):a.selection.setContent('<div class="mceTemp">'+g+"</div>")):a.selection.setContent(g)),j=b.get("__wp-temp-img-id"),b.setAttrib(j,"id",h),void(c.imgData.node=j)):void(j&&(b.remove((d=b.getParent(j,"div.mceTemp"))?d:"A"===j.parentNode.nodeName?j.parentNode:j),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(/<br[^>]*>/g,"$&\n").replace(/^<p>/,"").replace(/<\/p>$/,"")))}),b.bind(a.getDoc(),"dragstart",function(c){var d=a.selection.getNode();"IMG"===d.nodeName&&b.getParent(d,".wp-caption")&&c.preventDefault(),j()}),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("click",function(c){"IMG"===c.target.nodeName&&b.getAttrib(c.target,"data-wp-imgselect")&&b.getParent(c.target,"dl.wp-caption")&&a.getBody().focus()}))}),a.on("ObjectResized",function(b){var c,d,e=b.target,f=a.dom;"IMG"===e.nodeName&&(e.className=e.className.replace(/\bsize-[^ ]+/,""),(c=f.getParent(e,".wp-caption"))&&(d=b.width||f.getAttrib(e,"width"),d&&(d=parseInt(d,10),a.getParam("wpeditimage_html5_captions")||(d+=10),f.setStyle(c,"width",d+"px"))),i(e))}),a.on("BeforeExecCommand",function(b){var c,d,e,f,g=b.command,h=a.dom;if("mceInsertContent"===g){if((c=h.getParent(a.selection.getNode(),"div.mceTemp"))&&(d=h.create("p"),h.insertAfter(d,c),a.selection.setCursorLocation(d,0),a.nodeChanged(),tinymce.Env.ie>8))return setTimeout(function(){a.selection.setCursorLocation(d,0),a.selection.setContent(b.value)},500),!1}else if("JustifyLeft"===g||"JustifyRight"===g||"JustifyCenter"===g){if(c=a.selection.getNode(),f=g.substr(7).toLowerCase(),f="align"+f,j(),e=h.is(c,"dl.wp-caption")?c:h.getParent(c,"dl.wp-caption"))return h.hasClass(e,f)?(h.removeClass(e,f),h.addClass(e,"alignnone")):(e.className=e.className.replace(/align[^ ]+/g,""),h.addClass(e,f)),!1;"IMG"===c.nodeName&&(h.hasClass(c,f)?h.addClass(c,"alignnone"):h.removeClass(c,"alignnone"))}}),a.on("keydown",function(b){var c,d,e,f,g=a.selection,i=a.dom;if(b.keyCode===tinymce.util.VK.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?"":'<br data-mce-bogus="1" />',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((b.keyCode===tinymce.util.VK.DELETE||b.keyCode===tinymce.util.VK.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),h(c),!1}),a.on("mousedown",function(b){a.dom.getParent(b.target,"#wp-image-toolbar")?tinymce.Env.ie&&b.preventDefault():"IMG"!==b.target.nodeName&&j()}),a.on("mouseup",function(b){var c,d=b.target,e=a.dom;b.button&&b.button>1||("DIV"===d.nodeName&&e.getParent(d,"#wp-image-toolbar")?(c=e.select("img[data-wp-imgselect]")[0],c&&(a.selection.select(c),e.hasClass(d,"remove")?(h(c),j()):e.hasClass(d,"edit")&&g(c))):"IMG"!==d.nodeName||a.dom.getAttrib(d,"data-wp-imgselect")||k(d)?"IMG"!==d.nodeName&&j():i(d))}),a.on("cut",function(){j()}),a.wpSetImgCaption=function(a){return b(a)},a.wpGetImgCaption=function(a){return c(a)},a.on("BeforeSetContent",function(b){b.content=a.wpSetImgCaption(b.content)}),a.on("PostProcess",function(b){b.get&&(b.content=a.wpGetImgCaption(b.content),b.content=b.content.replace(/ data-wp-imgselect="1"/g,""))}),{_do_shcode:b,_get_shcode:c}});
\ No newline at end of file
+tinymce.PluginManager.add("wpeditimage",function(a){function b(b){return b.replace(/(?:<p>)?\[(?: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(/width=['"]([0-9]*)['"] ?/),g&&(c=c.replace(g[0],"")),d=k(d),i=d.match(/((?:<a [^>]+>)?<img [^>]+>(?:<\/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]:"",f=f&&f[1]?f[1]:"alignnone",!g&&i&&(g=i.match(/width=['"]([0-9]*)['"]/)),g&&g[1]&&(g=g[1]),g&&h?(j=parseInt(g,10),a.getParam("wpeditimage_html5_captions")||(j+=10),'<div class="mceTemp"><dl id="'+e+'" class="wp-caption '+f+'" style="width: '+j+'px"><dt class="wp-caption-dt">'+i+'</dt><dd class="wp-caption-dd">'+h+"</dd></dl></div>"):d})}function c(a){return a.replace(/<div (?:id="attachment_|class="mceTemp)[^>]*>([\s\S]+?)<\/div>/g,function(a,b){var c="";return-1===b.indexOf("<img ")?(c=b.match(/<dd [^>]+>([\s\S]+?)<\/dd>/i),c&&c[1]?"<p>"+c[1]+"</p>":""):(c=b.replace(/<dl ([^>]+)>\s*<dt [^>]+>([\s\S]+?)<\/dt>\s*<dd [^>]+>([\s\S]*?)<\/dd>\s*<\/dl>/gi,function(a,b,c,d){var e,f,g;return g=c.match(/width="([0-9]*)"/),g=g&&g[1]?g[1]:"",g&&d?(e=b.match(/id="([^"]*)"/),e=e&&e[1]?e[1]:"",f=b.match(/class="([^"]*)"/),f=f&&f[1]?f[1]:"",f=f.match(/align[a-z]+/)||"alignnone",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,"<br />"),'[caption id="'+e+'" align="'+f+'" width="'+g+'"]'+c+" "+d+"[/caption]"):c}),0!==c.indexOf("[caption")&&(c=b.replace(/[\s\S]*?((?:<a [^>]+>)?<img [^>]+>(?:<\/a>)?)(<p>[\s\S]*<\/p>)?[\s\S]*/gi,"<p>$1</p>$2")),c)})}function d(b){var c,d,e,f,g=a.dom;return d={attachment_id:!1,url:!1,height:"",width:"",size:"none",caption:"",alt:"",align:"none",link:!1,linkUrl:""},d.url=g.getAttrib(b,"src"),d.alt=g.getAttrib(b,"alt"),d.width=parseInt(g.getAttrib(b,"width"),10),d.height=parseInt(g.getAttrib(b,"height"),10),c=b.className.split(" "),tinymce.each(c,function(a){/^wp-image/.test(a)&&(d.attachment_id=parseInt(a.replace("wp-image-",""),10)),/^align/.test(a)&&(d.align=a.replace("align","")),/^size/.test(a)&&(d.size=a.replace("size-",""))}),e=g.getParents(b,".wp-caption"),e.length&&(e=e[0],c=e.className.split(" "),tinymce.each(c,function(a){/^align/.test(a)&&(d.align=a.replace("align",""))}),f=g.select("dd.wp-caption-dd",e),f.length&&(f=f[0],d.caption=a.serializer.serialize(f).replace(/<br[^>]*>/g,"$&\n").replace(/^<p>/,"").replace(/<\/p>$/,""))),b.parentNode&&"A"===b.parentNode.nodeName&&(d.linkUrl=g.getAttrib(b.parentNode,"href")),d}function e(b,c){var d,e,g,h,j,k,l,m,n;c.caption?(h=f(c,"html"),e=parseInt(c.width,10),a.getParam("wpeditimage_html5_captions")||(e+=10),d="align"+c.align,n=c.attachment_id?'id="attachment_'+c.attachment_id+'" ':"",h="<dl "+n+'class="wp-caption '+d+'" style="width: '+e+'px"><dt class="wp-caption-dt">'+h+'</dt><dd class="wp-caption-dd">'+c.caption+"</dd></dl>",g=a.dom.create("div",{"class":"mceTemp"},h)):g=f(c,"node"),k=b,j=a.dom.getParent(b,".mceTemp"),j?k=j:"A"===b.parentNode.nodeName&&(k=b.parentNode),l=a.dom.uniqueId("wp_"),a.dom.setAttrib(g,"data-wp-replace-id",l),a.dom.replace(g,k),g=a.dom.select('[data-wp-replace-id="'+l+'"]')[0],a.dom.setAttrib(g,"data-wp-replace-id",""),a.nodeChanged(),m="IMG"===g.nodeName?g:a.dom.select("img",g)[0],m&&(a.selection.select(m),i(m))}function f(b,c){var d,e=[];if(c=c?c:"node",b.caption||e.push("align"+b.align),b.attachment_id&&(e.push("wp-image-"+b.attachment_id),b.size&&e.push("size-"+b.size)),d={src:b.url,width:b.width,height:b.height,alt:b.alt},e.length&&(d["class"]=e.join(" ")),b.linkUrl){if("node"===c)return a.dom.create("a",{href:b.linkUrl},a.dom.createHTML("img",d));if("html"===c)return a.dom.createHTML("a",{href:b.linkUrl},a.dom.createHTML("img",d))}else{if("node"===c)return a.dom.create("img",d);if("html"===c)return a.dom.createHTML("img",d)}}function g(b){var c,f;return"undefined"!=typeof wp&&wp.media?(a.undoManager.add(),c=wp.media({frame:"image",state:"image-details",metadata:d(b)}),f=function(d){e(b,d),a.focus(),c.detach()},c.state("image-details").on("update",f),c.state("replace-image").on("replace",f),c.on("close",function(){a.focus(),c.detach()}),void c.open()):void a.execCommand("mceImage")}function h(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.nodeChanged(),a.dom.remove(c)):a.dom.remove(b)}function i(b){var c,d,e,f,g=a.dom;j(),b&&"IMG"===b.nodeName&&!k(b)&&(g.setAttrib(b,"data-wp-imgselect",1),c=g.getRect(b),d='<div class="dashicons dashicons-edit edit" data-mce-bogus="1"></div><div class="dashicons dashicons-no-alt remove" data-mce-bogus="1"></div>',e=g.create("div",{id:"wp-image-toolbar","data-mce-bogus":"1",contenteditable:!1},d),a.getBody().appendChild(e),f=g.getSize(e),g.setStyles(e,{top:c.y,left:c.x+c.w-f.w}))}function j(){var b=a.dom.get("wp-image-toolbar");b&&a.dom.remove(b),a.dom.setAttrib(a.dom.select("img[data-wp-imgselect]"),"data-wp-imgselect",null)}function k(b){var c=a.dom;return c.hasClass(b,"mceItem")||c.getAttrib(b,"data-mce-placeholder")||c.getAttrib(b,"data-mce-object")?!0:!1}return 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,i=c.imgData.data,j=c.imgData.node,k=c.imgData.caption,l="",m="",n="";return i.id="__wp-temp-img-id",c.imgData.cancel=!0,i.style||(i.style=null),i.src?(k&&(k=k.replace(/\r\n|\r/g,"\n").replace(/<\/?[a-zA-Z0-9]+( [^<>]+)?>/g,function(a){return a.replace(/[\r\n\t]+/," ")}),k=k.replace(/(<br[^>]*>)\s*\n\s*/g,"$1").replace(/\s*\n\s*/g,"<br />")),j?(h=j.id||null,b.setAttribs(j,i),d=b.getParent(j,"dl.wp-caption"),k?d?(e=b.select("dd.wp-caption-dd",d)[0])&&(e.innerHTML=k):(j.className&&(l=j.className.match(/wp-image-([0-9]+)/),m=j.className.match(/align(left|right|center|none)/)),m?(m=m[0],j.className=j.className.replace(/align(left|right|center|none)/g,"")):m="alignnone",m=' class="wp-caption '+m+'"',l&&(l=' id="attachment_'+l[1]+'"'),n=i.width||j.clientWidth,n&&(n=parseInt(n,10),a.getParam("wpeditimage_html5_captions")||(n+=10),n=' style="width: '+n+'px"'),j.parentNode&&"A"===j.parentNode.nodeName?(g=b.getOuterHTML(j.parentNode),f=j.parentNode):(g=b.getOuterHTML(j),f=j),g="<dl "+l+m+n+'><dt class="wp-caption-dt">'+g+'</dt><dd class="wp-caption-dd">'+k+"</dd></dl>",(e=b.getParent(j,"p"))?(d=b.create("div",{"class":"mceTemp"},g),b.insertAfter(d,e),a.selection.select(d),a.nodeChanged(),b.remove(f),b.isEmpty(e)&&b.remove(e)):a.selection.setContent('<div class="mceTemp">'+g+"</div>")):d&&(g=b.getOuterHTML("A"===j.parentNode.nodeName?j.parentNode:j),e=b.create("p",{},g),b.insertAfter(e,d.parentNode),a.selection.select(e),a.nodeChanged(),b.remove(d.parentNode))):(g=b.createHTML("img",i),k?(f=a.selection.getNode(),i.width&&(n=parseInt(i.width,10),a.getParam("wpeditimage_html5_captions")||(n+=10),n=' style="width: '+n+'px"'),g='<dl class="wp-caption alignnone"'+n+'><dt class="wp-caption-dt">'+g+'</dt><dd class="wp-caption-dd">'+k+"</dd></dl>",e="P"===f.nodeName?f:b.getParent(f,"p"),e&&"P"===e.nodeName?(d=b.create("div",{"class":"mceTemp"},g),b.insertAfter(d,e),a.selection.select(d),a.nodeChanged(),b.isEmpty(e)&&b.remove(e)):a.selection.setContent('<div class="mceTemp">'+g+"</div>")):a.selection.setContent(g)),j=b.get("__wp-temp-img-id"),b.setAttrib(j,"id",h),void(c.imgData.node=j)):void(j&&(b.remove((d=b.getParent(j,"div.mceTemp"))?d:"A"===j.parentNode.nodeName?j.parentNode:j),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(/<br[^>]*>/g,"$&\n").replace(/^<p>/,"").replace(/<\/p>$/,"")))}),b.bind(a.getDoc(),"dragstart",function(c){var d=a.selection.getNode();"IMG"===d.nodeName&&b.getParent(d,".wp-caption")&&c.preventDefault(),j()}),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("click",function(c){"IMG"===c.target.nodeName&&b.getAttrib(c.target,"data-wp-imgselect")&&b.getParent(c.target,"dl.wp-caption")&&a.getBody().focus()}))}),a.on("ObjectResized",function(b){var c,d,e=b.target,f=a.dom;"IMG"===e.nodeName&&(e.className=e.className.replace(/\bsize-[^ ]+/,""),(c=f.getParent(e,".wp-caption"))&&(d=b.width||f.getAttrib(e,"width"),d&&(d=parseInt(d,10),a.getParam("wpeditimage_html5_captions")||(d+=10),f.setStyle(c,"width",d+"px"))),i(e))}),a.on("BeforeExecCommand",function(b){var c,d,e,f,g=b.command,h=a.dom;if("mceInsertContent"===g){if((c=h.getParent(a.selection.getNode(),"div.mceTemp"))&&(d=h.create("p"),h.insertAfter(d,c),a.selection.setCursorLocation(d,0),a.nodeChanged(),tinymce.Env.ie>8))return setTimeout(function(){a.selection.setCursorLocation(d,0),a.selection.setContent(b.value)},500),!1}else if("JustifyLeft"===g||"JustifyRight"===g||"JustifyCenter"===g){if(c=a.selection.getNode(),f=g.substr(7).toLowerCase(),f="align"+f,j(),e=h.is(c,"dl.wp-caption")?c:h.getParent(c,"dl.wp-caption"))return h.hasClass(e,f)?(h.removeClass(e,f),h.addClass(e,"alignnone")):(e.className=e.className.replace(/align[^ ]+/g,""),h.addClass(e,f)),!1;"IMG"===c.nodeName&&(h.hasClass(c,f)?h.addClass(c,"alignnone"):h.removeClass(c,"alignnone"))}}),a.on("keydown",function(b){var c,d,e,f,g=a.selection,i=a.dom;if(b.keyCode===tinymce.util.VK.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?"":'<br data-mce-bogus="1" />',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((b.keyCode===tinymce.util.VK.DELETE||b.keyCode===tinymce.util.VK.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),h(c),!1}),a.on("mousedown",function(b){a.dom.getParent(b.target,"#wp-image-toolbar")?tinymce.Env.ie&&b.preventDefault():"IMG"!==b.target.nodeName&&j()}),a.on("mouseup",function(b){var c,d=b.target,e=a.dom;b.button&&b.button>1||("DIV"===d.nodeName&&e.getParent(d,"#wp-image-toolbar")?(c=e.select("img[data-wp-imgselect]")[0],c&&(a.selection.select(c),e.hasClass(d,"remove")?(h(c),j()):e.hasClass(d,"edit")&&g(c))):"IMG"!==d.nodeName||a.dom.getAttrib(d,"data-wp-imgselect")||k(d)?"IMG"!==d.nodeName&&j():i(d))}),a.on("cut",function(){j()}),a.wpSetImgCaption=function(a){return b(a)},a.wpGetImgCaption=function(a){return c(a)},a.on("BeforeSetContent",function(b){b.content=a.wpSetImgCaption(b.content)}),a.on("PostProcess",function(b){b.get&&(b.content=a.wpGetImgCaption(b.content),b.content=b.content.replace(/ data-wp-imgselect="1"/g,""))}),{_do_shcode:b,_get_shcode:c}});
\ 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 f2f004e762e4e37cfdd4c72e644ed7e7caa0e2b8..9fbb76623fc874f2355f13b0d5e7a9f5341b0f44 100644
GIT binary patch
delta 4831
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
F1purCnX>=@

delta 4813
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