From d9e6efbe794eb159f9bfaa8d27983e9d3b696982 Mon Sep 17 00:00:00 2001 From: Alex Gleason Date: Tue, 26 May 2020 15:21:40 -0500 Subject: [PATCH 1/7] Revert "Merge branch 'compose_caret_to_end' into 'master'" This reverts commit 886e87799633102a15ec3193ebb0e68c0e9dd24b, reversing changes made to b6a74040316efa260f11424269098c9f8d7108c3. --- .gitignore | 1 - .../compose/components/compose_form.js | Bin 11927 -> 11647 bytes app/gabsocial/reducers/compose.js | Bin 13192 -> 13156 bytes 3 files changed, 1 deletion(-) diff --git a/.gitignore b/.gitignore index da7dcee8d9..e146e98fa7 100644 --- a/.gitignore +++ b/.gitignore @@ -6,4 +6,3 @@ /.eslintcache /.env /deploy.sh -/.vs/ diff --git a/app/gabsocial/features/compose/components/compose_form.js b/app/gabsocial/features/compose/components/compose_form.js index 7e0e18b271f60934338006aaa117d4b69be246e6..acb21f5fdcc078aeb7ff174ad344310cc24dca0f 100644 GIT binary patch delta 139 zcmbOp`#);K6^_lXIDWHi*5|X~o;*>~gh@eRa=N725P!it-DJCr^>G zg|e?oF{5&fKgUuH>{uOatjS4pMGjtat)r6g6ExfB$DY|+W}k`9wUNeWH=Dy2BN zK#F_ve@PS8;*!LY)X5f7woq1;lq!#{LPN3aL58sS4Eyvjo_{ zstP9SN=i&-mX@FVQBs&MCp9mn+a From 808e05a03f0a353b767300b35b9cad868938114b Mon Sep 17 00:00:00 2001 From: Alex Gleason Date: Tue, 26 May 2020 15:24:03 -0500 Subject: [PATCH 2/7] Pass maxTootChars from ComposeFormContainer instead of ComposeForm --- .../compose/components/compose_form.js | Bin 11647 -> 11464 bytes .../containers/compose_form_container.js | Bin 2162 -> 2223 bytes 2 files changed, 0 insertions(+), 0 deletions(-) diff --git a/app/gabsocial/features/compose/components/compose_form.js b/app/gabsocial/features/compose/components/compose_form.js index acb21f5fdcc078aeb7ff174ad344310cc24dca0f..067b982964b34d1506990feb16f052181580cc3d 100644 GIT binary patch delta 31 mcmew#bs}R`9Ercl5Dj?a(-T3YI2D}twLH+ey)OgQEFmxiEdG9N@>MLiC*@4pnP$OLT+L~ za7kiGYDj)SQGP+Of~`U^h^t_0r%=tMpiq=rQd*P;W-0*HR)pl|mpEr678P4T)aj+C zmU!lAM5|{44NJ^RPF2@YPzS1uF99lyPX?(}kJZ!xnpA7e1w>q_6$SZ4B?>923TcU@ VIVB1XP-kkOIYg6d^A>gyRRFvgN74WQ diff --git a/app/gabsocial/features/compose/containers/compose_form_container.js b/app/gabsocial/features/compose/containers/compose_form_container.js index ce33d81740ee8869e6a4b71973495e7a3cbe362c..f1ac1926da20862fc9808672d5fb0c523c5556b3 100644 GIT binary patch delta 72 zcmew)uwHP(92RQ@h1|r7ko^1-=ZwUnVk?E>lEji!z4X))&peH2^~^jVKQB2|T}MG3 Ws4l()s4zYmq*6UrbMq{g8_WR392!^v delta 12 UcmZ24_(@>H9G1;DS*|ey03~?^d;kCd From 55578a4381bfb3a2accfe34d7c087e7cb23751e4 Mon Sep 17 00:00:00 2001 From: Alex Gleason Date: Tue, 26 May 2020 15:26:07 -0500 Subject: [PATCH 3/7] Composer: shouldCollapse --> isClickOutside --- .../compose/components/compose_form.js | Bin 11464 -> 11579 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/app/gabsocial/features/compose/components/compose_form.js b/app/gabsocial/features/compose/components/compose_form.js index 067b982964b34d1506990feb16f052181580cc3d..1f0a02e0b17020efa374351794ae8944039d4a7c 100644 GIT binary patch delta 187 zcmX>RxjSk@D_?zPv2#vla<+eINpWUMs)DV8MyjTQt(`(OmjVzJrIwTyLm)v`8hd>1;wdA@l+ruw;;bb zwMd~nBQ;MU8Dvvx3c@TmPw5C>S1SeI#B7lI%wmO{)Z$`=q@v7{lAP4dYxt}fc~Km= J`7{4j833ESKG6UG delta 71 zcmdlTbs};@E1!CCMt*5digSKWPGUiEs)DV8MyjTQt(`(OmjVzJrIwTyoIv6ql From 5633bf431740bac37e3110541d4b31a4a3699e50 Mon Sep 17 00:00:00 2001 From: Alex Gleason Date: Tue, 26 May 2020 16:11:24 -0500 Subject: [PATCH 4/7] Composer: simplify cursor update code --- .../compose/components/compose_form.js | Bin 11579 -> 11504 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/app/gabsocial/features/compose/components/compose_form.js b/app/gabsocial/features/compose/components/compose_form.js index 1f0a02e0b17020efa374351794ae8944039d4a7c..365083e86889704d405deb43b43691f45bb6bb26 100644 GIT binary patch delta 701 zcmZuu%SyvQ6kQ5+Aw_I$W8u1K6A0->Hw_WgQrsv~H$G4rn@J7UOqhpQO7SD+2h<-> zaOu*e{~~^ZlV=;_tmfW1bMCq4e4PKBy`5Gb@9bN&&k4n(Ycm@xzyYIR?ZC7I@(i(0 z8BD?PoE{!>s)I-SC>T%luyw*mBSe{peV8R*%~JHQ-G)Qthc7g$Jr~rJ1Deg0MOy)a z7$-hlL@*Gqwaq0xxj)sb{rG-4r`_cY(`@el>^W)L-w{{!+FpUSi^hl{XiBg{Y?l>O z7igrqUY;gd#kI#2nUY`@dO;D3{gno(l-Y#ofP6<*QK3n%#dg&YFUp1(C?!!=R+lrB zW{PK}A^U5Ch>Qo0&62z%LqO2|F~LD0u;F5&?8c);K4&#f7qVPCAimc1a^id%kL((? ztw!3-+1dd%2@rOLwDSNg%Yv5A@2(MP#qgPyWEMt0*P}rsCv!zL3}gN(jw;`c2(Y-R Nn(e8X?+?mn`4{qO)TICb delta 753 zcmZ{h&rZTX5XSGukQj|nG;z2HBn2+SztNiquj)ZfJS^>$HYvN!?t-8pJVaka_(hZ7Z^xP;*krC`>rK3?FL+Bjf~L(o=^%9 z5(G!+E0h!ELJ~8Nw&@VT>q|vlrcH(12N9U3#-Z+rVe^0Go*+LuWPG9R(g87gT9K!b z*~VFq79~v0^n*y!^K@AgNP>b$q!>g#u?#%H2gsu=6cq}oy*>>K@TEu~%V(6Gg0Vsf zr05y5W<)BcBf*>L>)uv+?oa|+|{~v@ZE7%>Dsl_uK&@s2QIm=G?{E$ vdZ|6%mAfY1V&g1^^r3W2rs+3QR)$_mi(q4cp#4H1yuPZ Date: Tue, 26 May 2020 17:22:32 -0500 Subject: [PATCH 5/7] Composer: Always place cursor at the end of text --- .../compose/components/compose_form.js | Bin 11504 -> 10788 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/app/gabsocial/features/compose/components/compose_form.js b/app/gabsocial/features/compose/components/compose_form.js index 365083e86889704d405deb43b43691f45bb6bb26..3ad404fa416bd29995ba26c9fb2a3ca1cf6ea47e 100644 GIT binary patch delta 90 zcmewmxg=ymgcx^9zFU5BX|aN>g2rTRiHON3Bm^e&NX(e5E)^@Npiq*LS*%x_TH;(< rRGeR=F_~XnOkC4iL0?}XIJHC}87!)hSfY@cmom9gDtoi3^lm`_U(OxF delta 817 zcmaJ<%Syvg5XEhAp_`<*kP)O!uq22ZQ6h-Nl|u0WiZ9Y+(gf4oaPN&+O36p$3j{wv zaOqC)1N;*|!Mq=~nBC3HoO9-!dA<0#e!CLFvHplh0cC{tb*_U3#ODmO1DLiT{tV(V z4pT54^OzU`>w&}0(03=j()hS8_+60M7y(TA`S2EM8D zJek;9pW@RXapi9`Mm@XKyk??OmLrr2?$s@}l1$^^5jM0MiDHFCq3}D8y)hk&V(6m5 z7a%lh1xUmC7;54pvFdtC%TLmy(qd6vFBlJzb~B8boQItpRJFUDfiUFRElY}`RMqHS h97aoRJF>;)oy*i%sWep1FFp0H?t0bo{?Ptf{RM(G2HpSw From e06f8ce894436e2a903aad1439026b53a2bd89a5 Mon Sep 17 00:00:00 2001 From: Alex Gleason Date: Tue, 26 May 2020 17:36:56 -0500 Subject: [PATCH 6/7] Composer: Remove preselectDate This value is only used to track when a reply happens. On soapbox-fe, a reply causes a new ComposeForm to mount, so we can track it that way instead. --- .../compose/components/compose_form.js | Bin 10788 -> 10741 bytes .../containers/compose_form_container.js | Bin 2223 -> 2163 bytes app/gabsocial/reducers/compose.js | Bin 13156 -> 13089 bytes 3 files changed, 0 insertions(+), 0 deletions(-) diff --git a/app/gabsocial/features/compose/components/compose_form.js b/app/gabsocial/features/compose/components/compose_form.js index 3ad404fa416bd29995ba26c9fb2a3ca1cf6ea47e..4784544f3b6e95f62e65413c3346f9498f741bba 100644 GIT binary patch delta 12 TcmZ1y@-=wF0?y6nIYSiyDT@V~ delta 26 icmewwyd-490#43?qSWHloYdr!$)TKTn-_3~DgXeQf(lXq diff --git a/app/gabsocial/features/compose/containers/compose_form_container.js b/app/gabsocial/features/compose/containers/compose_form_container.js index f1ac1926da20862fc9808672d5fb0c523c5556b3..0a7cefc96b6321287bff5e1b61b804ce79fb43d1 100644 GIT binary patch delta 12 TcmZ24_*r1XMW)TX%!^n7BT)pg delta 44 ocmew?uwHP(MJC>YqSWHloYdqJm&B6P$>$lRQAIYNVp_=x0Fs{(mH+?% diff --git a/app/gabsocial/reducers/compose.js b/app/gabsocial/reducers/compose.js index 49c9bf97b756663bd1d71dd6c82eff8e247c9c9a..a19d4ed3d76fa0969ba34a8c029021ca57e6c5ee 100644 GIT binary patch delta 21 dcmaEowlHmjE8FH6Hed0{^Hroazn3i)1psAv2!8+o delta 53 zcmZ3O_9ShCD;sY?QEG8&PHJ+AOJYgtW^1-^aZb3 Date: Tue, 26 May 2020 18:22:50 -0500 Subject: [PATCH 7/7] gitignore VisualStudio files --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index e146e98fa7..da7dcee8d9 100644 --- a/.gitignore +++ b/.gitignore @@ -6,3 +6,4 @@ /.eslintcache /.env /deploy.sh +/.vs/