From bb129b90f07d424513c0663fc7e2331908aae49f Mon Sep 17 00:00:00 2001 From: Andrew Nacin Date: Wed, 26 Mar 2014 23:13:15 +0000 Subject: [PATCH] Add an .html4-captions class to the editor when HTML5 captions are not supported, for theme use. see #26642. Built from https://develop.svn.wordpress.org/trunk@27758 git-svn-id: http://core.svn.wordpress.org/trunk@27595 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 121232 -> 121242 bytes wp-includes/version.php | 2 +- 4 files changed, 5 insertions(+), 6 deletions(-) diff --git a/wp-includes/js/tinymce/plugins/wpeditimage/plugin.js b/wp-includes/js/tinymce/plugins/wpeditimage/plugin.js index 2d2e587fdd..9e448b782a 100644 --- a/wp-includes/js/tinymce/plugins/wpeditimage/plugin.js +++ b/wp-includes/js/tinymce/plugins/wpeditimage/plugin.js @@ -397,11 +397,10 @@ tinymce.PluginManager.add( 'wpeditimage', function( editor ) { } editor.on( 'init', function() { - var dom = editor.dom; + var dom = editor.dom, + captionClass = editor.getParam( 'wpeditimage_html5_captions' ) ? 'html5-captions' : 'html4-captions'; - if ( editor.getParam( 'wpeditimage_html5_captions' ) ) { - dom.addClass( editor.getBody(), 'html5-captions' ); - } + dom.addClass( editor.getBody(), captionClass ); // Add caption field to the default image dialog editor.on( 'wpLoadImageForm', function( event ) { diff --git a/wp-includes/js/tinymce/plugins/wpeditimage/plugin.min.js b/wp-includes/js/tinymce/plugins/wpeditimage/plugin.min.js index 737ac7955e..431d762e8c 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(/(?:

)?\[(?: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>)?)([\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),'

'+i+'
'+h+"
"):d})}function c(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]+?)<\/dt>\s*
]+>([\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,"
"),'[caption id="'+e+'" align="'+f+'" width="'+g+'"]'+c+" "+d+"[/caption]"):c}),0!==c.indexOf("[caption")&&(c=b.replace(/[\s\S]*?((?:]+>)?]+>(?:<\/a>)?)(

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

$1

$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(/]*>/g,"$&\n").replace(/^

/,"").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='

'+h+'
'+c.caption+"
",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='
',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;a.getParam("wpeditimage_html5_captions")&&b.addClass(a.getBody(),"html5-captions"),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(/(]*>)\s*\n\s*/g,"$1").replace(/\s*\n\s*/g,"
")),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="
'+g+'
'+k+"
",(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('
'+g+"
")):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='
'+g+'
'+k+"
",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('
'+g+"
")):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(/]*>/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(),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?"":'
',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(/(?:

)?\[(?: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>)?)([\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),'

'+i+'
'+h+"
"):d})}function c(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]+?)<\/dt>\s*
]+>([\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,"
"),'[caption id="'+e+'" align="'+f+'" width="'+g+'"]'+c+" "+d+"[/caption]"):c}),0!==c.indexOf("[caption")&&(c=b.replace(/[\s\S]*?((?:]+>)?]+>(?:<\/a>)?)(

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

$1

$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(/]*>/g,"$&\n").replace(/^

/,"").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='

'+h+'
'+c.caption+"
",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='
',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(/(]*>)\s*\n\s*/g,"$1").replace(/\s*\n\s*/g,"
")),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="
'+g+'
'+k+"
",(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('
'+g+"
")):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='
'+g+'
'+k+"
",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('
'+g+"
")):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(/]*>/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(),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?"":'
',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 aa8ca9a53df4e6a462d3fdb5c808220c0012337d..f2f004e762e4e37cfdd4c72e644ed7e7caa0e2b8 100644 GIT binary patch delta 4029 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 delta 4019 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 Z(GhV!cCxUr-bT=i`TwV;0^B}~1pota@eKd~ diff --git a/wp-includes/version.php b/wp-includes/version.php index 389d82c307..6b3793bdf9 100644 --- a/wp-includes/version.php +++ b/wp-includes/version.php @@ -18,7 +18,7 @@ $wp_db_version = 26691; * * @global string $tinymce_version */ -$tinymce_version = '4020-20140319a'; +$tinymce_version = '4020-20140326'; /** * Holds the required PHP version