From f31c4b00c8d90bf1d1e4741483d7172a75da668e Mon Sep 17 00:00:00 2001 From: Andrew Ozz Date: Sat, 5 Nov 2011 19:49:42 +0000 Subject: [PATCH] Fix js error on mousedown in the editor, props joehoyle, fixes #19165 git-svn-id: https://develop.svn.wordpress.org/trunk@19180 602fd350-edb4-49c9-b593-d223f7449a82 --- .../plugins/wpeditimage/editor_plugin.dev.js | 2 +- .../plugins/wpeditimage/editor_plugin.js | 2 +- wp-includes/js/tinymce/wp-tinymce.js.gz | Bin 95790 -> 95795 bytes 3 files changed, 2 insertions(+), 2 deletions(-) diff --git a/wp-includes/js/tinymce/plugins/wpeditimage/editor_plugin.dev.js b/wp-includes/js/tinymce/plugins/wpeditimage/editor_plugin.dev.js index 4cd4310a91..f79b6250ee 100644 --- a/wp-includes/js/tinymce/plugins/wpeditimage/editor_plugin.dev.js +++ b/wp-includes/js/tinymce/plugins/wpeditimage/editor_plugin.dev.js @@ -78,7 +78,7 @@ // show editimage buttons ed.onMouseDown.add(function(ed, e) { - if ( e.target && (e.target.nodeName == 'IMG' || e.target.firstChild.nodeName == 'IMG') ) { + if ( e.target && ( e.target.nodeName == 'IMG' || (e.target.firstChild && e.target.firstChild.nodeName == 'IMG') ) ) { mouse = { x: e.clientX, y: e.clientY, diff --git a/wp-includes/js/tinymce/plugins/wpeditimage/editor_plugin.js b/wp-includes/js/tinymce/plugins/wpeditimage/editor_plugin.js index 4892663091..fae5b5c985 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",{init:function(a,c){var d=this,b={};d.url=c;d._createButtons();a.addCommand("WP_EditImage",function(){var i=a.selection.getNode(),g=tinymce.DOM.getViewPort(),h=g.h,e=(720)?\[(?:wp_)?caption([^\]]+)\]([\s\S]+?)\[\/(?:wp_)?caption\](?:<\/p>)?[\s\u00a0]*/g,function(g,d,k){var j,f,e,h,i;d=d.replace(/\\'|\\'|\\'/g,"'").replace(/\\"|\\"/g,""");k=k.replace(/\\'|\\'/g,"'").replace(/\\"/g,""");j=d.match(/id=['"]([^'"]+)/i);f=d.match(/align=['"]([^'"]+)/i);e=d.match(/width=['"]([0-9]+)/);h=d.match(/caption=['"]([^'"]+)/i);j=(j&&j[1])?j[1]:"";f=(f&&f[1])?f[1]:"alignnone";e=(e&&e[1])?e[1]:"";h=(h&&h[1])?h[1]:"";if(!e||!h){return k}i=(f=="aligncenter")?"mceTemp mceIEcenter":"mceTemp";return'
'+k+'
'+h+"
"})},_get_shcode:function(a){return a.replace(/
\s*]+)>\s*]+>([\s\S]+?)<\/dt>\s*]+>(.+?)<\/dd>\s*<\/dl>\s*<\/div>\s*/gi,function(g,d,j,h){var i,f,e;i=d.match(/id=['"]([^'"]+)/i);f=d.match(/class=['"]([^'"]+)/i);e=j.match(/width=['"]([0-9]+)/);i=(i&&i[1])?i[1]:"";f=(f&&f[1])?f[1]:"alignnone";e=(e&&e[1])?e[1]:"";if(!e||!h){return j}f=f.match(/align[^ '"]+/)||"alignnone";h=h.replace(/<\S[^<>]*>/gi,"").replace(/'/g,"'").replace(/"/g,""");return'[caption id="'+i+'" align="'+f+'" width="'+e+'" caption="'+h+'"]'+j+"[/caption]"})},_createButtons:function(){var b=this,a=tinyMCE.activeEditor,d=tinymce.DOM,e,c;d.remove("wp_editbtns");d.add(document.body,"div",{id:"wp_editbtns",style:"display:none;"});e=d.add("wp_editbtns","img",{src:b.url+"/img/image.png",id:"wp_editimgbtn",width:"24",height:"24",title:a.getLang("wpeditimage.edit_img")});tinymce.dom.Event.add(e,"mousedown",function(g){var f=tinyMCE.activeEditor;f.windowManager.bookmark=f.selection.getBookmark("simple");f.execCommand("WP_EditImage")});c=d.add("wp_editbtns","img",{src:b.url+"/img/delete.png",id:"wp_delimgbtn",width:"24",height:"24",title:a.getLang("wpeditimage.del_img")});tinymce.dom.Event.add(c,"mousedown",function(i){var f=tinyMCE.activeEditor,g=f.selection.getNode(),h;if(g.nodeName=="IMG"&&f.dom.getAttrib(g,"class").indexOf("mceItem")==-1){if((h=f.dom.getParent(g,"div"))&&f.dom.hasClass(h,"mceTemp")){f.dom.remove(h)}else{if((h=f.dom.getParent(g,"A"))&&h.childNodes.length==1){f.dom.remove(h)}else{f.dom.remove(g)}}f.execCommand("mceRepaint");return false}})},getInfo:function(){return{longname:"Edit Image",author:"WordPress",authorurl:"http://wordpress.org",infourl:"",version:"1.0"}}});tinymce.PluginManager.add("wpeditimage",tinymce.plugins.wpEditImage)})(); \ No newline at end of file +(function(){tinymce.create("tinymce.plugins.wpEditImage",{init:function(a,c){var d=this,b={};d.url=c;d._createButtons();a.addCommand("WP_EditImage",function(){var i=a.selection.getNode(),g=tinymce.DOM.getViewPort(),h=g.h,e=(720)?\[(?:wp_)?caption([^\]]+)\]([\s\S]+?)\[\/(?:wp_)?caption\](?:<\/p>)?[\s\u00a0]*/g,function(g,d,k){var j,f,e,h,i;d=d.replace(/\\'|\\'|\\'/g,"'").replace(/\\"|\\"/g,""");k=k.replace(/\\'|\\'/g,"'").replace(/\\"/g,""");j=d.match(/id=['"]([^'"]+)/i);f=d.match(/align=['"]([^'"]+)/i);e=d.match(/width=['"]([0-9]+)/);h=d.match(/caption=['"]([^'"]+)/i);j=(j&&j[1])?j[1]:"";f=(f&&f[1])?f[1]:"alignnone";e=(e&&e[1])?e[1]:"";h=(h&&h[1])?h[1]:"";if(!e||!h){return k}i=(f=="aligncenter")?"mceTemp mceIEcenter":"mceTemp";return'
'+k+'
'+h+"
"})},_get_shcode:function(a){return a.replace(/
\s*]+)>\s*]+>([\s\S]+?)<\/dt>\s*]+>(.+?)<\/dd>\s*<\/dl>\s*<\/div>\s*/gi,function(g,d,j,h){var i,f,e;i=d.match(/id=['"]([^'"]+)/i);f=d.match(/class=['"]([^'"]+)/i);e=j.match(/width=['"]([0-9]+)/);i=(i&&i[1])?i[1]:"";f=(f&&f[1])?f[1]:"alignnone";e=(e&&e[1])?e[1]:"";if(!e||!h){return j}f=f.match(/align[^ '"]+/)||"alignnone";h=h.replace(/<\S[^<>]*>/gi,"").replace(/'/g,"'").replace(/"/g,""");return'[caption id="'+i+'" align="'+f+'" width="'+e+'" caption="'+h+'"]'+j+"[/caption]"})},_createButtons:function(){var b=this,a=tinyMCE.activeEditor,d=tinymce.DOM,e,c;d.remove("wp_editbtns");d.add(document.body,"div",{id:"wp_editbtns",style:"display:none;"});e=d.add("wp_editbtns","img",{src:b.url+"/img/image.png",id:"wp_editimgbtn",width:"24",height:"24",title:a.getLang("wpeditimage.edit_img")});tinymce.dom.Event.add(e,"mousedown",function(g){var f=tinyMCE.activeEditor;f.windowManager.bookmark=f.selection.getBookmark("simple");f.execCommand("WP_EditImage")});c=d.add("wp_editbtns","img",{src:b.url+"/img/delete.png",id:"wp_delimgbtn",width:"24",height:"24",title:a.getLang("wpeditimage.del_img")});tinymce.dom.Event.add(c,"mousedown",function(i){var f=tinyMCE.activeEditor,g=f.selection.getNode(),h;if(g.nodeName=="IMG"&&f.dom.getAttrib(g,"class").indexOf("mceItem")==-1){if((h=f.dom.getParent(g,"div"))&&f.dom.hasClass(h,"mceTemp")){f.dom.remove(h)}else{if((h=f.dom.getParent(g,"A"))&&h.childNodes.length==1){f.dom.remove(h)}else{f.dom.remove(g)}}f.execCommand("mceRepaint");return false}})},getInfo:function(){return{longname:"Edit Image",author:"WordPress",authorurl:"http://wordpress.org",infourl:"",version:"1.0"}}});tinymce.PluginManager.add("wpeditimage",tinymce.plugins.wpEditImage)})(); \ 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 9ef7627f545f33075e43f54fbb15de318b4d00c2..b6d58bd8250f255acc3c6758ed89d852f08088b8 100644 GIT binary patch delta 2401 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 delta 2396 zcmV-i38VJ2>;}K8ph|2Oo;p`W-k&)W4_-`((>Cyp zb9(SFa8ZNz@FlTZSt+j+ng*1WrmWIClV!~=n(Re;RH zw@o?3jJ370hX>rJlDp8;^E3Pc^0ZIY`VqJH8MwV=E_$gLvH{`zgkaQg)?wKvF0>6- zCME(aH*meKoSdH@ZqCo&eEsbY2mH5xiywdxaZ1#73q~lQBSVQu{vu_T_`;Uj6I1}q z+&Gju$>Hz=N^h73{0sjrbYR(BRx+v-nAie*(s2RyBSQtiZMOMx`l=wnk(eX8DDl=$ z=aK<|c3T-PT29M2%_^gz&DI2WEoV+-1++tEq%(Y3E{5{5^4iQ`!NoQQ;Ihhp-l^6W zJ8(7d`Z_flXc-AMvJE1V6Tgllg_4%gqlam6kf)R}M}{tD4~K)pPKFE}PDYYQNNn}G zmXe#a!36|y1Ze9jh@*5JJvxLxmBWW8=^ACyP??m<%sLUuq>u1Vfq&5PN0FAL?6*st z!Rm>SVdY5A34?7hE2=HO){-xOWw#Bs2YSePsmeQ6$tfq}N1=Y8A^HWiDSrda#Y}D? zq?3=VeG!#A9YEB1BckRp>whx><$o0ms~9)mW^pDP_BBgSKt{OW;1SQ&Mf>sWw}-*d z3Wve19l3j22eq_?N%Y_y^N``+l4~<^^(5@8kbVuRv3lYC#EU6ib{U@qCvlMZ+!4!( z%4%3p(JH@O!o!EAKErQ+brv1mWyVr8w)UqCN%xsCRNpaSeEcbDv-<47VXNt~`rQB6*!)Smt(zsWf5_N!)-HcGwY!4wpBUfF9-^OM-G=j#gW_j*f( z>km2})9X#cX-)QizA+f>)3O8*DHdYo{id^akf!HnsvJMqDE98NCbgzLw3p0Lz%qVU zzHgU6%l3^-U)2F%i%Z(A;J95bRlEb$WcI&P{Xb1;e&O_S ze8)KpQ=0dGm^9ShJ!dtv=IpP~nvImE)q3&I`!d-!_}i&AeXvPW?t4o{?@YUyC9I{X z!gL$i0o<2pBU6M%iVeg=l`NCBO8QiW+8G7C7)X>oqD~uM1s`+`u9BjAB($iV<@#0J zh3x>&5$NPk+LG!D7ug%tiaNi!Y(j>Hh?w*BuEVg9=l)}H~`b2<%8Qr z;IbioS}<9rE(!Wkv@Z%3C(W zEb|7FOHul68V<|9E5o@EIr^J;4zD6be6u7WF-~Z~2fbiwXb_mrxIE_r*PUJ~G3mAg z1(|+la6lFp=yygQ(E`(nj5_S$lNk9mGZ`m;0Eukh3xd>lMo%PGSMyhE=s2z51qrXZ z@knw#B_B3(!{o%?*Qxi_p;#;BemVL5hCH;Q9;2>?#%X>m&4a#_cSG*E?)2umVdLpF zh};O&qM%hMp2e3G_|sFVlB7!r$wh{;zD|YjWB$rJLN4Pg$7uyp|2W6fa>8xsA#yUmSQ1(Z@=>9|FYtE zekHDDyjdP@=;*?02*|2EW4zZUEs%I+^&6=AHQKQ$@%5IqKv*>Z>IH>wmS2?2@@-qj zLVsW#*>O;8*12m{P10>u*gA77+SdA`V2v(PUD2mSHU1DCB+lj<1GpE2%T48&i6+51 zN3aRj!oj54y`Vgk5+g4w7SDe*eo29H{@OG3Ep20l3#=--ZrqyFSiT0!Pxr4nr0@)m z*~KI9oRGYHQGbN?lxc_BjNz%JLm_q9hb@@>p*GcIp`ocAp-gnfx4Y(E19Yo|N4VW8 O-1-wv=wsy!nFIhCf~=MR