From 1ddc17780ae8aade8fff2fdbdc319f530aaa4de6 Mon Sep 17 00:00:00 2001 From: Andrew Ozz Date: Tue, 14 Jan 2014 05:52:09 +0000 Subject: [PATCH] TinyMCE: add/remove the 'alignnone' class when aligning images without captions. See #24067. Built from https://develop.svn.wordpress.org/trunk@26942 git-svn-id: http://core.svn.wordpress.org/trunk@26822 1a063a9b-81f0-0310-95a4-ce76da25c4cd --- .../js/tinymce/plugins/wpeditimage/plugin.js | 11 ++++++++++- .../tinymce/plugins/wpeditimage/plugin.min.js | 2 +- wp-includes/js/tinymce/wp-tinymce.js.gz | Bin 119201 -> 119219 bytes wp-includes/version.php | 2 +- 4 files changed, 12 insertions(+), 3 deletions(-) diff --git a/wp-includes/js/tinymce/plugins/wpeditimage/plugin.js b/wp-includes/js/tinymce/plugins/wpeditimage/plugin.js index 50db0d984a..3f4ca1036e 100644 --- a/wp-includes/js/tinymce/plugins/wpeditimage/plugin.js +++ b/wp-includes/js/tinymce/plugins/wpeditimage/plugin.js @@ -364,7 +364,6 @@ tinymce.PluginManager.add( 'wpeditimage', function( editor ) { } } } else if ( cmd === 'JustifyLeft' || cmd === 'JustifyRight' || cmd === 'JustifyCenter' ) { - // When inside an image caption, set the align* class on dt.wp-caption node = editor.selection.getNode(); align = cmd.substr(7).toLowerCase(); align = 'align' + align; @@ -376,6 +375,7 @@ tinymce.PluginManager.add( 'wpeditimage', function( editor ) { } if ( DL ) { + // When inside an image caption, set the align* class on dl.wp-caption if ( dom.hasClass( DL, align ) ) { dom.removeClass( DL, align ); dom.addClass( DL, 'alignnone' ); @@ -386,6 +386,15 @@ tinymce.PluginManager.add( 'wpeditimage', function( editor ) { return false; } + + if ( node.nodeName === 'IMG' ) { + if ( dom.hasClass( node, align ) ) { + // The align class is being removed + dom.addClass( node, 'alignnone' ); + } else { + dom.removeClass( node, 'alignnone' ); + } + } } }); diff --git a/wp-includes/js/tinymce/plugins/wpeditimage/plugin.min.js b/wp-includes/js/tinymce/plugins/wpeditimage/plugin.min.js index 27230741ca..075087a9ad 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(a){return a.replace(/(?:

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

'+'
'+h+'
'+g+"
"):c})}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)})}return a.on("init",function(){var b=a.dom;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)+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",draggable:"true"},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="A"===j.parentNode.nodeName?b.getOuterHTML(j.parentNode):b.getOuterHTML(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)+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",draggable:"true"},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),c.imgData.node=j,void 0):(j&&((d=b.getParent(j,"div.mceTemp"))?b.remove(d):"A"===j.parentNode.nodeName?b.remove(j.parentNode):b.remove(j),a.nodeChanged()),void 0)}),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()})}),a.on("ObjectResized",function(b){var c,d=b.target;"IMG"===d.nodeName&&(c=a.dom.getParent(d,".wp-caption"))&&a.dom.setStyle(c,"width",10+b.width+"px")}),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)&&(c=a.selection.getNode(),f=g.substr(7).toLowerCase(),f="align"+f,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}),a.on("keydown",function(b){var c,d,e,f,g=a.selection,h=a.dom;if(b.keyCode===tinymce.util.VK.ENTER)d=h.getParent(a.selection.getNode(),"div.mceTemp"),d&&(h.events.cancel(b),tinymce.each(h.select("dt, dd",d),function(a){h.isEmpty(a)&&h.remove(a)}),f=tinymce.Env.ie?"":'
',e=h.create("p",null,f),h.insertAfter(e,d),g.setCursorLocation(e,0),a.nodeChanged());else if((b.keyCode===tinymce.util.VK.DELETE||b.keyCode===tinymce.util.VK.BACKSPACE)&&(c=g.getNode(),"DIV"===c.nodeName&&h.hasClass(c,"mceTemp")?d=c:("IMG"===c.nodeName||"DT"===c.nodeName||"A"===c.nodeName)&&(d=h.getParent(c,"div.mceTemp")),d))return h.events.cancel(b),d.nextSibling?g.select(d.nextSibling):d.previousSibling?g.select(d.previousSibling):g.select(d.parentNode),g.collapse(!0),a.nodeChanged(),h.remove(d),d=null,!1}),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))}),{_do_shcode:b,_get_shcode:c}}); \ No newline at end of file +tinymce.PluginManager.add("wpeditimage",function(a){function b(a){return a.replace(/(?:

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

'+'
'+h+'
'+g+"
"):c})}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)})}return a.on("init",function(){var b=a.dom;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)+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",draggable:"true"},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="A"===j.parentNode.nodeName?b.getOuterHTML(j.parentNode):b.getOuterHTML(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)+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",draggable:"true"},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),c.imgData.node=j,void 0):(j&&((d=b.getParent(j,"div.mceTemp"))?b.remove(d):"A"===j.parentNode.nodeName?b.remove(j.parentNode):b.remove(j),a.nodeChanged()),void 0)}),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()})}),a.on("ObjectResized",function(b){var c,d=b.target;"IMG"===d.nodeName&&(c=a.dom.getParent(d,".wp-caption"))&&a.dom.setStyle(c,"width",10+b.width+"px")}),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,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,h=a.dom;if(b.keyCode===tinymce.util.VK.ENTER)d=h.getParent(a.selection.getNode(),"div.mceTemp"),d&&(h.events.cancel(b),tinymce.each(h.select("dt, dd",d),function(a){h.isEmpty(a)&&h.remove(a)}),f=tinymce.Env.ie?"":'
',e=h.create("p",null,f),h.insertAfter(e,d),g.setCursorLocation(e,0),a.nodeChanged());else if((b.keyCode===tinymce.util.VK.DELETE||b.keyCode===tinymce.util.VK.BACKSPACE)&&(c=g.getNode(),"DIV"===c.nodeName&&h.hasClass(c,"mceTemp")?d=c:("IMG"===c.nodeName||"DT"===c.nodeName||"A"===c.nodeName)&&(d=h.getParent(c,"div.mceTemp")),d))return h.events.cancel(b),d.nextSibling?g.select(d.nextSibling):d.previousSibling?g.select(d.previousSibling):g.select(d.parentNode),g.collapse(!0),a.nodeChanged(),h.remove(d),d=null,!1}),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))}),{_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 39607fb846e81f2534398061fae1f1e09a9dd7fc..49eb693792a53680d102c43fa607676b397c5909 100644 GIT binary patch delta 1708 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 diff --git a/wp-includes/version.php b/wp-includes/version.php index f24ac3b53d..1d04a4307b 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 = '4012-20140109'; +$tinymce_version = '4012-20140113'; /** * Holds the required PHP version