From dfe0e2615404d0359157fe4f2369940abe936791 Mon Sep 17 00:00:00 2001 From: Andrew Nacin Date: Sat, 26 Oct 2013 02:51:09 +0000 Subject: [PATCH] 3.7 regression: Fix the width of captioned images inserted into the visual editor. Pulls some arithmetic outside of some string concatenation to avoid a nasty uglify.js regression: https://github.com/mishoo/UglifyJS2/pull/330. props LucP. fixes #25700 for trunk. Built from https://develop.svn.wordpress.org/trunk@25921 git-svn-id: http://core.svn.wordpress.org/trunk@25880 1a063a9b-81f0-0310-95a4-ce76da25c4cd --- .../plugins/wpeditimage/editor_plugin.js | 2 +- .../plugins/wpeditimage/editor_plugin_src.js | 3 ++- wp-includes/js/tinymce/wp-tinymce.js.gz | Bin 116235 -> 116238 bytes 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/wp-includes/js/tinymce/plugins/wpeditimage/editor_plugin.js b/wp-includes/js/tinymce/plugins/wpeditimage/editor_plugin.js index 2813cd6a2c..240d567c2d 100644 --- a/wp-includes/js/tinymce/plugins/wpeditimage/editor_plugin.js +++ b/wp-includes/js/tinymce/plugins/wpeditimage/editor_plugin.js @@ -1 +1 @@ -!function(){tinymce.create("tinymce.plugins.wpEditImage",{url:"",editor:{},init:function(a,b){var c=this,d={};c.url=b,c.editor=a,c._createButtons(),a.addCommand("WP_EditImage",c._editImage),a.onInit.add(function(a){a.dom.events.add(a.getBody(),"mousedown",function(b){var c;"IMG"==b.target.nodeName&&(c=a.dom.getParent(b.target,"div.mceTemp"))&&(tinymce.isGecko?a.selection.select(c):tinymce.isWebKit&&a.dom.events.prevent(b))}),a.dom.events.add(a.getBody(),"keydown",function(b){var c,d,e,f;return 13==b.keyCode&&(c=a.selection.getNode(),d=a.dom.getParent(c,"dl.wp-caption"),d&&(e=a.dom.getParent(d,"div.mceTemp")),e)?(a.dom.events.cancel(b),f=a.dom.create("p",{},""),a.dom.insertAfter(f,e),a.selection.setCursorLocation(f,0),!1):void 0}),"ontouchstart"in window&&a.dom.events.add(a.getBody(),"touchstart",function(a){c._showButtons(a)})}),a.onMouseUp.add(function(a,b){if(!tinymce.isWebKit&&!tinymce.isOpera){if(d.x&&(b.clientX!=d.x||b.clientY!=d.y)){var c=a.selection.getNode();"IMG"==c.nodeName&&window.setTimeout(function(){var b,e=a.dom.getParent(c,"dl.wp-caption");(c.width!=d.img_w||c.height!=d.img_h)&&(c.className=c.className.replace(/size-[^ "']+/,"")),e&&(b=a.dom.getAttrib(c,"width")||c.width,b=parseInt(b,10),a.dom.setStyle(e,"width",10+b),a.execCommand("mceRepaint"))},100)}d={}}}),a.onMouseDown.add(function(a,b){c._showButtons(b)}),a.onBeforeSetContent.add(function(a,b){b.content=a.wpSetImgCaption(b.content)}),a.onPostProcess.add(function(a,b){b.get&&(b.content=a.wpGetImgCaption(b.content))}),a.wpSetImgCaption=function(a){return c._do_shcode(a)},a.wpGetImgCaption=function(a){return c._get_shcode(a)},a.onBeforeExecCommand.add(function(a,b){var c,d;if("mceInsertContent"==b){if(c=a.dom.getParent(a.selection.getNode(),"div.mceTemp"),!c)return;d=a.dom.create("p"),a.dom.insertAfter(d,c),a.selection.setCursorLocation(d,0)}})},_do_shcode:function(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),i=c.match(/((?:]+>)?]+>(?:<\/a>)?)([\s\S]*)/i),i&&i[2]?(g=j(i[2]),i=j(i[1])):(g=j(b).replace(/caption=['"]/,"").replace(/['"]$/,""),i=c),d=d&&d[1]?d[1]:"",e=e&&e[1]?e[1]:"alignnone",f=f&&f[1]?f[1]:"",f&&g?(h="mceTemp","aligncenter"==e&&(h+=" mceIEcenter"),'

'+i+'
'+g+"
"):c})},_get_shcode:function(a){return a.replace(/
]*>([\s\S]+?)<\/div>/g,function(a,b){var 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});return 0!==c.indexOf("[caption")&&(c=b.replace(/[\s\S]*?((?:]+>)?]+>(?:<\/a>)?)(

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

$1

$2")),c})},_createButtons:function(){var a,b,c,d=this,e=tinymce.activeEditor,f=tinymce.DOM;f.get("wp_editbtns")||(c=window.devicePixelRatio&&window.devicePixelRatio>1||window.matchMedia&&window.matchMedia("(min-resolution:130dpi)").matches,f.add(document.body,"div",{id:"wp_editbtns",style:"display:none;"}),a=f.add("wp_editbtns","img",{src:c?d.url+"/img/image-2x.png":d.url+"/img/image.png",id:"wp_editimgbtn",width:"24",height:"24",title:e.getLang("wpeditimage.edit_img")}),tinymce.dom.Event.add(a,"mousedown",function(){d._editImage(),e.plugins.wordpress._hideButtons()}),b=f.add("wp_editbtns","img",{src:c?d.url+"/img/delete-2x.png":d.url+"/img/delete.png",id:"wp_delimgbtn",width:"24",height:"24",title:e.getLang("wpeditimage.del_img")}),tinymce.dom.Event.add(b,"mousedown",function(){var a,b=tinymce.activeEditor,c=b.selection.getNode();return"IMG"==c.nodeName&&-1==b.dom.getAttrib(c,"class").indexOf("mceItem")?((a=b.dom.getParent(c,"div"))&&b.dom.hasClass(a,"mceTemp")?b.dom.remove(a):("A"==c.parentNode.nodeName&&1==c.parentNode.childNodes.length&&(c=c.parentNode),"P"==c.parentNode.nodeName&&1==c.parentNode.childNodes.length&&(c=c.parentNode),b.dom.remove(c)),b.execCommand("mceRepaint"),!1):(b.plugins.wordpress._hideButtons(),void 0)}))},_editImage:function(){var a,b,c,d=tinymce.activeEditor,e=this.url,f=d.selection.getNode(),g=f.className;-1==g.indexOf("mceItem")&&-1==g.indexOf("wpGallery")&&"IMG"==f.nodeName&&(a=tinymce.DOM.getViewPort(),b=680)?\[(?: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),i=c.match(/((?:]+>)?]+>(?:<\/a>)?)([\s\S]*)/i),i&&i[2]?(g=j(i[2]),i=j(i[1])):(g=j(b).replace(/caption=['"]/,"").replace(/['"]$/,""),i=c),d=d&&d[1]?d[1]:"",e=e&&e[1]?e[1]:"alignnone",f=f&&f[1]?f[1]:"",f&&g?(h="mceTemp","aligncenter"==e&&(h+=" mceIEcenter"),f=parseInt(f,10)+10,'
'+i+'
'+g+"
"):c})},_get_shcode:function(a){return a.replace(/
]*>([\s\S]+?)<\/div>/g,function(a,b){var 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});return 0!==c.indexOf("[caption")&&(c=b.replace(/[\s\S]*?((?:]+>)?]+>(?:<\/a>)?)(

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

$1

$2")),c})},_createButtons:function(){var a,b,c,d=this,e=tinymce.activeEditor,f=tinymce.DOM;f.get("wp_editbtns")||(c=window.devicePixelRatio&&window.devicePixelRatio>1||window.matchMedia&&window.matchMedia("(min-resolution:130dpi)").matches,f.add(document.body,"div",{id:"wp_editbtns",style:"display:none;"}),a=f.add("wp_editbtns","img",{src:c?d.url+"/img/image-2x.png":d.url+"/img/image.png",id:"wp_editimgbtn",width:"24",height:"24",title:e.getLang("wpeditimage.edit_img")}),tinymce.dom.Event.add(a,"mousedown",function(){d._editImage(),e.plugins.wordpress._hideButtons()}),b=f.add("wp_editbtns","img",{src:c?d.url+"/img/delete-2x.png":d.url+"/img/delete.png",id:"wp_delimgbtn",width:"24",height:"24",title:e.getLang("wpeditimage.del_img")}),tinymce.dom.Event.add(b,"mousedown",function(){var a,b=tinymce.activeEditor,c=b.selection.getNode();return"IMG"==c.nodeName&&-1==b.dom.getAttrib(c,"class").indexOf("mceItem")?((a=b.dom.getParent(c,"div"))&&b.dom.hasClass(a,"mceTemp")?b.dom.remove(a):("A"==c.parentNode.nodeName&&1==c.parentNode.childNodes.length&&(c=c.parentNode),"P"==c.parentNode.nodeName&&1==c.parentNode.childNodes.length&&(c=c.parentNode),b.dom.remove(c)),b.execCommand("mceRepaint"),!1):(b.plugins.wordpress._hideButtons(),void 0)}))},_editImage:function(){var a,b,c,d=tinymce.activeEditor,e=this.url,f=d.selection.getNode(),g=f.className;-1==g.indexOf("mceItem")&&-1==g.indexOf("wpGallery")&&"IMG"==f.nodeName&&(a=tinymce.DOM.getViewPort(),b=680
'+img+'
'+cap+'
'; }); }, diff --git a/wp-includes/js/tinymce/wp-tinymce.js.gz b/wp-includes/js/tinymce/wp-tinymce.js.gz index fc97bb5c92b2a4e8a4dc8419d2fe6968830ca273..d452a54aef976b30efd1411a9b3af2c832856ccc 100644 GIT binary patch delta 3035 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 delta 3032 zcmV;}3n%oBj0cO12Y|EzR=R&D7Xa%<9+~Eeb9oVGN3gx{7^B2T3tq)^j!v2heh_(t zn9YEfE}%$-O~;CVFEybKr#_P z0?%>JO{_z#v-^1!h;z&{XJ!!M;x$khjIAS1*#w*CaNnBHYerf+$9$>9U`d%Z=H>yR zVB$|t|2Iyki55*4xVnG6vV^L-*L`equqI;Qh>U0K4p)x{n2OO%1@52pC2TX`6MQq4 zf~PS)i4{hGgrkd&HPAYo5T`GX`HpYlfTn+$$W&9!-8dLrTv1ir2-!dk1N^AGQ=R zrJkr=3;tv+2E6)|wSemPEJd_yDFndRLph$wIvz-5cB^tir)}hbD?A3}CkPkun(}hKns}^wD4`g=r0r&IY28 zeyPeAMH|0Vph~b^M+XB&cVu<2eeel|O(M(@+`Wgj7J?K1gZll4Poj#>NId^eLIjdk zsCTSR-dbWGva$KFNQC=qMSv$xi!Ia&>CoIe_1b?TretB{+n4o$@@zaWM?zluNdj#{ zc-ssO`8n5nox3f+#SS4NX9q@L z=2KIZc-GIPyfD;g3IP8Fw7f0p5e#ydEmur^foT)^jMPxJO{8hwZkm*)D-q!AEr`^e?kDnh)eY&2uU6qJgw>=qs%~}TK1-HGmv@dK)MiBR-VGttsiNS1YmJ%=W9iW3pwft4BA~}=6=aTC!9btbM z2OQq&N4SO7n^hDpuQDNm6cLG_sF7$Qu%3F>Qxmfllm}&e@9g;oy$IVx)BCPBvJuJ1 zip*AC=3USwm){JdW^X`ZDR_DR-P#SoBUq;jjOs#W#YSAI5XHrO-=cC+93I2T?^Jk3 zW9a9S3ypCeY=;-^?1I*mtQ-e)Ne+KDp4YKzS{_Vr%<552w8t<;UwgFRv0otp{kZE! z!Dt6+xME8Q>3sc_$GM2n+(?qr!q-phb7Hoz0(6ypE@>d;=NOqPG8{bS1P<+ zi0a<(4d!U;fRuend&bz{(70a5e1X=baui040~6G1LmgB+BPb|=HGF8cVV=dEH{YQ* zq`OD?p3e#McHu+ymwVU8| zKgIlT>Rp%(e=6xNdGv~jnr&(Fu|_7U`I;u%^-m?GR{%Y>{^5a zM|*P*?y>C-V+vOGdXHUg{q89niIUTmw2%l)6xh{9>v26g?4f@`uCHS&Qc4&T3nCgM zAOBAH&sEh~hv5GMZJjyZgA{gFg`J8jyk2V6RQREyv6K6FxSC3#BeVKP=b69CBflG=hh%^@EjypRn9U?FXv`wT9y%TEUuYJi6~1 zFR8@#YQ#QXA+Ucvlv@xGa3m#N|7wOo?e|V1{ozakhI05+4uN7v>|qZYt!{T*0$-juTsz?2h9-X@Fs@W&=VHs3rWe z{;pXn1b=_u3?gYNJElB(%8UaC%o0nHc(OZz=`|*li}F<(VY=v|KoJ0ywBCC?ig39r z?UA#?e_?_ar!kSpBfCN0Zl3HM@P#Wp6-BNTayiYiaIs34|59R3_DijMqFd` z;KJb;D;x%q1>xdDh!d2>%!@OW$eN3*mO_7QigHps@VccF_s?}wJnZs)N7q;VwRY&` zi+s*imWMG=Go`y0O_OSFKcUYRcb>^>>9?dFMgfU&JHHw&)5RL4{4fLT785^_d)qS6 z3AM@j315%~mb}vNNlcE+J645Kl+OE{42fa<7%!DxQ*C@NO}c=hSSL)t z%%MmWZQ^$pKBPgT%vGFCxSXZ_8_O82zNJ?sXmm~~_^HSp+#-8s>O&GjPBYY_=9iT* a+hunQdS@XuYVwx{Ncn%3*$?y_TLl31*~sAl