From 4aac4837f27c1df2fdfc6b8999c4e22a022b3a66 Mon Sep 17 00:00:00 2001 From: Julia Radzhabova Date: Tue, 25 Aug 2020 14:42:51 +0300 Subject: [PATCH 1/3] [PE][SSE] Bug 44511: update help --- .../en/UsageInstructions/InsertEquation.htm | 6 ++++++ .../help/en/images/convertequation.png | Bin 0 -> 17210 bytes .../ru/UsageInstructions/InsertEquation.htm | 6 ++++++ .../help/ru/images/convertequation.png | Bin 0 -> 21148 bytes .../en/UsageInstructions/InsertEquation.htm | 6 ++++++ .../help/en/images/convertequation.png | Bin 0 -> 17210 bytes .../ru/UsageInstructions/InsertEquation.htm | 6 ++++++ .../help/ru/images/convertequation.png | Bin 0 -> 21148 bytes 8 files changed, 24 insertions(+) create mode 100644 apps/presentationeditor/main/resources/help/en/images/convertequation.png create mode 100644 apps/presentationeditor/main/resources/help/ru/images/convertequation.png create mode 100644 apps/spreadsheeteditor/main/resources/help/en/images/convertequation.png create mode 100644 apps/spreadsheeteditor/main/resources/help/ru/images/convertequation.png diff --git a/apps/presentationeditor/main/resources/help/en/UsageInstructions/InsertEquation.htm b/apps/presentationeditor/main/resources/help/en/UsageInstructions/InsertEquation.htm index 83bebdcaa..0664c8c50 100644 --- a/apps/presentationeditor/main/resources/help/en/UsageInstructions/InsertEquation.htm +++ b/apps/presentationeditor/main/resources/help/en/UsageInstructions/InsertEquation.htm @@ -89,6 +89,12 @@
  • To delete an Accent, you can right-click on it and select the Remove accent character, Delete char or Remove bar option from the menu (the available options differ depending on the selected accent).
  • To delete a row or a column of a Matrix, you can right-click on the placeholder within the row/column you need to delete, select the Delete option from the menu, then select Delete Row/Column.
    • +

    Convert equations

    +

    If you open an existing document containing equations which were created with an old version of equation editor (for example, with MS Office versions before 2007), you need to convert these equations to the Office Math ML format to be able to edit them.

    +

    To convert an equation, double-click it. The warning window will appear:

    +

    Convert equation

    +

    To convert the selected equation only, click the Yes button in the warning window. To convert all equations in this document, check the Apply to all equations box and click Yes.

    +

    Once the equation is converted, you can edit it.

    \ No newline at end of file diff --git a/apps/presentationeditor/main/resources/help/en/images/convertequation.png b/apps/presentationeditor/main/resources/help/en/images/convertequation.png new file mode 100644 index 0000000000000000000000000000000000000000..a97a5bea221f7b28fad43c6411647cfca8b5f515 GIT binary patch literal 17210 zcmch9cTkgW+a(}~fPjh`l%^;m(iEhZh=M3py3!E=>AgdOpdcb3(m@DPrB~@B6cK4g z=@5DgEeSmdA;~`c-tXJlZ)e`wo!y=NBNOgC#IMcsrb#k4m9W;RJ2uSXsY8`j%^r#Hj~Gb7v3~9 zY(Gw3w8_G3Tr@Nfkxx}s3L<9D`>vGd`}Sv=-EThrU@qbo+BrYs@j&(5Ih6;uXs;v_`8{BJFZ?UJ;F*#$ z3Ep@z+^RAZH@PS8%#LUqn{~j1uMZc2(%-*-|3jmE9&z&ip04%%`zL3G+GBvmr++op zueV%v+gRGbD2T2l?&?EKL{}O{UiH#|u?6_)FcpW;QL+hiaILbz zE`gO>_D`seUFTaSw-B}R%0j#_qO{(MSPmH(fh5m6%R<971yKP)JS+aA`VdX+!r*Ow ze*Sy;7eZK5HJQ}!r0ljh71N7LCDWaJ5H`+KwRjs*nzC!=Bw_UTpS#o8mNJK@daOeC z6GHDpE&rs>HXuSF+d_!$VpZZ+Es`E4fr6oK=@3QrO_@*rm#ULSLnWPWU<@thnf#t< zv6s0S4nMwJG-t;#U&{~}PNJOMKH_N|dBwb~{}7)1dhzo7QocMr;db&w!L7ea0ma54 z?PvTg;uR%0g^ff<56>kW=g^3c>cCGY$Ac};g_K;`^;LNPC`X2Gsz7|YqpAGdl{bMqOhC$sjWn7t$4owL=beYt@il}N^b>MXQTNmfm z`qm=Y?O$Xy`<5A(p9;U;%^T$LQR#R)qTZ$}h)Xfx(~Rs^(D*`=1FYJLym2RZtJ2M*++f^O7y})^8t{swsc@L8Q#pA}7)o}##>V@-9b!jd0&q}*ZTT42?-RB5D z*X!-}ZaI&v8E^PU4 zKKwXh;^P&`t=1pgyh=f)QE@!3n`7l}&EnFbHVES2fwbS2?0A+}-}siy_+=}R_wQfj z(unJyhLTWLu77egr_tJC?YPiz$Y6#P78>)2z4kga`1@eG5-LtMw^TdxFz#T(H$1c^ zpxRfVq$Tq-ZZH5D1Pgfi$HWDht%Svs+k#=QEm|&9e^aXwv9*=3BVXs)<8$NU{GX%g zTAv6h5r5E=D0t|({dCvax+Ya7$nP(cWA&~I3d^4s9}M7@QpK&@K<0P8^S`fL2WaX8enY1bh0c!R2$w2D|dQW~2q_I6OKY1G%`%VRSgdLB( zPnB`GDdVFHw2*##h1-VVg6&X@bCGGe>G$bS!b*SYWCL8PolSN=>_?-V7(vE)OeAe; zixEutI;cZW-ieR(?jWNPgn}%OhdAr9$ry2EcSatcPr+%rsy9u5DSJop=3}EhclXv= zrHjUi&zdd2J0%}5Gg!Gir4O(Qr!K~bn}^{A_8C|%H(EoccY0bV-7%Lh z``@4Urw-`p!;# z6Po)pJ0)7_6DPu^D-!7EvKNxB8zVAXZ|dl&^gMMLkXM?q-TYGo9q zk`;l`DK%?wyPNN&Hh0Tp2Bm1#;Fc8}4u_DBDqtJ_VrST#Cx>Qr>ATWv?I$-zg)yHs zPos8v@Lt1)QZTe)8;)As#`7n7Z`1I9qx`n2 zmBN*4fmkqsa!0IRr7^8tl_Yu0PX8d-MpWA~O1ZgEiAdFPk-JMEQPZ@u*m-`(qy5lQ zqGk&;<_EA4mp=w0-YNJ`EkyCz;K{^U>(_3#&)aX-w3%^>-_-EB&!Wk+-NDG`(ParC z&Q%;`{CsuhI0hu{M>bp#dwzG$NWlt9mcq^w*1&N!W)Qp?$s(7+uDAk?m@b0$u4YeZJ>^Hq=47t%_4yUVIsED$7y z%c*w+$S!)DVnBfDAe0aX&(>~>B?fE#THe9Z*`>XWU&&+Um=wI^+sI_<^E(CpiK^IFp?(<{M zzHp4l4(to1VDWGqrKpt=Ht}R3Mh0;VqlUca;X7^)yFg}@F?W6xdEAGwQdFWAfoEVL zZ`d0oD97kv4${0ug?*&&+a7N{{F+tIR2zQQDmS^^{1B(Lq*fxyK)5QF$}x{}r;Z;T zDv4fsLQJ1N#eO{bIG&OyEN92TI<(F``5mQPKv-*?vW1u$ex{DM-Pl6lFwB9FrCYf-I znwxzIgnyrpz)tlrY1wLF0~n#M_V3cg$1`{|`a zN?%QI`V1gQUs8Gh#m2TZr7?%_3pcTCc(;a+QG8czH^(d4BMa-D$19eRBQ*=btIj6H zch-ksX3~l-jeaw;C7}?DKLy?(e3m@pcP8iYtx%dcG>0i;EDJHFVVmH)IhOL8=b7ro zc>(nvdZSrG7<{*{e~fD8&`dG+c!&hT!YWB}`jHQ+-p$wjmBMCO?TiQH@n{ip+&p^w zTV68?Oi`X?Wnc0w`4Q^Y8wWzG?u7i9${B=+Sk>Qe(%lh0C3dX~MB}VX5+QOl z0uT~q5|1-_sfaWQS>l>Id!$OwXbvH+$S}eRPA_)f#=%JygINkPc0IVa4X!gU8AmFz z2#7(qCgS69oughs6YbjKO%4GCY*SF{#LB^V(S#<4RUL27VHI{J-g6X#(}9l1$*n#& zk#HHRD^}WB2A6yEu$6|+zj0GeQAw0t;=@TlYe0yH6JLHU`4{Qd-rxY4 zD?V9AjUXBJqM)5mAmWy-zl=sJtq@{OB1aB`A#=bwnO^;!jxpU-K!4ermi5><=*v%? zF(VO(s6&i`#z%0?X2Ky7O6e-_Re2dIg8PP5XSBul*-^0*)r}ceH{E>LEj6C_>VBT% z-P;p|WE|ECQw8ltr3H6PZjpN~ibyD;FV;MJ2c-tX6u%2aW zTY%#6U?JPHaqj8Xg2+;eStKgLmbc1M@XM!ROju0-e#S9+Xt~Jv$EmRB1L@Zjf2Qgj zmn?5{{8U<=?TZ4fVg9fmyoWN`;_Wg%+o&TwfZ1q`50M03>0?R5CT zDzrQ&Cxt}JL`Pifh*@=&ai4VwB^`R>Kf{7Hm`HO}o(;N}z8tLEc9WLLPl45OVJ0G# zxg#Qg-e1E!Y3dGtqse`2i^;nz1(uoNnfqsaragPiGV3ws$ugj;vthIjE$!;gZi-~> zoFbq8w)GTIGo$`_OCCLigBcuTTnusS^$&P9yvciUzTlxp<-ta2)Py&Z(yybqlW)C7 z=|SPLL$Oz!XG&s)uiy+qt(Y1=$u4eJV1294H2hj6nt{4;AFS-N6mV_V7AZA`tW#ak zqxB*VP=R`32V5k$GoX}Tvu2!Mw!)eX-$ zm>MsA|F#~I#M#ppFyjqM=mScnm7hptz~rxF>K=;%t`$fB$T=Gco_oGX2}X-qY~?(T z)x1B#A?-dJ*6YeQl5d&7$-wNxi=l1s`d$%TXb=MlTF3MJwN3GSaQSdadlo_9E` zmOlhwY{Reu&6LJldhBK1Ii$(V9u`9a>v3r%{3Vx++u6vBL5g*X>tu6*;b8lR_eqfe z2Vj1--D;m?-x8~qKuE5bM3D*gdlN4^MVOYN%MHLxbR}q9KRj|14BpAhz5NC z!+r)D7@#T~6ig2OTN_*HvH+@k^||EAL`V{jXmNGa2K7S-p;i-pI>bcH>KN<9;NJ_T zk204p4l1sHRHCC=5*fb&FHLr~j{p5lCrjQJ2qmRQVkQhgaK$Pcq}tQ!x2@>E6S|~H zwD@kQCN8C-@`1F|OH-L+DYYto#NCQ)=$uY|O2v#_(S+{Hlf2s?xsuyUL~pFkEj zvW{mH4nSx5oA1Y+J~UKO8n*#R0)6Gb7vv;ZQD`cFGBNxP$}T zJrQEfm68>qCeY=}%?T&>r*y6*df~^eQt)A;O$EI!JGD6FH{Y3nLha1v2GwNHCV7D!`a0FzE1D-{yTd8Y^rr6i%d}dg zGEmJgo-u3m_}WHTjHy_X?BWDL0<|0oX_ni4!j%_y6av^FQbxl1fwBQ6<)(JP#K;aM zuA~ArpDLc(eu~|vt1+m^37cjcSG^Rc@S8%xBLv0i0E)!{{lz=3r-}ButB+W;# zPdh}4TEVA*F>{z{_Vw;k&42k$6LYQ6dn@ID4p!(S<2L>JyVK|$v5uH0D@$}4?X7nG zm(A*3(z*P0dj(sl)6TZCOJ;SiZK7G+P1O7kMomyAh$AD=>!un;DH{46$=|YF70nwZ zuRID(sXbsyH4CBCq_SShd8~1vLVM#!$8XZD<5qxssPBkiY@tC$D7L=&;5(2hgM{xU zS55#BJ+UCviFQpjKM3Hf67D=4RiI72aNlIYu#4mMmB&)#NLH?CbOf9Huis#52xy{7 zoeI=-O+=<4`j>azOO4B?N5P|%`O7paUpy%f!&lVqm3c1xbbG;i^?p^kSwr)B)7m^W zL7jKqv|$Ul*xji2hNr1@iUs%zi4HK5=8~{+?O@ciXw`+a2z+tuN5@2^v3L8{@&0#ve-l^2(AQ zJ+%xjQwT;(mif$jUXhiz1b^*%aFcT`Vl|HpCk;X=z;bBuOpXo4mHAVSiP(kK$yx_S zTOcoZvTS|Ji>s;qEiW9n$$GM&`hqh7D4)*^4B7x$@K1xwq{NGG!KxwOt%<(}dtp56 zv!3kPLrP1H{#NOYf7WK(TFh{#*cIoUI8^h!xI_2CbzjOJoBK1hTrqABLQ6*xTHW zb$DBZ-?ZTo8IRA?_yogx>JwLG5RQq0x_;pFCA2TV@A&S0cmi2+@EW1)JgWeL#LXRr z;{wgp)1j-7c-<;Ih=>3496&AJ6ookT^mgohr{n)j?WDED&#UFrU+r92P@WTNj4{*& zs7rvn?b?(2*B|*b;{5y<9{u}9Z=~CC=`A%NS_S1^**Mr7Z=nj9)@+WJn%s>(iEc8( zMY{f?ljrA+)czM|`uErPzdl0bn#XU|VZ6m_1}mkiG2UW6WZ)@3XST9#E2PHPTR3O? zy$Kzka&Sf0w1nR~IiziQnvk1S>WUr$(}#BZiE-Jfy%Ua5J`bdeo8qTJ7IL}DU*l79 zDmlsTV%(XJO2%gV=Ug4Wc>YwLneT{jJ=hra>tdCe*k2!xD8`$%22`_Nk@x{nX`E+! z`4;L{yyfvxKr!&sb#Dk*Jy9t3w1&DN*O-t=v1PRqT(>gv-m~O&+pJ|tqDA`g;j(Nz zmSusQS2ARv*NKvt@hjI_So#6I#XcD|F+PbFHYl{cV+MIUocXk3*yvp=%XW(lvPv8r zthgq;-aoqJiZ8^6!%O!1ttdk$VUgpO)=9pcVxan{b1W-XjD0dRrK{@PzZ zpa@`mv}@q|)WKYc>OEd+BHn_jN0kA5Qpcyh>QIs&9%h@p1dbzE0xUME;~ zqw=?J$G?hj$quyeU(8^*{EoZsAHHsaRTGtH-x1E>*TDd46ox=Aal%daO?=_|Fsw#G z;IUV3!HrcL*(E;cv1dao5=?FVG5T^}BW(eapjy6hNR|nDsDxA9Z zs$7P!!$_kFKD6dNn*pvYK_f`M2FPnrFhzxOHx?70^scnh?vBcJ&%oIv6n!7)sMCrC`PxcwE7D?&d1|ZK&LGpdoz3X3k z{^FL4Y_AS!ACdPV7R9@?$CdBNJy689=i)eVHPe0SSHg`M2y{?tym6&SlYQwI`sT9@PP-%Lkx9p2~eTEz1zO~)bG zx^}anlt3;?`;TVqoBff2vT5m2D;9w($!<|)RtPvNm-IlhKh7=hacs@cST08Ii%4%E zp*Q0?j@plBGo+lSJ$@o~esYmQkiWAOTBu23AwsXoM+aCcki^Ptd*ZOcg&Lqa$<&aS z^1JVdY1nCRxgX(r7C$ zj)F5&dB{G?w42wdlWh4>S1*eivtt`JMYy2&jJHrnDYci4T~Xt|k8k?n{35spt-(B@+D2^e#}pMLwOl(>Dn40!H}c9{57 z+n}Eq@8$jUOCxSC51N%;u?8bOs4Pyna%OS!`vclA-HE_&84GV`>s?XSubsA%zWm5F zs)@NQ>O~EGcFm*u(K$}p2eN^6ZZlKmf~h4p*)FotLBkghA4+qd4!EaSrov1s*hcx{k+??}K?D{LvM&s)!c%Squvt5hyIGhgecAMr6 zBT9{n4px~}Ig~!5N^3Y_F2CE|e`vhL-yJW<5yt>ktfE#^?LUk1c}+t5g1@}A)6^w! zvfB~|dX#%81Kk5aQEslhJIAL!87G9$K9(IC5WNpokVZk0+4jt#x7fk)+&W#xh=QzQXsyz$w#Hn)mlWP-`9ybQ9HE&k1L>7XSXg#mJ(_I95b$yA(T8{e@Hx00)w6fR8Z_>pqnwB{j zD=Xn~A5KRD3qgguf-ZkQfvw<{&ND4_QzlFEZ4ZgwTjR%11TFr=^wnj_?HsYh`qa4k zzv{!^)!8jeTqph>(I?_!i)OrQ_dR3N^xaf)AC$4A zhsm!vKQqqtlPh0z?%TD}Pm}Jo$w##-kHkpqecu1{RI_ck&6e|)|Ma2LaA7RhZ%TLd zD!SKCOKqGl*%iUOG*PriTy#ENqG3r-$nDgfLC&{^pSt=S^9YD3A4c6E#xDc9a^hLS z!6}W`zOgly9FE!>?&O!0EHG!4a2MtU1K>K*B!v6+mk9|QheJUdoey8EU-0$kY6xYn z{m$Hcs`Rncw&d%&tehUtY9(Bb=%8s*AEI$7Waw!sY??WYPd(X6K8gPL*e5CF1g(4D z{guMEVw8g6PVV5lEk*#T6JaHNQasRv_8`LV z{20Y+n3WZAuj87hH|C^{vpzY>BP!nxgT!JJjh({NdaUj~Rzp86;NN}Y*dP2QVC5-0 z=^kwsjcyKhvbJbbydScFEY44N?Yw7h8p62SX$!s;Yh;IDBrHa)Qm*V@LOqI*R%;1| zKlqFNv8@}C{jy0hDOLP5>(ymHuM)>^xyvPDL7lmW@1$a|c&Xil*7;Y-75QD=Gmb4GA66C{A|Oze-Wq%_3r#Rhq9dh_^ytJv^Ggie%pZY#ga(mm&5= z+38-uIo1$etes?b=t`1-j%U~8x4&2eYTW(Zpyvr|XQU=?joqLB2k%^ldx_a08ftOqeXviodM6@#eY2vL* zn9156J5@*axLx5IS6ryl`DJ{0&Fg?gtYfv4(i2qeJ=moTYM=O6o1; zOBdO{UH`VaaIFo<;WKd}{5wCp(d7-Z8*~Aqu+oC&YtkNOML9Xv)RcLIIXR$jo=xM> zrUeloOfdZH%;|7I$k7Ezkg7S2?fXhC2U)z1s8n#(Xngr>LNLr__8t{m93;h-s_JJB?#Dyf#4iallxy`phG{`w}4?zEn~}v3NuP(5i|&?;Fisa@2l%Sb^~((9w*!$zbm$zaY%D;e@p2T&zdpKDy@tG*|JJlKbt@rX%#~?F%6D^YZ#+jFy8SB8ee$V(UV*Ts=DJx|-=)CJ3bp(3j;~$#jd~hCT-4ERRIA@c z--V0MWv=ImS{Z@Thq5$zm-DtMzdZYQ%=Aba0h#EMnxU@U5Y&OsU(8xOPhlYWU_5d7 z$i&#>hg__0q5NfX^DxHDQr7*`CM0Du=!LPbBGlvs01v+RGK1zW?yp1!exSPhQN4{C z39HMk{PTi2@K_hqL*|A|i*zu1f%cAJdFs2rHJ98=HAZtYml>}nF2?$KI$K9Rc)aP^ zS~$wbeuh!fv?EVIW|r$uj>@U=aNc3^nmX7kP+yPL^>3dU!8I%gwvg-yEpNDE_#$ks zX^Y*sZm%{+Tqd}FzzaW0w7ROMFh23S!2fjU3c9j>a=ob}#&U;Ps?=;=v3oq~@AG1E ztjp+TS7SJwe27XkNli~te>&vA$UBL=EGY_^1V4k7E(7)rzBra)`O{|ORA^H;T2ZbCib8wPhYx zpPfg&K|*8&w04v4*Ji)ABoH}q!;gCEw7Ob0$dq53kGuBr`$0czb>x4(i$5Rl=vb3% zH#{IhUQa=*4KJb8(A{?+@NMaVdc`WO)oAHco0-uCtN}l3F>9}l)9h_0vzNOw-Qnw$ zTJF1|n=ys&jf@Vl9SJYB{Q38AztMAP+5>*d)nL!~?wC5)GDUTL7@vwb z?#@zt?VLG8FUY;R^k8oeg;bxCQ#q2cPX_frF2S5n5rcU@WiJS*7o3x_h|X5DRU9q| z-b_eS(%Z2&X?&ab^e7NYySL5HR%oLz1Q1A+;PW)c(krSP4Kl8fT9Kg) zv6*7H%p04LZ+c>(`5i^#7L>L^DC zi)C?8iHjt{^~J5t1&q)A1Ph>!wvHPh*_PPKUUFibx8m=H4t1bFZQJz@O0Bx#-ZrxC z$K4wL!Ps%DiY!2}-^oQ|RUOCr}?fFg5E?!%G z$H&ddeeTOO*~?R~>ls&DfW&{Qlj~6wYzsIs4La9VC!)DN#f`wE>jC z3#I%0c7^D>*Lhjz+!sJ?lI1*I_%%u8C?HvYoS(UG(2dq?S|3tZ_I%(~{YaTe{3iA) zeE?($BHJan1_z|?Ht`Q93hyG(tVE4V;J_rI$_4a7KGsS@mExWIN+DABi1HSFil(0x z@gp+vTK^rG!r!%A2LI`&BNx3Yjkb z{WnJs2kK|M&WAQYq>B&L>)o4yezTPAs)ImRpakwSV%NxOuj@M*Mg@$7 z87`|@3uhS1k(d92M1wLFWNMiXskB@r9#rO6>wenStHF6@FZw{2?Wiy6)Tbj^;)<{mN-1uO*Q1sa?aNc^! znrZ1$1^u6@?cN*1yAPrVOnUUBo+x`rAP=;iCq0Jx>y&c!SG?5<1woYDn|DUH*P`W* zX8k?rUZHlB&SX={{pU$Lm+!(QjT%Pg&wY9}b#2}*Lwp9po$LlkD%R5U*HhGb{8tq0 zFU-s?8xhjPU9Z-NiYFSPIMVCQ)HEBwLB(+kK4<#OKYD2CKX`9>Y#==Eu0(K!={O!D zT{g=r?#Q%*F!ekvl}tezMSgpfXha9sBD2#Z?Vvv5gJdQTA9boAuSS)<%0)1k?g^np z64kL_H}yj9$}?8A@5wkXp;&LV!3aq$`FbfS{*!@>h&hvcgO#5njynlyc}HAM*8E}p=~ zR?@>Xq8@v}&52L`nC!^PqLDBh?-Luw0M5netqSscQO7j^6f4@CyR3;fxvmn{k4h_!(bKaIBBr@!gLadwe<9(|wu~Bvk zfrOl;z39L|>qy90kIEYCiuI(O()HD5C5eA}!(>@#lMT&Ew(E7?4oy#S-6-`V>R!94 z`+&C~*t)dUYbIV&8$F!mra(A;$){~1+1@&-v7P^BC32iYnN6cKH#K$B&vp*odHbj= z0`UiZs9vFui7x}s-21}jxcGcAoqM$a%##8urnkCU@WS0!znB(+9y;GqG=yr~F+wS$ zAA-I#AbDT6j8O$S4T2O>FM)sQUunFvYIC{dY_UW*lv#=goV}hdest0K&PO27uk@k} zbmRm$4O$g7vf%P@!sdQMTF))#;Gv150o-3soj&WKaCic-bq>#>pN@D$M(v1kV$qP z%pP%`hF}>2J|YvUJeu>oh_g>p5kP6Sw|;to=vKE zbe{B=bolL4fQ#aTOlYG~1NPkH1$(6~)=7e$z7v{fpmi_(mZ;GO(D?*&p>_uq$E;No z$Ciu+{=b}`pjS@0R!fQ;*PNb81$;=tu3Hn;6+AAM=6_oQz43=PX5S6e)v*jpy!Or@ zuD!OJL|l&{Ivyq;Ca0%J&#K2>Em)OSQ@!cHyj`HWo&~b_qb1S-lM&nTVh)!&vr)&q z_7`Vm*{&&bX17jQr|M9=GY7^(H#Zy5?5_x@r^_0&@T5-M=hG_LehW(BevSD&7~LN5 z5A~kRascP|JpvAYlV(RSkEE{kN02ZhG+JqQJB3s9H-?b!X7Bk+s4l|F+} zm(j2HBY(P=>>AaS^&@su;zEEKaGXm6yAjS=8FWzTvtm?zwlsRMFOEy*_xDA0=V|J@+ z+mrD(tSvn{7~Fz1`WJlvARC=4ntr;q9T;aS_*XdhNt=H_)>-D8DqA!PnGbQ0c?}A+ zJjKV?$17o(k;gea5NfkIAe8{~OYV7-S3$6v%lMe(hOdpcA139=0f}b@X zocVCp;h4+4b)gV9TolhTp&YiGZbLt{&=u7pjTI88olUr*-t71QwSVLBM~|6Unc3Gf zE&dI9d5;T1L|sb`j#j)oE?6qN_iav8=Q*#Q1AKJ;R7VaNn^rK&wLxH9E#rCAtPS7| zx4Jm*orGz_(s!Q-oS>d(&0y;Bo<;HD9un-o%oXJURD(1iCxaTf?!TTF<9));qh{POf{@1`km;Ct|b*F80l zIjdp3{CPEh6J+&kT~>_Yrd?D7nMiYW zba=YqaCD5mlemXQeUbB?mgRkRgCONPHKGk;8}@Mj62oXEfP|I|ytw?_n4r?K%il)t z!<%*rbius++%&O*o&Y^w;=|^?v#}&d_RkX|J~XeLJD>2O0GPfSQ;PeKedR`1ryFiH zQg>4kK1)nK9}(E*&1u=YuF~|{*cpzs&;vzk6f4&%@06{D`SU-3g_mf}6Z%1!0}+za zzuVNvDev=*1-k}NPbB2KNIsyG8)DLFLp!$-9Bd)KW2;#uQJqxR(N!minE}b2Jr#TK^#`VmE z;%D4s3tS>eZh)*N{p!~_nM#F9RwS=0v*zn5HHh`j=Mk;Euz$TK*#g zh~2GxUfmgVu(4981b8^M(jBs&a=ivTTDWkDrS;XpOb5VabN1(DtLJC=l&8g-*Z3P+ zfej{&b%d2_?D-pyCtMq5RyC-_LqMD!&7=#FJ6~t^-N_CZ<$B|p8&$qv+NW#905XmK{ z-?ab~RM)OZR%E)#zk9O4&}hT7J;8ED&p4Ff7xNB`MjwBPiL?o9g|wnUWR6tIn5 zteJOh!oRzs##k%QB<)&3h<5(x&x`IDNSZ3`@@|^|Zsa&0=x)Q(C|vp8 zH6Heo6S)uK-j^gKps~H8b`EyWHd5HtAJ|{PY5H+q>w!bo{A_b&WV}WyJTDT(#^WSvR_`-93*jwk1r)K35~MI)N5;zeoV)_p zBVeuBFZINWClq=}!BfS^#f6uEPRX+#%73aBe7NN)@GyJv@`)KLI$V&UH$0q^~0R#>1+ z8{9Cvh5&n4@^+4~k_Hwb=e_zIsL;y*BYwxH0U+YrpSZR1;+5q&ft8|91UwN&`*JzU z+0Gt}!>guK0Lm&p%e)=9h;6~ubGbEk_-##`KP$ww>L6#{z4E~qyf+}JVnuvAt}FWU z)AdI#OFv^fCQ3j$kCgM(fvW;Bl$H*8B7!<#4>VWirTf?Z=3#&d$`%P&y;A8yc+;eu zQ-UdPu)qvvkHm_GDj#om`Te}&Fu?#apO1WVK|)~VL@JI2Hhyg@3k<*R{et}aS)MH3 zx*ZOf4nli9MKbM%>`IKRgTNNDu1(gat51{t5avI@6v9&P{kI6+xR%UwhB!j=y;(vDyHXLu=vO;ZWT6P?!(+h9_CeR&2R!f(OFL;c4qIiS80oxvbv7S;{2O^a(tcm8@ zH$oubD?>-VaRf3S2kCeZX#tk^$8J&F=iqHWf+QB!`%f@~70pPg36deyiL(>LlT&X4 zfZE;->>&o#LT%cfLl(u??X^7-+;kc(N!Bc~f=U~ZckPlTkhwi!-sey!8B?t2BO zza2#{k3%HPcMop68u(&LONCTYPj6n4^~lM@e-N(lkh-MY_<7Z3{UftUmX-gEZ^xhg znoy)6NQ5H&Va}N12S5>J{jjTkuaK{EJ3S09h>vM^-EvlV03hyz>;j9a4TGLlV)?9eX6=*?WpU_x3lPA zb!XLu6e=OuVsSK_N{|{$kxBlj?f##;K)U$Vt5MEkX9GR2FNnNMn}N?(=A@e z(sh|3Wyo>BIC6XKsJH?TXj4h%g5NKU(1nrK%n8p{pgY|lvy+k;zyIPE@yXRLfqip? z!$cVEscHY4g9BZn>@yLdgph(lC+`PB@f?9hGDiIp*d{b@%X(p^hBbUY0;hf$5VoSP|9@(H{qNcm5a%wRy>OBgoPd;Q{Os8? ziFQ1&M~+kU1aS=lcBsUY@Cr2U{XfQA4ZXb(nN{&6%&<{ugmUp2SJUrx!jKTXKdF;L zE5a^4ah*B3cOJF{`C^1IQ>R1ujnv%}6I*lVEq62$iE@)Q|Q?u9^BbS?ZbQjajhmxRNslK~p( zcOW0+#H=p^c;VlgSizjQq#fJ z@wFC=E?&vnflam_+vebtd^#{8V>t}SUo+;0hOYq2T>}uC86(t6elN?+GAm=O-n~;O z*F>}Vtz921SBW?pgS$FslKzGSZ_Zp1TVrqD4n7=&hi)Zt1Wy)fn{CxfIa{n#TF`93 zW^ko~AKM`hGQ6rGT|egyR$knNzG;)Tt6{zB0~mZgBxTAT^~CudT_KkP_M8eT9~3&x z+ek$o4#kL13>9dekE;ZV=v{3bj9AM@3k+D|= zA_6atuJS=!+p&$_Z!P@Ecg>n#MT?p?-sUv>s81c&AvXiE=BC(l-Sp#g7$r=fIVTI zVhb1r50lw=%DTUbmT9Bv{m}0d#+o!8GG)X)ze+pAk)3{tC-yJWJ<2cC3j_83{rIBR zf+-tYpMakdHkhqSz{h!Zsr14&g0OR%PosFohU#z8iH@!nKihy~r<}LKSxz_W`{$`T zA{3he_s*^**a9&OKmYN3u^fQQY6!2^nN4!t#|yu+%szs8z6+kpE+KJ6QaUrF9T&ru z1)xu3KT8#0(AlKa;CVKBU+PVzf}O4l1$*_;pJhR`e=mgGNm?!Lvud#~FReiw_{*R& z4T=E3r7jR$(#lUZI8-XP_vPZbG5nk~P*mjKDto7B4yF~#& z>iez<^-3pcjmm)&mu3m#6;~Ha#&wkrHY?uh3Q>9mDeD^BlO>}<$#_LY2MO_r|g(nAS+aOT}0N5uG^e(lXTz$>|AA@bdogm=Dw5KWamzDu4XtASb z|AGJku<>YM(r@}o TMk4Tg7c@`RbW|%IT8IBP+ag|v literal 0 HcmV?d00001 diff --git a/apps/presentationeditor/main/resources/help/ru/UsageInstructions/InsertEquation.htm b/apps/presentationeditor/main/resources/help/ru/UsageInstructions/InsertEquation.htm index 3367087e6..0bd2610af 100644 --- a/apps/presentationeditor/main/resources/help/ru/UsageInstructions/InsertEquation.htm +++ b/apps/presentationeditor/main/resources/help/ru/UsageInstructions/InsertEquation.htm @@ -91,6 +91,12 @@
  • Чтобы удалить Диакритический знак, можно щелкнуть по нему правой кнопкой мыши и выбрать из контекстного меню пункт Удалить диакритический знак, Удалить символ или Удалить черту (доступные опции отличаются в зависимости от выбранного диакритического знака).
  • Чтобы удалить строку или столбец Матрицы, можно щелкнуть правой кнопкой мыши по полю для заполнения внутри строки/столбца, который требуется удалить, выбрать из контекстного меню пункт Удалить, а затем - Удалить строку/столбец.
    • +

    Преобразование уравнений

    +

    Если вы открываете существующий документ с уравнениями, которые были созданы с помощью старой версии редактора уравнений (например, в версиях, предшествующих MS Office 2007), эти уравнения необходимо преобразовать в формат Office Math ML, чтобы иметь возможность их редактировать.

    +

    Чтобы преобразовать уравнение, дважды щелкните по нему. Откроется окно с предупреждением:

    +

    Преобразование уравнений

    +

    Чтобы преобразовать только выбранное уравнение, нажмите кнопку Да в окне предупреждения. Чтобы преобразовать все уравнения в документе, поставьте галочку Применить ко всем уравнениям и нажмите кнопку Да.

    +

    После преобразования уравнения вы сможете его редактировать.

    \ No newline at end of file diff --git a/apps/presentationeditor/main/resources/help/ru/images/convertequation.png b/apps/presentationeditor/main/resources/help/ru/images/convertequation.png new file mode 100644 index 0000000000000000000000000000000000000000..3ad46ae4e51e77aff57c7c129a9d47ec18d777a4 GIT binary patch literal 21148 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 literal 0 HcmV?d00001 diff --git a/apps/spreadsheeteditor/main/resources/help/en/UsageInstructions/InsertEquation.htm b/apps/spreadsheeteditor/main/resources/help/en/UsageInstructions/InsertEquation.htm index 298f804f3..52ecb4340 100644 --- a/apps/spreadsheeteditor/main/resources/help/en/UsageInstructions/InsertEquation.htm +++ b/apps/spreadsheeteditor/main/resources/help/en/UsageInstructions/InsertEquation.htm @@ -88,6 +88,12 @@
  • To delete an Accent, you can right-click on it and select the Remove accent character, Delete char or Remove bar option from the menu (the available options differ depending on the selected accent).
  • To delete a row or a column of a Matrix, you can right-click on the placeholder within the row/column you need to delete, select the Delete option from the menu, then select Delete Row/Column.
    • +

    Convert equations

    +

    If you open an existing document containing equations which were created with an old version of equation editor (for example, with MS Office versions before 2007), you need to convert these equations to the Office Math ML format to be able to edit them.

    +

    To convert an equation, double-click it. The warning window will appear:

    +

    Convert equation

    +

    To convert the selected equation only, click the Yes button in the warning window. To convert all equations in this document, check the Apply to all equations box and click Yes.

    +

    Once the equation is converted, you can edit it.

    \ No newline at end of file diff --git a/apps/spreadsheeteditor/main/resources/help/en/images/convertequation.png b/apps/spreadsheeteditor/main/resources/help/en/images/convertequation.png new file mode 100644 index 0000000000000000000000000000000000000000..a97a5bea221f7b28fad43c6411647cfca8b5f515 GIT binary patch literal 17210 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 TMk4Tg7c@`RbW|%IT8IBP+ag|v literal 0 HcmV?d00001 diff --git a/apps/spreadsheeteditor/main/resources/help/ru/UsageInstructions/InsertEquation.htm b/apps/spreadsheeteditor/main/resources/help/ru/UsageInstructions/InsertEquation.htm index 4d33edbeb..ec7c53177 100644 --- a/apps/spreadsheeteditor/main/resources/help/ru/UsageInstructions/InsertEquation.htm +++ b/apps/spreadsheeteditor/main/resources/help/ru/UsageInstructions/InsertEquation.htm @@ -90,6 +90,12 @@
  • Чтобы удалить Диакритический знак, можно щелкнуть по нему правой кнопкой мыши и выбрать из контекстного меню пункт Удалить диакритический знак, Удалить символ или Удалить черту (доступные опции отличаются в зависимости от выбранного диакритического знака).
  • Чтобы удалить строку или столбец Матрицы, можно щелкнуть правой кнопкой мыши по полю для заполнения внутри строки/столбца, который требуется удалить, выбрать из контекстного меню пункт Удалить, а затем - Удалить строку/столбец.
    • +

    Преобразование уравнений

    +

    Если вы открываете существующий документ с уравнениями, которые были созданы с помощью старой версии редактора уравнений (например, в версиях, предшествующих MS Office 2007), эти уравнения необходимо преобразовать в формат Office Math ML, чтобы иметь возможность их редактировать.

    +

    Чтобы преобразовать уравнение, дважды щелкните по нему. Откроется окно с предупреждением:

    +

    Преобразование уравнений

    +

    Чтобы преобразовать только выбранное уравнение, нажмите кнопку Да в окне предупреждения. Чтобы преобразовать все уравнения в документе, поставьте галочку Применить ко всем уравнениям и нажмите кнопку Да.

    +

    После преобразования уравнения вы сможете его редактировать.

    \ No newline at end of file diff --git a/apps/spreadsheeteditor/main/resources/help/ru/images/convertequation.png b/apps/spreadsheeteditor/main/resources/help/ru/images/convertequation.png new file mode 100644 index 0000000000000000000000000000000000000000..3ad46ae4e51e77aff57c7c129a9d47ec18d777a4 GIT binary patch literal 21148 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 literal 0 HcmV?d00001 From 1a1e6c6f040c8d22106768444782aca210486ed8 Mon Sep 17 00:00:00 2001 From: Julia Radzhabova Date: Tue, 25 Aug 2020 19:09:31 +0300 Subject: [PATCH 2/3] [PE][SSE] Bug 44511 --- .../main/app/controller/Main.js | 30 ++++++++++++++++++- apps/presentationeditor/main/locale/en.json | 3 ++ .../main/app/controller/Main.js | 30 ++++++++++++++++++- apps/spreadsheeteditor/main/locale/en.json | 3 ++ 4 files changed, 64 insertions(+), 2 deletions(-) diff --git a/apps/presentationeditor/main/app/controller/Main.js b/apps/presentationeditor/main/app/controller/Main.js index 363e5bf26..0ece3593a 100644 --- a/apps/presentationeditor/main/app/controller/Main.js +++ b/apps/presentationeditor/main/app/controller/Main.js @@ -1069,6 +1069,7 @@ define([ me.api.asc_registerCallback('asc_OnTryUndoInFastCollaborative',_.bind(me.onTryUndoInFastCollaborative, me)); me.api.asc_registerCallback('asc_onAuthParticipantsChanged', _.bind(me.onAuthParticipantsChanged, me)); me.api.asc_registerCallback('asc_onParticipantsChanged', _.bind(me.onAuthParticipantsChanged, me)); + me.api.asc_registerCallback('asc_onConvertEquationToMath', _.bind(me.onConvertEquationToMath, me)); /** coauthoring end **/ if (me.stackLongActions.exist({id: ApplyEditRights, type: Asc.c_oAscAsyncActionType['BlockInteraction']})) { @@ -1936,6 +1937,30 @@ define([ } }, + onConvertEquationToMath: function(equation) { + var me = this, + win; + var msg = this.textConvertEquation + '

    ' + this.textLearnMore + ''; + win = Common.UI.warning({ + width: 500, + msg: msg, + buttons: ['yes', 'cancel'], + primary: 'yes', + dontshow: true, + textDontShow: this.textApplyAll, + callback: _.bind(function(btn, dontshow){ + if (btn == 'yes') { + this.api.asc_ConvertEquationToMath(equation, dontshow); + } + this.onEditComplete(); + }, this) + }); + win.$window.find('#id-equation-convert-help').on('click', function (e) { + win && win.close(); + me.getApplication().getController('LeftMenu').getView('LeftMenu').showMenu('file:help', 'UsageInstructions\/InsertEquation.htm#convertequation'); + }) + }, + // Translation leavePageText: 'You have unsaved changes in this document. Click \'Stay on this Page\' then \'Save\' to save them. Click \'Leave this Page\' to discard all the unsaved changes.', criticalErrorTitle: 'Error', @@ -2289,7 +2314,10 @@ define([ errorFileSizeExceed: 'The file size exceeds the limitation set for your server.
    Please contact your Document Server administrator for details.', errorUpdateVersionOnDisconnect: 'Internet connection has been restored, and the file version has been changed.
    Before you can continue working, you need to download the file or copy its content to make sure nothing is lost, and then reload this page.', textHasMacros: 'The file contains automatic macros.
    Do you want to run macros?', - textRemember: 'Remember my choice' + textRemember: 'Remember my choice', + textConvertEquation: 'This equation was created with an old version of equation editor which is no longer supported. Converting this equation to Office Math ML format will make it editable.
    Do you want to convert this equation?', + textApplyAll: 'Apply to all equations', + textLearnMore: 'Learn More' } })(), PE.Controllers.Main || {})) }); diff --git a/apps/presentationeditor/main/locale/en.json b/apps/presentationeditor/main/locale/en.json index 20b959388..847fd0df0 100644 --- a/apps/presentationeditor/main/locale/en.json +++ b/apps/presentationeditor/main/locale/en.json @@ -637,6 +637,9 @@ "PE.Controllers.Main.warnLicenseExceeded": "You've reached the limit for simultaneous connections to %1 editors. This document will be opened for viewing only.
    Contact your administrator to learn more.", "PE.Controllers.Main.warnLicenseUsersExceeded": "You've reached the user limit for %1 editors. Contact your administrator to learn more.", "PE.Controllers.Main.warnProcessRightsChange": "You have been denied the right to edit the file.", + "PE.Controllers.Main.textConvertEquation": "This equation was created with an old version of the equation editor which is no longer supported. To edit it, convert the equation to the Office Math ML format.
    Convert now?", + "PE.Controllers.Main.textLearnMore": "Learn More", + "PE.Controllers.Main.textApplyAll": "Apply to all equations", "PE.Controllers.Statusbar.zoomText": "Zoom {0}%", "PE.Controllers.Toolbar.confirmAddFontName": "The font you are going to save is not available on the current device.
    The text style will be displayed using one of the system fonts, the saved font will be used when it is available.
    Do you want to continue?", "PE.Controllers.Toolbar.textAccent": "Accents", diff --git a/apps/spreadsheeteditor/main/app/controller/Main.js b/apps/spreadsheeteditor/main/app/controller/Main.js index 7f02a4144..ca581e308 100644 --- a/apps/spreadsheeteditor/main/app/controller/Main.js +++ b/apps/spreadsheeteditor/main/app/controller/Main.js @@ -1168,6 +1168,7 @@ define([ /** coauthoring begin **/ me.api.asc_registerCallback('asc_onAuthParticipantsChanged', _.bind(me.onAuthParticipantsChanged, me)); me.api.asc_registerCallback('asc_onParticipantsChanged', _.bind(me.onAuthParticipantsChanged, me)); + me.api.asc_registerCallback('asc_onConvertEquationToMath', _.bind(me.onConvertEquationToMath, me)); /** coauthoring end **/ if (me.appOptions.isEditDiagram) me.api.asc_registerCallback('asc_onSelectionChanged', _.bind(me.onSelectionChanged, me)); @@ -2251,6 +2252,30 @@ define([ } }, + onConvertEquationToMath: function(equation) { + var me = this, + win; + var msg = this.textConvertEquation + '

    ' + this.textLearnMore + ''; + win = Common.UI.warning({ + width: 500, + msg: msg, + buttons: ['yes', 'cancel'], + primary: 'yes', + dontshow: true, + textDontShow: this.textApplyAll, + callback: _.bind(function(btn, dontshow){ + if (btn == 'yes') { + this.api.asc_ConvertEquationToMath(equation, dontshow); + } + this.onEditComplete(); + }, this) + }); + win.$window.find('#id-equation-convert-help').on('click', function (e) { + win && win.close(); + me.getApplication().getController('LeftMenu').getView('LeftMenu').showMenu('file:help', 'UsageInstructions\/InsertEquation.htm#convertequation'); + }) + }, + leavePageText: 'You have unsaved changes in this document. Click \'Stay on this Page\' then \'Save\' to save them. Click \'Leave this Page\' to discard all the unsaved changes.', criticalErrorTitle: 'Error', notcriticalErrorTitle: 'Warning', @@ -2624,7 +2649,10 @@ define([ textRemember: 'Remember my choice', errorPasteSlicerError: 'Table slicers cannot be copied from one workbook to another.
    Try again by selecting the entire table and the slicers.', errorFrmlMaxLength: 'You cannot add this formula as its length exceeded the allowed number of characters.
    Please edit it and try again.', - errorFrmlMaxReference: 'You cannot enter this formula because it has too many values,
    cell references, and/or names.' + errorFrmlMaxReference: 'You cannot enter this formula because it has too many values,
    cell references, and/or names.', + textConvertEquation: 'This equation was created with an old version of equation editor which is no longer supported. Converting this equation to Office Math ML format will make it editable.
    Do you want to convert this equation?', + textApplyAll: 'Apply to all equations', + textLearnMore: 'Learn More' } })(), SSE.Controllers.Main || {})) }); diff --git a/apps/spreadsheeteditor/main/locale/en.json b/apps/spreadsheeteditor/main/locale/en.json index eea01955a..981d27e1d 100644 --- a/apps/spreadsheeteditor/main/locale/en.json +++ b/apps/spreadsheeteditor/main/locale/en.json @@ -832,6 +832,9 @@ "SSE.Controllers.Main.warnLicenseExceeded": "You've reached the limit for simultaneous connections to %1 editors. This document will be opened for viewing only.
    Contact your administrator to learn more.", "SSE.Controllers.Main.warnLicenseUsersExceeded": "You've reached the user limit for %1 editors. Contact your administrator to learn more.", "SSE.Controllers.Main.warnProcessRightsChange": "You have been denied the right to edit the file.", + "SSE.Controllers.Main.textConvertEquation": "This equation was created with an old version of the equation editor which is no longer supported. To edit it, convert the equation to the Office Math ML format.
    Convert now?", + "SSE.Controllers.Main.textLearnMore": "Learn More", + "SSE.Controllers.Main.textApplyAll": "Apply to all equations", "SSE.Controllers.Print.strAllSheets": "All Sheets", "SSE.Controllers.Print.textFirstCol": "First column", "SSE.Controllers.Print.textFirstRow": "First row", From d3ef5bd61c16d57780fd55e518d4b7fb3b3b9ab7 Mon Sep 17 00:00:00 2001 From: Julia Radzhabova Date: Tue, 25 Aug 2020 19:38:52 +0300 Subject: [PATCH 3/3] [PE][SSE] Show specified help page --- .../main/app/view/FileMenu.js | 8 ++--- .../main/app/view/FileMenuPanels.js | 33 ++++++++++++++++--- .../main/app/view/LeftMenu.js | 4 +-- .../main/app/view/FileMenu.js | 8 ++--- .../main/app/view/FileMenuPanels.js | 33 ++++++++++++++++--- .../main/app/view/LeftMenu.js | 4 +-- 6 files changed, 68 insertions(+), 22 deletions(-) diff --git a/apps/presentationeditor/main/app/view/FileMenu.js b/apps/presentationeditor/main/app/view/FileMenu.js index 9c5ef6561..e17d015f5 100644 --- a/apps/presentationeditor/main/app/view/FileMenu.js +++ b/apps/presentationeditor/main/app/view/FileMenu.js @@ -231,7 +231,7 @@ define([ return this; }, - show: function(panel) { + show: function(panel, opts) { if (this.isVisible() && panel===undefined || !this.mode) return; if ( !this.rendered ) @@ -241,7 +241,7 @@ define([ if (!panel) panel = this.active || defPanel; this.$el.show(); - this.selectMenu(panel, defPanel); + this.selectMenu(panel, opts, defPanel); this.api && this.api.asc_enableKeyEvents(false); @@ -364,7 +364,7 @@ define([ this.document = data.doc; }, - selectMenu: function(menu, defMenu) { + selectMenu: function(menu, opts, defMenu) { if ( menu ) { var item = this._getMenuItem(menu), panel = this.panels[menu]; @@ -377,7 +377,7 @@ define([ item.$el.addClass('active'); this.$el.find('.content-box:visible').hide(); - panel.show(); + panel.show(opts); this.active = menu; } diff --git a/apps/presentationeditor/main/app/view/FileMenuPanels.js b/apps/presentationeditor/main/app/view/FileMenuPanels.js index c7bd22e8e..7c17a1431 100644 --- a/apps/presentationeditor/main/app/view/FileMenuPanels.js +++ b/apps/presentationeditor/main/app/view/FileMenuPanels.js @@ -1252,6 +1252,7 @@ define([ this.menu = options.menu; this.urlPref = 'resources/help/en/'; + this.openUrl = null; this.en_data = [ {"src": "ProgramInterface/ProgramInterface.htm", "name": "Introducing Presentation Editor user interface", "headername": "Program Interface"}, @@ -1315,7 +1316,7 @@ define([ }); this.viewHelpPicker.on('item:select', function(dataview, itemview, record) { - me.iFrame.src = me.urlPref + record.get('src'); + me.onSelectItem(record.get('src')); }); this.iFrame = document.createElement('iframe'); @@ -1361,9 +1362,14 @@ define([ } }, success: function () { - var rec = store.at(0); - me.viewHelpPicker.selectRecord(rec); - me.iFrame.src = me.urlPref + rec.get('src'); + var rec = me.openUrl ? store.find(function(record){ + return (me.openUrl.indexOf(record.get('src'))>=0); + }) : store.at(0); + if (rec) { + me.viewHelpPicker.selectRecord(rec, true); + me.viewHelpPicker.scrollToRecord(rec); + } + me.onSelectItem(me.openUrl ? me.openUrl : rec.get('src')); } }; store.url = 'resources/help/' + lang + '/Contents.json'; @@ -1372,12 +1378,29 @@ define([ } }, - show: function () { + show: function (url) { Common.UI.BaseView.prototype.show.call(this); if (!this._scrollerInited) { this.viewHelpPicker.scroller.update(); this._scrollerInited = true; } + if (url) { + if (this.viewHelpPicker.store.length>0) { + var rec = this.viewHelpPicker.store.find(function(record){ + return (url.indexOf(record.get('src'))>=0); + }); + if (rec) { + this.viewHelpPicker.selectRecord(rec, true); + this.viewHelpPicker.scrollToRecord(rec); + } + this.onSelectItem(url); + } else + this.openUrl = url; + } + }, + + onSelectItem: function(src) { + this.iFrame.src = this.urlPref + src; } }); diff --git a/apps/presentationeditor/main/app/view/LeftMenu.js b/apps/presentationeditor/main/app/view/LeftMenu.js index b47ddeb81..72a5c7435 100644 --- a/apps/presentationeditor/main/app/view/LeftMenu.js +++ b/apps/presentationeditor/main/app/view/LeftMenu.js @@ -318,10 +318,10 @@ define([ this.btnPlugins.setDisabled(disable); }, - showMenu: function(menu) { + showMenu: function(menu, opts) { var re = /^(\w+):?(\w*)$/.exec(menu); if ( re[1] == 'file' ) { - this.menuFile.show(re[2].length ? re[2] : undefined); + this.menuFile.show(re[2].length ? re[2] : undefined, opts); } else { /** coauthoring begin **/ if (menu == 'chat') { diff --git a/apps/spreadsheeteditor/main/app/view/FileMenu.js b/apps/spreadsheeteditor/main/app/view/FileMenu.js index 698bc13f5..1e0173764 100644 --- a/apps/spreadsheeteditor/main/app/view/FileMenu.js +++ b/apps/spreadsheeteditor/main/app/view/FileMenu.js @@ -221,7 +221,7 @@ define([ return this; }, - show: function(panel) { + show: function(panel, opts) { if (this.isVisible() && panel===undefined || !this.mode) return; if ( !this.rendered ) @@ -231,7 +231,7 @@ define([ if (!panel) panel = this.active || defPanel; this.$el.show(); - this.selectMenu(panel, defPanel); + this.selectMenu(panel, opts, defPanel); this.api.asc_enableKeyEvents(false); @@ -352,7 +352,7 @@ define([ this.document = data.doc; }, - selectMenu: function(menu, defMenu) { + selectMenu: function(menu, opts, defMenu) { if ( menu ) { var item = this._getMenuItem(menu), panel = this.panels[menu]; @@ -365,7 +365,7 @@ define([ item.$el.addClass('active'); this.$el.find('.content-box:visible').hide(); - panel.show(); + panel.show(opts); this.active = menu; } diff --git a/apps/spreadsheeteditor/main/app/view/FileMenuPanels.js b/apps/spreadsheeteditor/main/app/view/FileMenuPanels.js index 04a4ab069..64cc4df5b 100644 --- a/apps/spreadsheeteditor/main/app/view/FileMenuPanels.js +++ b/apps/spreadsheeteditor/main/app/view/FileMenuPanels.js @@ -2056,6 +2056,7 @@ define([ this.menu = options.menu; this.urlPref = 'resources/help/en/'; + this.openUrl = null; this.en_data = [ {"src": "ProgramInterface/ProgramInterface.htm", "name": "Introducing Spreadsheet Editor user interface", "headername": "Program Interface"}, @@ -2121,7 +2122,7 @@ define([ }); this.viewHelpPicker.on('item:select', function(dataview, itemview, record) { - me.iFrame.src = me.urlPref + record.get('src'); + me.onSelectItem(record.get('src')); }); this.iFrame = document.createElement('iframe'); @@ -2167,9 +2168,14 @@ define([ } }, success: function () { - var rec = store.at(0); - me.viewHelpPicker.selectRecord(rec); - me.iFrame.src = me.urlPref + rec.get('src'); + var rec = me.openUrl ? store.find(function(record){ + return (me.openUrl.indexOf(record.get('src'))>=0); + }) : store.at(0); + if (rec) { + me.viewHelpPicker.selectRecord(rec, true); + me.viewHelpPicker.scrollToRecord(rec); + } + me.onSelectItem(me.openUrl ? me.openUrl : rec.get('src')); } }; store.url = 'resources/help/' + lang + '/Contents.json'; @@ -2178,12 +2184,29 @@ define([ } }, - show: function () { + show: function (url) { Common.UI.BaseView.prototype.show.call(this); if (!this._scrollerInited) { this.viewHelpPicker.scroller.update(); this._scrollerInited = true; } + if (url) { + if (this.viewHelpPicker.store.length>0) { + var rec = this.viewHelpPicker.store.find(function(record){ + return (url.indexOf(record.get('src'))>=0); + }); + if (rec) { + this.viewHelpPicker.selectRecord(rec, true); + this.viewHelpPicker.scrollToRecord(rec); + } + this.onSelectItem(url); + } else + this.openUrl = url; + } + }, + + onSelectItem: function(src) { + this.iFrame.src = this.urlPref + src; } }); diff --git a/apps/spreadsheeteditor/main/app/view/LeftMenu.js b/apps/spreadsheeteditor/main/app/view/LeftMenu.js index 16778fbce..d3a37fbb5 100644 --- a/apps/spreadsheeteditor/main/app/view/LeftMenu.js +++ b/apps/spreadsheeteditor/main/app/view/LeftMenu.js @@ -307,10 +307,10 @@ define([ this.btnSpellcheck.setDisabled(false); }, - showMenu: function(menu) { + showMenu: function(menu, opts) { var re = /^(\w+):?(\w*)$/.exec(menu); if ( re[1] == 'file' ) { - this.menuFile.show(re[2].length ? re[2] : undefined); + this.menuFile.show(re[2].length ? re[2] : undefined, opts); } else { /** coauthoring begin **/ if (menu == 'chat') {