From 9a1d80e858412c9034b618e8264356984cbd7efb Mon Sep 17 00:00:00 2001 From: Ella Iseulde Van Dorpe <*@iseulde.com> Date: Wed, 29 Jul 2015 23:45:25 +0000 Subject: [PATCH] TinyMCE: wptextpattern: stop propagation on undo See #31441. Built from https://develop.svn.wordpress.org/trunk@33512 git-svn-id: http://core.svn.wordpress.org/trunk@33479 1a063a9b-81f0-0310-95a4-ce76da25c4cd --- .../tinymce/plugins/wptextpattern/plugin.js | 1 + .../plugins/wptextpattern/plugin.min.js | 2 +- wp-includes/js/tinymce/wp-tinymce.js.gz | Bin 146837 -> 146842 bytes wp-includes/version.php | 2 +- 4 files changed, 3 insertions(+), 2 deletions(-) diff --git a/wp-includes/js/tinymce/plugins/wptextpattern/plugin.js b/wp-includes/js/tinymce/plugins/wptextpattern/plugin.js index 291264768a..582b42965b 100644 --- a/wp-includes/js/tinymce/plugins/wptextpattern/plugin.js +++ b/wp-includes/js/tinymce/plugins/wptextpattern/plugin.js @@ -35,6 +35,7 @@ if ( ( canUndo && event.keyCode === 27 /* ESCAPE */ ) || ( canUndo === 'space' && event.keyCode === VK.BACKSPACE ) ) { editor.undoManager.undo(); event.preventDefault(); + event.stopImmediatePropagation(); } if ( event.keyCode === VK.ENTER && ! VK.modifierPressed( event ) ) { diff --git a/wp-includes/js/tinymce/plugins/wptextpattern/plugin.min.js b/wp-includes/js/tinymce/plugins/wptextpattern/plugin.min.js index 67638d4f61..3972ccd736 100644 --- a/wp-includes/js/tinymce/plugins/wptextpattern/plugin.min.js +++ b/wp-includes/js/tinymce/plugins/wptextpattern/plugin.min.js @@ -1 +1 @@ -!function(a,b){a.PluginManager.add("wptextpattern",function(c){function d(a){var b,d=c.dom.getParent(a,"p");if(d){for(;(b=d.firstChild)&&3!==b.nodeType;)d=b;if(b)return b.data||(b=b.nextSibling),b}}function e(){var e,f,g=c.selection.getRng(),i=g.startContainer;i&&d(i)===i&&(e=i.parentNode,f=i.data,a.each(l,function(a){var d=f.match(a.regExp);if(d&&g.startOffset===d[0].length)return c.undoManager.add(),c.undoManager.transact(function(){i.deleteData(0,d[0].length),e.innerHTML||e.appendChild(document.createElement("br")),c.selection.setCursorLocation(e),c.execCommand(a.cmd)}),b(function(){h="space"}),!1}))}function f(){var b,e,f=c.selection,g=f.getRng(),h=g.startOffset,k=g.startContainer,l=d(k),n=m.length;if(l){for(b=l.data;n--;)if(0===b.indexOf(m[n].start)){e=m[n];break}if(e){if(l===k){if(a.trim(b)===e.start)return;h=Math.max(0,h-e.start.length)}i=l,j=e}}}function g(){i&&(c.undoManager.add(),c.undoManager.transact(function(){c.formatter.apply(j.format,{},i),i.deleteData(0,j.start.length)}),b(function(){h="enter"})),i=null,j=null}var h,i,j,k=a.util.VK,l=[{regExp:/^[*-]\s/,cmd:"InsertUnorderedList"},{regExp:/^1[.)]\s/,cmd:"InsertOrderedList"}],m=[{start:"##",format:"h2"},{start:"###",format:"h3"},{start:"####",format:"h4"},{start:"#####",format:"h5"},{start:"######",format:"h6"},{start:">",format:"blockquote"}];c.on("selectionchange",function(){h=null}),c.on("keydown",function(a){(h&&27===a.keyCode||"space"===h&&a.keyCode===k.BACKSPACE)&&(c.undoManager.undo(),a.preventDefault()),a.keyCode!==k.ENTER||k.modifierPressed(a)||f()},!0),c.on("keyup",function(a){k.modifierPressed(a)||(a.keyCode===k.SPACEBAR?e():a.keyCode===k.ENTER&&g())})})}(window.tinymce,window.setTimeout); \ No newline at end of file +!function(a,b){a.PluginManager.add("wptextpattern",function(c){function d(a){var b,d=c.dom.getParent(a,"p");if(d){for(;(b=d.firstChild)&&3!==b.nodeType;)d=b;if(b)return b.data||(b=b.nextSibling),b}}function e(){var e,f,g=c.selection.getRng(),i=g.startContainer;i&&d(i)===i&&(e=i.parentNode,f=i.data,a.each(l,function(a){var d=f.match(a.regExp);if(d&&g.startOffset===d[0].length)return c.undoManager.add(),c.undoManager.transact(function(){i.deleteData(0,d[0].length),e.innerHTML||e.appendChild(document.createElement("br")),c.selection.setCursorLocation(e),c.execCommand(a.cmd)}),b(function(){h="space"}),!1}))}function f(){var b,e,f=c.selection,g=f.getRng(),h=g.startOffset,k=g.startContainer,l=d(k),n=m.length;if(l){for(b=l.data;n--;)if(0===b.indexOf(m[n].start)){e=m[n];break}if(e){if(l===k){if(a.trim(b)===e.start)return;h=Math.max(0,h-e.start.length)}i=l,j=e}}}function g(){i&&(c.undoManager.add(),c.undoManager.transact(function(){c.formatter.apply(j.format,{},i),i.deleteData(0,j.start.length)}),b(function(){h="enter"})),i=null,j=null}var h,i,j,k=a.util.VK,l=[{regExp:/^[*-]\s/,cmd:"InsertUnorderedList"},{regExp:/^1[.)]\s/,cmd:"InsertOrderedList"}],m=[{start:"##",format:"h2"},{start:"###",format:"h3"},{start:"####",format:"h4"},{start:"#####",format:"h5"},{start:"######",format:"h6"},{start:">",format:"blockquote"}];c.on("selectionchange",function(){h=null}),c.on("keydown",function(a){(h&&27===a.keyCode||"space"===h&&a.keyCode===k.BACKSPACE)&&(c.undoManager.undo(),a.preventDefault(),a.stopImmediatePropagation()),a.keyCode!==k.ENTER||k.modifierPressed(a)||f()},!0),c.on("keyup",function(a){k.modifierPressed(a)||(a.keyCode===k.SPACEBAR?e():a.keyCode===k.ENTER&&g())})})}(window.tinymce,window.setTimeout); \ 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 d6d7963e9aaf33bc0301e953a1c31426c03769dc..a1c6e84b46f58e3f9e441d0653b0edadd262f6f7 100644 GIT binary patch delta 2444 zcmV;733K+9`v{u*2!MnEv;rEn5%129w+4WLZjd&zt_Bb-Bpu)rG=y>Sg=is9ibS7$?$HhD$0cz|r zSlkf~+_P~L6)Vc;gXMg5e9Z=)Yw@xmLhDGN zu-P$|L^I_8@!X^D1aD(AF&QU8g3ytLid^%8i2OJ7ZIDuEyoJRsjYx4V>6_Bb=*Qo3horc|fcoo(6)pptG`IZ!RN+P5GC6aEn9w zT1JyC!QqA^ri~=Q(MX^lKI*J6Zp&OFCXYLeF@ds%l+Ryn2XeFxmpmGfNlF8d0&(m{ z8Vj+u{qTM!+9nQxe-a?M^X1o@^L-2Rab$ZQ&m}!}*M2Yj3ShW$->lK>bXwq%HOpfb z6nNpBRlndOY|YQ=&0oO6C-R0XprzJM=k0s;9x$;6@0-7!K*f{nVAs+IufA5Ntz3w| zm%cKL29e>Dznzf0m7IKo3^U0|{P^)V{O{2>-|X%lJw2p1fAID9N4vY1-^}o5K(wYpej6MgAP@2V&Q!SG|Bx7`fB&0gIXm9qD&Crc6~V6gngVbHJyAkJn550o5X!Btz{CXofZ21~(%pX2W@loBKBkFLR$_Eag!K^Czg-xf_ z*Cx$5ieyr>z~#u=1hM{C4Dz-A#y{K3RQ0( z-@7##h7%@fKex=|&<*=LJzGr&fB~lf6Kkc@e^J~eSVC^Z^E6xNdOr68Mn;Ao$Y-~~ z&~2VWpr*X5uqT3vJIrhDUP+ln&kibD&DPnVmN1Wo_|P@~vtylNpA<92j}}hUMpF8T zXtyRqQKvj@IA*p>>`fBBXWnBx_h=vQf(oJm9N|DZzTZ%dHd@nnCub(40uFa;ZktUT ze><>gh(>_QFcpQ1;$Tuzfram|pwLl@5*qLQnUI(h5e2Ya@pWBtnpA!DdN>CD%9#>3 zF02@tZM*td;RTpM(m-fZXqS}n%(lSpY<p$XYz}oc@Eu^)z=Y%83x^`obu8x;1xBvL+^?S7$ zkD51QsrTVc*B{l8pVE36{9+iUp#}iugM`+4zo}JVl3ZJ10zq_tx8DBn_kX-se+S{6 z6<_}H>(BTC8|x}{ues;cj0<;VdROoWZ|3Ex+7R`6$1RqPH-QnP*N8ML7R?8nD=h6FCt z;w?6?hfQv{uwU>IT5*r6r?^*`dIlPqLMdi7C43#npl&YU*s zP#8H&F0(YTt^lacUljqB2VL$?UZeRyGccnHidnveX|sntkW`T~+vKB*%&-V3_&u*~ zc$I7wJN{L?Djmf}p;uE5D6J>j+wsTu)fUxg5LiS9%GZ~~H0$kTv$@h2e`aJKvc()V zZ85776|#1-{HM0La5|!>KU~~d$PDMvnZ|i zjyxQMr;@6|)tZ;S3be+U6te(|s3Y@kB)xWCy#QN(PnuBcy{4hNp!7yZdBcK zH*Jv=JIUS^(s^BMV>W}-UT$Og1F-X zUf3L!a%y#8Ux~6-bUdJ^_P*BaOP|#eEZYzs)_%bFx3WOpen60{8et{EDGB>tInW-X z1y?M{K~z31UI{hzMAK6Z?ss^_Ux)QN)mnQc+H){U5>6YP3i;K49l)*9vfti=6}sMz z6>5z|wSV`+dy1u3J5^4@62o)7B?_D7?q6_tPUUhbmvWZJMR=p`10Fjv7taxp{r>^c K)g!u8z6Jngg5qlc delta 2439 zcmV;233&FJ`v{f$2!MnEv;r9<75jf#EzZ<_U>GW3RyCj)>o$4UMR{O+ErF z|Dxk-w&7fhBLxv!-*VpH;!|<5hfvS$NCthHt*Ga?QlKcrcW1-`5S{)mblOGqNLu$U zbw{J$;L%h;H@V-#t*4`ye~C~rnoHwk5~hxhe^6?Pm4DJP%N|5kQx=YEUVr>y(>O)? zkw%P6qq+-^AbS_vyn)p`XXD|VGsP>lLz!GO@>YvAQc*e|LLGuxj^QGjDF>kD9(^a+ z7n@JXIL{H}iY!#*nim|RN8M}j=MAUw?+o_I+|-|bY5f(4cpBFVh!;$5I_Z;cm;cN84PU7zvP2k9JSXn%4&)KHY71^Bnb{U z0{!r5W<_dS78$W>++lACl)i-phqdj8_cKu_ag>u_ z#hov|-kk4Su#O|!f4O)r8L+$dd*M0&+m!oe4Opi$|BkF#9PmOgm(wK{F(LR`A^mEk3b44?e%ghZ<3 z#FN)&VWK81{{()2rr-*`kUdL*tlP`P`9}M3l`DXZLhCc(MH5Jv{ z;L{O&0ir}!bbZ?}aGK{Irj9chAF*R%u*QzD-6@H$swKe}Sse7XE}-pJiYaF^Rm&a9 zOx^m8K*Wo8e}g{-a|Mv7EqS!h_%3u_*^8a7;F-e>KsKQykn>PIzeOEK^xEs@lYH zh z;WOy&=8USBBC50N!;dEHAsrxF;dCnoBNqis+4gJ)Nq!gaG5oLs34$fdI_ zZ=lVGf2r{6jpVT9YqY(7_$+kezO&l-;oB~X&l`%(gmtYCG5zo_Xq3hh-e+wA=7_J_l-3CLqd5&_L@~*#GcCymUuw!Zt0sBlSR{YN|vSb;vGg|xQzoNxqL*KQ2b)$x+$_8(upey=v;QS)Xj z^*+4m`lA}SQ(7;B>kA_>)G(fWkkDH1H?;~(l4~mxAc*eo*4rQc{*U+SAiT5Uf6HHf z{TW|i!&#;7HTRsFaS^Rdud8YdryfE=qPu!A@t4s1F{|k>OO*-Dd0Yw``pQ;ZHnhel zF3edr(8LxhV$(`&(M33qiLh}#;rlB72>wi}ifMsKYPJtOgSI7r{rDKqkfUWJpv&FKYcwBd24++ND$BPpZT7GSk_~cZTXl4i85Y6)zUS2quad1| z$G?hKr7zeh^lHihrS(L6JO22-+M*f_0*mNC`TCNWX1$$kHdp$>jO;_Uf0(1DEoM~$ zKh|#6-?lQqkPVyFU$#;0jA=#g=siep{<3i)-K$)Gc%$#|j%>!}OZTnA>b~_QTh^UB zmYFMb$eJy+*EDn&T3%@pxl^niSYUc(Is@55 zHIQ3)6>}oNIl7sRi)8TwjJ}_eu|KQC!uG4YuLX@{N4+J@!O7>Tf9jpzjjDU@rn0SW zGNz;s7rg0~3;Uh5&V3R(! z+o9SDB|sKD%E$PSg@-F5>G~?Qxl;8gMqVo0i>Xo(+tzWfB-s%VS7tG-H#1eXwW#UT zvWC+Ox;=*yx73Q9e>XN(xecEJXYY$32~7CH7O)NIC;e5tbza%)y98w9kp9Lgu2fX3 zm=~;1Tx7Un?D}$@-PK)qM2anD%JVv4L)DVoT%N7EUS*2C$g}3ryMRVjKy_S93!9@- zeya|$D^b>pjtBJA-q)Jl<+EB2WgDf#+7B4wRu-rm>ycH1d8kA)>3cT5GRFdyY3r!fB)5Aiw&r!?0Ca_S<{lK-b&hK&`Q; z_V0cKPqFlBzsYG>!gQ{;1X|PF{R=+Lsa!7QQqJ