From 074051297aece72b773f6945f45dafb62997b430 Mon Sep 17 00:00:00 2001 From: Michael Telatynski <7t3chguy@gmail.com> Date: Tue, 12 Jun 2018 11:11:43 +0100 Subject: [PATCH 01/16] add a ShareDialog for sharing users,groups and rooms Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> --- package.json | 1 + res/img/icons-share.svg | 6 + res/img/matrix-m.svg | 15 ++ res/img/social/email-1.png | Bin 0 -> 2510 bytes res/img/social/facebook.png | Bin 0 -> 1201 bytes res/img/social/linkedin.png | Bin 0 -> 1366 bytes res/img/social/reddit.png | Bin 0 -> 2279 bytes res/img/social/twitter-2.png | Bin 0 -> 1519 bytes src/components/views/dialogs/ShareDialog.js | 211 ++++++++++++++++++++ 9 files changed, 233 insertions(+) create mode 100644 res/img/icons-share.svg create mode 100644 res/img/matrix-m.svg create mode 100644 res/img/social/email-1.png create mode 100644 res/img/social/facebook.png create mode 100644 res/img/social/linkedin.png create mode 100644 res/img/social/reddit.png create mode 100644 res/img/social/twitter-2.png create mode 100644 src/components/views/dialogs/ShareDialog.js diff --git a/package.json b/package.json index 96c37a61c8..15080456fe 100644 --- a/package.json +++ b/package.json @@ -80,6 +80,7 @@ "optimist": "^0.6.1", "pako": "^1.0.5", "prop-types": "^15.5.8", + "qrcode-react": "^0.1.16", "querystring": "^0.2.0", "react": "^15.6.0", "react-addons-css-transition-group": "15.3.2", diff --git a/res/img/icons-share.svg b/res/img/icons-share.svg new file mode 100644 index 0000000000..b27616d5d5 --- /dev/null +++ b/res/img/icons-share.svg @@ -0,0 +1,6 @@ + + + + + + diff --git a/res/img/matrix-m.svg b/res/img/matrix-m.svg new file mode 100644 index 0000000000..ccb1df0fc5 --- /dev/null +++ b/res/img/matrix-m.svg @@ -0,0 +1,15 @@ + + + + + + + + diff --git a/res/img/social/email-1.png b/res/img/social/email-1.png new file mode 100644 index 0000000000000000000000000000000000000000..193cb659da5d4adff51376f3fc75cc8609c803fd GIT binary patch literal 2510 zcmV;<2{HDGP)HtMRhk?0buDKu#&buo5IY}eF4AYO)9Jd1n2=li0!+-J|d^Tv3N zbTszZ@4j=+J733CzuoBXMFZC_b?x4zEDZw zLKRx~X6DZ_-)m8LI*N#E$nr@RgZ!HLXUr%47PQ7k4~R2wXWq)Zrb348X6|G@#GLeF z!GI5I)HCm5?q}XxLFGxTy;t08m$>&8HNb<+z0BWYZlKwt264|`A;YX2U^(-v%tu6$ zyHeCBWO!91*jX_ElG~fi8))tjWO-f4R#5{W{(dSF-dv-&knNdD7yxDJN6b&s+^3yF z)`(v?Ajtf4QPZo19uO5`6LXDKx%wM2u)&yA4)EecQV!F#z$IyX_ET#>PFGEaXW&C%=Qc}f)~%f0PE(O3LM1qxrw ze8P_!-!d;q8yjosp2o=g%9ct+*8Oj6h{Ho^O0Y4?AT(6BFb|Y!fIkZl(53~U8hWHT zMw=JcQlO@M@A=1Ao(>G8=wC@~L%;*>D8&GXnZvqw3A3`FYl_mgW%DQ=lxu!ATcq<7 zMLLtVC+OwuEzQw@r>DRpzQ;y5`oD~>c-urXf2eT)@;dUf20b0?j?T%bQ* znxI#h`_qLPbHxT;F|Hkbck8Q3tG&1f>q+}I?5y2J<}GqDW7GH zJ5DF*$WZypn_jf#tua>uM4q{6K}g37w#$IfRvqEKu`+J#kX89d|2?kc@}&^)z>_`W zbP+(oLLJNNbgIl&XAZboXOe>wcl%ZLgtx2ra!EBCLSG*b8JR!KzpUWgG0fFrgcTgj z6zT1B-T+5d!teXuNztBFaU0IKYf*%L|E`k3*9e_Yng+OE$Mqk(HfH%3~eRk0cQd(f$lOx07+q; z%9Riv@YYJt4`n=YJ9ZoRAQn^)Rw#TXWycNhvfN~y0lG~35PQ~eR>=#Xa|6tFr>amJ zIrgo}Twql9;yF1wLwxRIe4wK|Xee870iLn^B;y2oo>>>yI^wt!SG6kp&LaD;<(KEP zQdG8%cjfC`CBilG(sqQsrfVc;gwI0$r+uySX{|$%Gajh%G<${hf31~Bfm)RffLL=1 z`HH0ELFsRLD31q&34Yl=J}o>7u;7n<%=HvIeaQsg^&)nzJF#e?8g+dSSAXh1m!;@% z8E1N#4*eOq0YWuC^w`|O1W56C$%)5hF1ntxzO0M;2{$)Zx3{h95yM_Nz*$B|@)_<9E8XGZu|m+Cuq6`VSYq%hWQ70kF1LX?IY0e!kzyLieS2+7|DCVT$Y(d&R-g9-W%awny z#v3MwC8cg>OUzbbfI!hLYEmDHdbjFy#@dRuNs<>5k_?*e{$QOk@I-Tia(W*(R3?H$ zE^&qvTIXL~$i6>6c)Vq5%f4(a@<3C@`jSPGoLyG)X{lTM}b*jCaa_L(COxMDixI~iz3xQxz%^0&Zfjh71~>~e zDs*)j0KU6l2}W@&fBCfglomMQ==Jpm(9wN10Qp5@)Ljbgw>E&j9FGH}VE!kY%OQCk zJC`xQ(M*X9Lynskgz0w16&So?cIb0XaUGA#9*}s1G@cE@ZauXs?i!dnOBveYAvT0{ zGK5(mps^F|AiO?#V#JSN)1A_~=!sL~^w*J`A4`?| zhzyBxc!D$^iA4hZG~;;Sew{eRh67FmM0NS2JmTmUS>H3=3llgneWBbtqbvM)L)eJz zMeHJVY#irtIzSZQHBN=Q8EPZ;lZ8n?W51pG$Fe`n^v1{m<}Xoo)AyNoOg9spjvi+| zTE)sA6*`cv0RZ(LV*XtfD*v*Oz3hjj(WGzkilI45ko7(xJC$ny(+KS%o~j|{+e=Yi z#Q-Ml5R1>nmMx6#zIx0kM<;+KRBw+WeO zwhUnHtI=HSA;l9WA6nWy;@+L*EEMo*7k1OshIA)A^ zhi@ZkJcA@r`X!ordHOZK1+AHd*XNr=XNkwsRtkee$o*(uLX@r^5zh(H!3|eZxc>_< Y02w!UWX_nGYybcN07*qoM6N<$f{u#A1poj5 literal 0 HcmV?d00001 diff --git a/res/img/social/facebook.png b/res/img/social/facebook.png new file mode 100644 index 0000000000000000000000000000000000000000..6a29e3820aa997e5bc06d42995891ce570defd25 GIT binary patch literal 1201 zcmV;i1Wx;jP){WFb!?3z7NA68<|~E&O{8>Ez#ZokqHl4&r9Wg z0N0RH$a_dDXa_6TImI?;F2Et=81fkhxp*OqZ5ZPKtBC*<+&&^tfPO%>d|=yz3PAmD zkOQ9HkjA!kiV%Q?sXk;g=pT)2t3|D0(1d)!V|t>XhDV5MSgM)o15E>MB&5ic5OeG{5w+(Z%-Cd{(H5AqNFk!8kff%pI7bhof;DhdlLDra^`dG%oNEQ0 zpk6+emkUrQGNsMjo2nN9tn6#hFlZN5qm+~c$!1g7d;Y9%z~EaKIH$jXd-=C$5y;mL zc?+M=ZYvcl)iMIf&YwKE9dD<@k z1%(nY9>`}a2~Y{fMJ0^_g(6DsY(534Ddwo|55&sqIy7~>5h*~SBuW4^@a3yV_-G)3 z*o_QDn3?|}x{A#fkS(I*WV7;3r@4h?;b}5inJ%JaTJ=$i&+|*71xS-XpKJW^eQ5=L z{#p|*fT->9ptZawE#c={6zwVMYYl1vUNA1aB!I{00xTFviI1Ru?F^3dht{_NxoPUzm{UjYUHqC(z?^D_)0 P00000NkvXXu0mjf5Z)l0 literal 0 HcmV?d00001 diff --git a/res/img/social/linkedin.png b/res/img/social/linkedin.png new file mode 100644 index 0000000000000000000000000000000000000000..2b868a585ba59ca2f716f0a21254ccbdb3c95438 GIT binary patch literal 1366 zcmV-c1*!UpP)b&2Be0RqO@45R0W~Mz9=g~i=y;FTI@p~6pB_* z2nv=^U$UiG`cT>;6hc$dSOQVWmXsx_t+iFtXzH3pV-nMzGdUyU?##OLx4EZ` za+Aj4e2}>eXnsK>$hXKZk$oZy5JK)j#*vK<)*EBKj~qa@BhMf+PE;;AP)8Vf2zeEG z++pXl(a86>%J&S$6kUhxHxRaYLMA?QO?qG`|0CjHt z$aNqN$d*fNo2vp)`#Z-So@fZMZ719ifQG3KuFby?6y~-+v&Q2vPRwr9vVgo-brnEUqkv6R$TzYfV%Uf=I`7 zZb`U8#7Jn>>klNI9Q$ZN3u*b}lwtx7J;kC;*{}ow)2>Y5NK-^3%iT*zzGclEOp3c!V z!4c0EpczcA{YaA$l%Asy2>x+XXp+2==jz?)WTq4EA$_kdUX0-7-O zsS)rR_z$nDO@KOum=6UYpCcr|2JkO7P#@4>rDVtU7O0qOyq>b{^B+zBzZ3{4>2z#i z71YfSK~M@nZPh$wWEswkWY*VP!q_A zAixj54_mrMpy5@XW9c<#hDxPH5McU0<7;;xOg^!EP_iz-O)qqI_a>*@sCI+|NclJw z9wGq-d@MlH?-7t90lIuFKo`|y%}41cu~By{>vfKD|LA|!k$Ktd}(ug^Ne6#M+x zdx3Tz3DB;c3#d3PN?PnP((G%F05mB&=>q{yYA1k_&c)FZc78PbAqRB67kCFsV{eci z-qnV`UIeIpL3ar{-<|EekpP6vDWG(UoaCc=X#rLS?d)kh^pu!` Y0BLR|kwK3)O8@`>07*qoM6N<$f)AK>P5=M^ literal 0 HcmV?d00001 diff --git a/res/img/social/reddit.png b/res/img/social/reddit.png new file mode 100644 index 0000000000000000000000000000000000000000..bd6131186f990ad2902c6d76165f5bf7e6457244 GIT binary patch literal 2279 zcmVAGR zp+O)Z${7Muj+U!jg-U75B}dC?p+c=td_Ued?6jTT&au1Q?Mq%}I-U8x_uluu-#cbD z>~7ktpBX+>N=9x{hOnI2E+gWx5Las zDR>C798j|P)d1Lk%N5`S8#Pg~edP}WAWSV`evg8mW++)Be3b`;Gp|%JJyhrw6(J@u z-*M^z^FvH|jm9h49c_UmD>>#ju6{bZFvIlsG=2kluU+oCO(0ByR6rot(2Z-WPqeP0Y1>FgP!jx+)GqmCfi}cy8?ba7|at> zdF46VEh!?p@|V?_ld5CDKtFeKJk)Q>;Vyeo0LpLpmgt!jqAml3HM({|wvN5d5_Hbd z4DeFm)04&$^6n}5kN0~4ev3aM>Nl3CRcE4#a-w2|6Spgz6ihi<7(|1kk6#oGa|v1l zsUiHsop|M2)VvSzy|hGD_2Nl6o;&8xB|x{iFAM-bykZN%u^-#T$=}Gx^0rBq25Q-X zhv)DXGgtttI^q8EGWS@K?F>+!#X7W!=uaN^)(yD^uj$-R#s{6}WT_~J=)ZD1Mra8G zB&tq|c|z=cl7X~E+p5>$j{DYd;@MG*qtT_)L?`$2%AR7^Epi*lXj`<37Eg)pD^UW3 z9HC%08|@-d{{*538diM{A(<1sJ70BA4IF&{*DrKWx+s|NJVSu58&^b&N|2twy> zCOVpF2c;EA@>c0Fl9e7;)r&AD3<_`PJz8X{xJi_eYPL4eC>0yX(<}G zEQdb;8ffP-xAKV32v7KX^Fj$*PL*u%Cgz$jo4n0jgcN zlA(_Oifx27m_?J3?kxc-=Kh!ySL%atQ{=xAkag ziMug@o?Ts#Ru7cg{*0&)2FSB#yEBrYfRL^Rnve$|?qmBE7up>q*S-f};{0qmfAlFS zWQ+)18>G+LYMCJ*`>-kA6Pw2-s;HFhq$iLM1K3a9kf*~7An4O?N@%Q6ImSo}8wC`U zY8K_)rE$;8T$>Gg)^lnLgCb7=_(2Byl%OrS`}GYGO`ZksqF-Rt06`ZB`F`GZX?9jed{led3lxlLUwKXE`)`I&%kFjrO6Ub( zWgsY&&tAcbWJ-nTsrdn8X}tq)Jp*_d>H`=J28EZw+nmv0q;&dMW5+D_2C5U<+%ST+ zx=2*e&O+X9t#>cD0*{FsE*&Cm+hALq&2y?efIm*}0iX|rU5MJms8x=38_DHzD~IF?KnMUV zIpHL}d!sac0T>*w#{)+-UXQyBZb+s2OR0M0jSK+7%eEc$Q28B7H>%A5pk(sV_xM3V zWlAS9Yk+)D4}>Tsdn)?8#in1F)9Zoq=}H%}Y5>qX%o!o9e1_72>>2<4yqQduVTY;sdbN&o`(!1Ht=6#9-wiHO#l`2U%nTHjsySn*+Q-j< zHh{i>>cl*Y?6%p>cXDQ_xl(=MePMq3^*DNr`1lIV`&b_+{Ts=Tr}y|;(69jfd>&t* z;9Grkox3T6L{QBxbgl|r`D#DsstT^ypThkwzyNr(v=B#;25kTU002ovPDHLkV1ko1 BJN^Iw literal 0 HcmV?d00001 diff --git a/res/img/social/twitter-2.png b/res/img/social/twitter-2.png new file mode 100644 index 0000000000000000000000000000000000000000..84f8033a30c5cef33bb14ee59b5b8d5398b9162f GIT binary patch literal 1519 zcmVeqY zO9dhH4@opc3o1&nPzZ!p18Iw=v9U2GwXM;_%UyaVX?jU~@A5XDm+fVDXLfJbe(-U} z-QMhb-@ci7Z)VQ7qiYasMk(?!WDT+!Sz*lx+cCL|#C?g$#mo2=YBIunmq2P>DQ+Jj#PywouA8oZnq0jU3V@_^?y1lYFs>=1yasW#-R;C?i*t*WePFb8>z=X9^&Ii4Z5 zA!kJ+;GoBx*RYvw7wQ5b4k@pqiG8rt1sae?jNYkwWiC8hQJj1w3|zei9}kVgP<$ra zA{^nmqT7rB<=pQL4J1$BQ3x+om4M>=_p|lE0=RcoJ{;tlY-$ID!iHZ*Em>2HQh)6iqk#t|Hq!xR6bRJMu$t< zY(_z&o&X`Zc@Rn$U<25@lH)eivd@c&&`vw=c5AL5Iv=eRZf7zv2j?fIp>sHz%rqqw zOubqJJmrPQMzaZJnEUTv16%GCUJiUh>jE?=)O#s@DY<&SG6;7U3T2q&bC3ksJE&OOO87aR-l~KLPMi&V{=kUT-TR1m91qQ~! zB(|3q!|t^uZi$4jHV6_v^x>u$3&<^DV|4WD0%!MTWV9nh|2f`lHC!LTnjEu%157Al5JU2#6_t1C-(C6U38 zeg4nBK&wcLZNH8~Vt(GS_@%DYu-bAR*P2=jX!t-REv9Aaj|L--cH$>*UuorMG4^$d z08|tm5;5rO%M-H7R70q;wkCKewE$Ffz7%?l@1GxaOoYUo=`I&Zf5?i?1ude*(YrtW z3CA5c7Bd((y(ZX_{($w$H0mGSB8Jg}X&v|r-s$@TYlZ8!3Gn45QzCb#_Weu(5MGk8 zP|`Ct39t2DP7aQ=DkKXeFwHt=B9n&ee)eezd>Q^SLmQ@_$b4e7k?~MT0o)Z(p;*m< z)p;u*VB+)$tqD>h)G-t_8~(eH9eQ76S`(xn(7_^Ur$%V1l(4I77Kd--e5Nj-;T0`q z^eEcd2e2vt9W>sJJnli~Pq6L6ho$MP>$Xf`L^EUlUaQDN!Pyf9B){oJ3!T)~al*_ZwiU;t$x VVe!_=*FFFM002ovPDHLkV1goAzuW)- literal 0 HcmV?d00001 diff --git a/src/components/views/dialogs/ShareDialog.js b/src/components/views/dialogs/ShareDialog.js new file mode 100644 index 0000000000..8bfa0ad931 --- /dev/null +++ b/src/components/views/dialogs/ShareDialog.js @@ -0,0 +1,211 @@ +/* +Copyright 2018 Vector Creations Ltd + +Licensed under the Apache License, Version 2.0 (the "License"); +you may not use this file except in compliance with the License. +You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License. +*/ + +import React from 'react'; +import PropTypes from 'prop-types'; +import {Room, User, Group, RoomMember} from 'matrix-js-sdk'; +import sdk from '../../../index'; +import { _t } from '../../../languageHandler'; +import QRCode from 'qrcode-react'; +import {makeEventPermalink, makeGroupPermalink, makeRoomPermalink, makeUserPermalink} from "../../../matrix-to"; +import * as ContextualMenu from "../../structures/ContextualMenu"; + +const socials = [ + { + name: 'Facebook', + img: 'img/social/facebook.png', + url: (url) => `https://www.facebook.com/sharer/sharer.php?u=${url}`, + }, { + name: 'Twitter', + img: 'img/social/twitter-2.png', + url: (url) => `https://twitter.com/home?status=${url}`, + }, /* // icon missing + name: 'Google Plus', + img: 'img/social/', + url: (url) => `https://plus.google.com/share?url=${url}`, + },*/ { + name: 'Linked In', + img: 'img/social/linkedin.png', + url: (url) => `https://www.linkedin.com/shareArticle?mini=true&url=${url}`, + }, { + name: 'Reddit', + img: 'img/social/reddit.png', + url: (url) => `http://www.reddit.com/submit?url=${url}`, + }, { + name: 'email', + img: 'img/social/email-1.png', + url: (url) => `mailto:?body=${url}`, + }, +]; + +export default class ShareDialog extends React.Component { + static propTypes = { + onFinished: PropTypes.func.isRequired, + target: PropTypes.oneOfType([ + PropTypes.instanceOf(Room), + PropTypes.instanceOf(User), + PropTypes.instanceOf(Group), + PropTypes.instanceOf(RoomMember), + // PropTypes.instanceOf(MatrixEvent), + ]).isRequired, + }; + + constructor(props) { + super(props); + + this.onCopyClick = this.onCopyClick.bind(this); + this.onCheckboxClick = this.onCheckboxClick.bind(this); + + this.state = { + ticked: false, + }; + } + + static _selectText(target) { + const range = document.createRange(); + range.selectNodeContents(target); + + const selection = window.getSelection(); + selection.removeAllRanges(); + selection.addRange(range); + } + + static onLinkClick(e) { + e.preventDefault(); + const {target} = e; + ShareDialog._selectText(target); + } + + onCopyClick(e) { + e.preventDefault(); + + ShareDialog._selectText(this.refs.link); + + let successful; + try { + successful = document.execCommand('copy'); + } catch (err) { + console.error('Failed to copy: ', err); + } + + const GenericTextContextMenu = sdk.getComponent('context_menus.GenericTextContextMenu'); + const buttonRect = e.target.getBoundingClientRect(); + + // The window X and Y offsets are to adjust position when zoomed in to page + const x = buttonRect.right + window.pageXOffset; + const y = (buttonRect.top + (buttonRect.height / 2) + window.pageYOffset) - 19; + const {close} = ContextualMenu.createMenu(GenericTextContextMenu, { + chevronOffset: 10, + left: x, + top: y, + message: successful ? _t('Copied!') : _t('Failed to copy'), + }, false); + e.target.onmouseleave = close; + } + + onCheckboxClick() { + this.setState({ + ticked: !this.state.ticked, + }); + } + + render() { + let title; + let matrixToUrl; + + let checkbox; + + if (this.props.target instanceof Room) { + title = _t('Share Room'); + + const events = this.props.target.getLiveTimeline().getEvents(); + if (events.length > 0) { + checkbox =
+ + +
; + } + + if (this.state.ticked) { + matrixToUrl = makeEventPermalink(this.props.target.roomId, events[events.length - 1].getId()); + } else { + matrixToUrl = makeRoomPermalink(this.props.target.roomId); + } + } else if (this.props.target instanceof User || this.props.target instanceof RoomMember) { + title = _t('Share User'); + matrixToUrl = makeUserPermalink(this.props.target.userId); + } else if (this.props.target instanceof Group) { + title = _t('Share Community'); + matrixToUrl = makeGroupPermalink(this.props.target.groupId); + } + + const encodedUrl = encodeURIComponent(matrixToUrl); + + const BaseDialog = sdk.getComponent('views.dialogs.BaseDialog'); + return +
+ + { checkbox } +
+ +
+
+

QR Code

+
+ +
+
+
+

Social

+
+ { + socials.map((social) => + + ) + } +
+
+
+
+ ; + } +} From e7a4a0b2e0f78138f0bc91e98420a720783b3aef Mon Sep 17 00:00:00 2001 From: Michael Telatynski <7t3chguy@gmail.com> Date: Tue, 12 Jun 2018 11:12:12 +0100 Subject: [PATCH 02/16] allow context-menus/tooltips to work over modals Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> --- res/css/structures/_ContextualMenu.scss | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/res/css/structures/_ContextualMenu.scss b/res/css/structures/_ContextualMenu.scss index a0191b92cf..7474c3d107 100644 --- a/res/css/structures/_ContextualMenu.scss +++ b/res/css/structures/_ContextualMenu.scss @@ -16,7 +16,7 @@ limitations under the License. .mx_ContextualMenu_wrapper { position: fixed; - z-index: 2000; + z-index: 5000; } .mx_ContextualMenu_background { @@ -26,7 +26,7 @@ limitations under the License. width: 100%; height: 100%; opacity: 1.0; - z-index: 2000; + z-index: 5000; } .mx_ContextualMenu { @@ -37,7 +37,7 @@ limitations under the License. position: absolute; padding: 6px; font-size: 14px; - z-index: 2001; + z-index: 5001; } .mx_ContextualMenu.mx_ContextualMenu_right { From e3c455e5997fe5874d98b833ad4317735e876d1f Mon Sep 17 00:00:00 2001 From: Michael Telatynski <7t3chguy@gmail.com> Date: Tue, 12 Jun 2018 11:12:26 +0100 Subject: [PATCH 03/16] Style the ShareDialog Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> --- res/css/_components.scss | 1 + res/css/views/dialogs/_ShareDialog.scss | 89 +++++++++++++++++++++++++ 2 files changed, 90 insertions(+) create mode 100644 res/css/views/dialogs/_ShareDialog.scss diff --git a/res/css/_components.scss b/res/css/_components.scss index 2734939ae3..173939e143 100644 --- a/res/css/_components.scss +++ b/res/css/_components.scss @@ -42,6 +42,7 @@ @import "./views/dialogs/_SetEmailDialog.scss"; @import "./views/dialogs/_SetMxIdDialog.scss"; @import "./views/dialogs/_SetPasswordDialog.scss"; +@import "./views/dialogs/_ShareDialog.scss"; @import "./views/dialogs/_UnknownDeviceDialog.scss"; @import "./views/directory/_NetworkDropdown.scss"; @import "./views/elements/_AccessibleButton.scss"; diff --git a/res/css/views/dialogs/_ShareDialog.scss b/res/css/views/dialogs/_ShareDialog.scss new file mode 100644 index 0000000000..ab340ad758 --- /dev/null +++ b/res/css/views/dialogs/_ShareDialog.scss @@ -0,0 +1,89 @@ +/* +Copyright 2018 New Vector Ltd. + +Licensed under the Apache License, Version 2.0 (the "License"); +you may not use this file except in compliance with the License. +You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License. +*/ + +.mx_ShareDialog { + // this is to center the content + padding-right: 58px; +} + +.mx_ShareDialog hr { + margin-top: 25px; + margin-bottom: 10px; + border-color: $light-fg-color; +} + +.mx_ShareDialog_content { + margin: 10px 0; +} + +.mx_ShareDialog_matrixto { + display: flex; + justify-content: space-between; + border-radius: 5px; + border: solid 1px $light-fg-color; + margin-bottom: 10px; + margin-top: 30px; + padding: 10px; +} + +.mx_ShareDialog_matrixto a { + text-decoration: none; +} + +.mx_ShareDialog_matrixto_link { + flex-shrink: 1; + overflow: hidden; + text-overflow: ellipsis; +} + +.mx_ShareDialog_matrixto_copy { + flex-shrink: 0; + cursor: pointer; + margin-left: 20px; + display: inherit; +} +.mx_ShareDialog_matrixto_copy > div { + background-image: url($copy-button-url); + margin-left: 5px; + width: 20px; + height: 20px; +} + +.mx_ShareDialog_split { + display: flex; + flex-wrap: wrap; +} + +.mx_ShareDialog_qrcode_container { + float: left; + background-color: #ffffff; + padding: 5px; // makes qr code more readable in dark theme + border-radius: 5px; + height: 256px; + width: 256px; + margin-right: 64px; +} + +.mx_ShareDialog_social_container { + display: flex; + flex-wrap: wrap; + width: 299px; +} + +.mx_ShareDialog_social_icon { + margin-right: 10px; + margin-bottom: 10px; +} From 64bcf6fd7e20f562a6553742a8e9c0489fabea91 Mon Sep 17 00:00:00 2001 From: Michael Telatynski <7t3chguy@gmail.com> Date: Tue, 12 Jun 2018 11:13:04 +0100 Subject: [PATCH 04/16] allow ContextualMenu to run without background, for tooltips & fix copy Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> --- src/components/structures/ContextualMenu.js | 24 ++++++++++++-------- src/components/views/messages/TextualBody.js | 4 ++-- 2 files changed, 16 insertions(+), 12 deletions(-) diff --git a/src/components/structures/ContextualMenu.js b/src/components/structures/ContextualMenu.js index daac294d12..d6a11ca974 100644 --- a/src/components/structures/ContextualMenu.js +++ b/src/components/structures/ContextualMenu.js @@ -1,5 +1,6 @@ /* Copyright 2015, 2016 OpenMarket Ltd +Copyright 2018 Vector Creations Ltd Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. @@ -15,12 +16,10 @@ limitations under the License. */ -'use strict'; - -const classNames = require('classnames'); -const React = require('react'); -const ReactDOM = require('react-dom'); +import React from 'react'; +import ReactDOM from 'react-dom'; import PropTypes from 'prop-types'; +import classNames from 'classnames'; // Shamelessly ripped off Modal.js. There's probably a better way // of doing reusable widgets like dialog boxes & menus where we go and @@ -61,7 +60,12 @@ export default class ContextualMenu extends React.Component { // If true, insert an invisible screen-sized element behind the // menu that when clicked will close it. hasBackground: PropTypes.bool, - } + + // The component to render as the context menu + elementClass: PropTypes.element.isRequired, + // on resize callback + windowResize: PropTypes.func + }; render() { const position = {}; @@ -112,7 +116,7 @@ export default class ContextualMenu extends React.Component { `; } - const chevron =
; + const chevron =
; const className = 'mx_ContextualMenu_wrapper'; const menuClasses = classNames({ @@ -158,13 +162,13 @@ export default class ContextualMenu extends React.Component { { chevron }
- { props.hasBackground &&
} + { props.hasBackground &&
}
; } } -export function createMenu(ElementClass, props) { +export function createMenu(ElementClass, props, hasBackground=true) { const closeMenu = function(...args) { ReactDOM.unmountComponentAtNode(getOrCreateContainer()); @@ -175,8 +179,8 @@ export function createMenu(ElementClass, props) { // We only reference closeMenu once per call to createMenu const menu = Date: Tue, 12 Jun 2018 11:15:00 +0100 Subject: [PATCH 05/16] link to ShareDialog from GroupView, RoomView, UserSettings & MemberInfo Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> --- src/components/structures/GroupView.js | 13 +++++++++++++ src/components/structures/UserSettings.js | 15 +++++++++++++-- src/components/views/rooms/MemberInfo.js | 14 +++++++++++++- src/components/views/rooms/RoomHeader.js | 16 ++++++++++++++++ 4 files changed, 55 insertions(+), 3 deletions(-) diff --git a/src/components/structures/GroupView.js b/src/components/structures/GroupView.js index c7610219f7..a343d1c971 100644 --- a/src/components/structures/GroupView.js +++ b/src/components/structures/GroupView.js @@ -562,6 +562,13 @@ export default React.createClass({ }); }, + _onShareClick: function() { + const ShareDialog = sdk.getComponent("dialogs.ShareDialog"); + Modal.createTrackedDialog('share community dialog', '', ShareDialog, { + target: this._matrixClient.getGroup(this.props.groupId), + }); + }, + _onCancelClick: function() { this._closeSettings(); }, @@ -1207,6 +1214,7 @@ export default React.createClass({ shortDescNode = { summary.profile.short_description }; } } + if (this.state.editing) { rightButtons.push( , ); } + rightButtons.push( + + + , + ); if (this.props.collapsedRhs) { rightButtons.push( ; }, + onSelfShareClick: function() { + const cli = MatrixClientPeg.get(); + const ShareDialog = sdk.getComponent("dialogs.ShareDialog"); + Modal.createTrackedDialog('share self dialog', '', ShareDialog, { + target: cli.getUser(this._me), + }); + }, + _showSpoiler: function(event) { const target = event.target; target.innerHTML = target.getAttribute('data-spoiler'); @@ -1295,10 +1303,13 @@ module.exports = React.createClass({
- { _t("Logged in as:") } { this._me } + { _t("Logged in as:") + ' ' } + + { this._me } +
- { _t('Access Token:') } + { _t('Access Token:') + ' ' } diff --git a/src/components/views/rooms/MemberInfo.js b/src/components/views/rooms/MemberInfo.js index 2789c0e4cd..20c0fb8414 100644 --- a/src/components/views/rooms/MemberInfo.js +++ b/src/components/views/rooms/MemberInfo.js @@ -632,6 +632,13 @@ module.exports = withMatrixClient(React.createClass({ ); }, + onShareUserClick: function() { + const ShareDialog = sdk.getComponent("dialogs.ShareDialog"); + Modal.createTrackedDialog('share room member dialog', '', ShareDialog, { + target: this.props.member, + }); + }, + _renderUserOptions: function() { const cli = this.props.matrixClient; const member = this.props.member; @@ -705,13 +712,18 @@ module.exports = withMatrixClient(React.createClass({ } } - if (!ignoreButton && !readReceiptButton && !insertPillButton && !inviteUserButton) return null; + const shareUserButton = ( + + { _t('Share Link to User') } + + ); return (

{ _t("User Options") }

{ readReceiptButton } + { shareUserButton } { insertPillButton } { ignoreButton } { inviteUserButton } diff --git a/src/components/views/rooms/RoomHeader.js b/src/components/views/rooms/RoomHeader.js index 1851e03383..e40c715052 100644 --- a/src/components/views/rooms/RoomHeader.js +++ b/src/components/views/rooms/RoomHeader.js @@ -149,6 +149,13 @@ module.exports = React.createClass({ dis.dispatch({ action: 'show_right_panel' }); }, + onShareRoomClick: function(ev) { + const ShareDialog = sdk.getComponent("dialogs.ShareDialog"); + Modal.createTrackedDialog('share room dialog', '', ShareDialog, { + target: this.props.room, + }); + }, + _hasUnreadPins: function() { const currentPinEvent = this.props.room.currentState.getStateEvents("m.room.pinned_events", ''); if (!currentPinEvent) return false; @@ -379,6 +386,14 @@ module.exports = React.createClass({ ; } + let shareRoomButton; + if (this.props.inRoom) { + shareRoomButton = + + + ; + } + let rightPanelButtons; if (this.props.collapsedRhs) { rightPanelButtons = @@ -400,6 +415,7 @@ module.exports = React.createClass({
{ settingsButton } { pinnedEventsButton } + { shareRoomButton } { manageIntegsButton } { forgetButton } { searchButton } From d8a1feb501ad10102da8d4fee0e7a553de8dfde5 Mon Sep 17 00:00:00 2001 From: Michael Telatynski <7t3chguy@gmail.com> Date: Tue, 12 Jun 2018 11:15:30 +0100 Subject: [PATCH 06/16] fix Modal typo and refactor BaseDialog to fix " undefined" className Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> --- src/components/views/dialogs/BaseDialog.js | 23 ++++++++++++------- .../views/dialogs/ChatCreateOrReuseDialog.js | 2 +- 2 files changed, 16 insertions(+), 9 deletions(-) diff --git a/src/components/views/dialogs/BaseDialog.js b/src/components/views/dialogs/BaseDialog.js index 71a5da224c..8ec417a59b 100644 --- a/src/components/views/dialogs/BaseDialog.js +++ b/src/components/views/dialogs/BaseDialog.js @@ -18,6 +18,7 @@ limitations under the License. import React from 'react'; import FocusTrap from 'focus-trap-react'; import PropTypes from 'prop-types'; +import classNames from 'classnames'; import { MatrixClient } from 'matrix-js-sdk'; @@ -64,7 +65,10 @@ export default React.createClass({ // Id of content element // If provided, this is used to add a aria-describedby attribute - contentId: React.PropTypes.string, + contentId: PropTypes.string, + + // optional additional class for the title element + titleClass: PropTypes.string, }, getDefaultProps: function() { @@ -105,25 +109,28 @@ export default React.createClass({ render: function() { const TintableSvg = sdk.getComponent("elements.TintableSvg"); + let cancelButton; + if (this.props.hasCancel) { + cancelButton = + + ; + } + return ( - { this.props.hasCancel ? - - : null } -
+ { cancelButton } +
{ this.props.title }
{ this.props.children } diff --git a/src/components/views/dialogs/ChatCreateOrReuseDialog.js b/src/components/views/dialogs/ChatCreateOrReuseDialog.js index e2387064cf..95fd8848ba 100644 --- a/src/components/views/dialogs/ChatCreateOrReuseDialog.js +++ b/src/components/views/dialogs/ChatCreateOrReuseDialog.js @@ -187,7 +187,7 @@ export default class ChatCreateOrReuseDialog extends React.Component { } } -ChatCreateOrReuseDialog.propTyps = { +ChatCreateOrReuseDialog.propTypes = { userId: PropTypes.string.isRequired, // Called when clicking outside of the dialog onFinished: PropTypes.func.isRequired, From f9b3f0f9d1ff039fc608181138c6a771e94a7709 Mon Sep 17 00:00:00 2001 From: Michael Telatynski <7t3chguy@gmail.com> Date: Tue, 12 Jun 2018 11:15:52 +0100 Subject: [PATCH 07/16] run gen-i18n and prune-i18n Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> --- src/i18n/strings/de_DE.json | 3 -- src/i18n/strings/en_EN.json | 69 +++++++++++++++++++---------------- src/i18n/strings/eu.json | 7 ---- src/i18n/strings/fr.json | 8 ---- src/i18n/strings/hu.json | 8 ---- src/i18n/strings/it.json | 3 -- src/i18n/strings/ru.json | 4 -- src/i18n/strings/sv.json | 2 - src/i18n/strings/zh_Hant.json | 3 -- 9 files changed, 38 insertions(+), 69 deletions(-) diff --git a/src/i18n/strings/de_DE.json b/src/i18n/strings/de_DE.json index d3787a15a3..8f75b71689 100644 --- a/src/i18n/strings/de_DE.json +++ b/src/i18n/strings/de_DE.json @@ -1169,9 +1169,6 @@ "At this time it is not possible to reply with an emote.": "An dieser Stelle ist es nicht möglich mit einer Umschreibung zu antworten.", "Enable widget screenshots on supported widgets": "Widget-Screenshots bei unterstützten Widgets aktivieren", "Send analytics data": "Analysedaten senden", - "Help improve Riot by sending usage data? This will use a cookie. (See our cookie and privacy policies).": "Möchtest du Riot helfen indem du Nutzungsdaten sendest? Dies wird ein Cookie verwenden. (Siehe unsere Datenschutzerklärung).", - "Help improve Riot by sending usage data? This will use a cookie.": "Möchtest du Riot helfen indem du Nutzungsdaten sendest? Dies wird ein Cookie verwenden.", - "Yes please": "Ja, bitte", "e.g. %(exampleValue)s": "z.B. %(exampleValue)s", "Reload widget": "Widget neu laden", "To notify everyone in the room, you must be a": "Notwendiges Berechtigungslevel, um jeden im Raum zu benachrichten:", diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json index 8698e6108f..76d0cb6f33 100644 --- a/src/i18n/strings/en_EN.json +++ b/src/i18n/strings/en_EN.json @@ -42,6 +42,10 @@ "The file '%(fileName)s' failed to upload": "The file '%(fileName)s' failed to upload", "The file '%(fileName)s' exceeds this home server's size limit for uploads": "The file '%(fileName)s' exceeds this home server's size limit for uploads", "Upload Failed": "Upload Failed", + "Failure to create room": "Failure to create room", + "Server may be unavailable, overloaded, or you hit a bug.": "Server may be unavailable, overloaded, or you hit a bug.", + "Send anyway": "Send anyway", + "Send": "Send", "Sun": "Sun", "Mon": "Mon", "Tue": "Tue", @@ -81,6 +85,7 @@ "Failed to invite users to community": "Failed to invite users to community", "Failed to invite users to %(groupId)s": "Failed to invite users to %(groupId)s", "Failed to add the following rooms to %(groupId)s:": "Failed to add the following rooms to %(groupId)s:", + "Unnamed Room": "Unnamed Room", "Riot does not have permission to send you notifications - please check your browser settings": "Riot does not have permission to send you notifications - please check your browser settings", "Riot was not given permission to send notifications - please try again": "Riot was not given permission to send notifications - please try again", "Unable to enable Notifications": "Unable to enable Notifications", @@ -104,7 +109,6 @@ "You need to be logged in.": "You need to be logged in.", "You need to be able to invite users to do that.": "You need to be able to invite users to do that.", "Unable to create widget.": "Unable to create widget.", - "Reload widget": "Reload widget", "Missing roomId.": "Missing roomId.", "Failed to send request.": "Failed to send request.", "This room is not recognised.": "This room is not recognised.", @@ -180,11 +184,6 @@ "%(names)s and %(count)s others are typing|other": "%(names)s and %(count)s others are typing", "%(names)s and %(count)s others are typing|one": "%(names)s and one other is typing", "%(names)s and %(lastPerson)s are typing": "%(names)s and %(lastPerson)s are typing", - "Failure to create room": "Failure to create room", - "Server may be unavailable, overloaded, or you hit a bug.": "Server may be unavailable, overloaded, or you hit a bug.", - "Send anyway": "Send anyway", - "Send": "Send", - "Unnamed Room": "Unnamed Room", "Your browser does not support the required cryptography extensions": "Your browser does not support the required cryptography extensions", "Not a valid Riot keyfile": "Not a valid Riot keyfile", "Authentication check failed: incorrect password?": "Authentication check failed: incorrect password?", @@ -298,6 +297,29 @@ "Off": "Off", "On": "On", "Noisy": "Noisy", + "Invalid alias format": "Invalid alias format", + "'%(alias)s' is not a valid format for an alias": "'%(alias)s' is not a valid format for an alias", + "Invalid address format": "Invalid address format", + "'%(alias)s' is not a valid format for an address": "'%(alias)s' is not a valid format for an address", + "not specified": "not specified", + "not set": "not set", + "Remote addresses for this room:": "Remote addresses for this room:", + "Addresses": "Addresses", + "The main address for this room is": "The main address for this room is", + "Local addresses for this room:": "Local addresses for this room:", + "This room has no local addresses": "This room has no local addresses", + "New address (e.g. #foo:%(localDomain)s)": "New address (e.g. #foo:%(localDomain)s)", + "Invalid community ID": "Invalid community ID", + "'%(groupId)s' is not a valid community ID": "'%(groupId)s' is not a valid community ID", + "Flair": "Flair", + "Showing flair for these communities:": "Showing flair for these communities:", + "This room is not showing flair for any communities": "This room is not showing flair for any communities", + "New community ID (e.g. +foo:%(localDomain)s)": "New community ID (e.g. +foo:%(localDomain)s)", + "You have enabled URL previews by default.": "You have enabled URL previews by default.", + "You have disabled URL previews by default.": "You have disabled URL previews by default.", + "URL previews are enabled by default for participants in this room.": "URL previews are enabled by default for participants in this room.", + "URL previews are disabled by default for participants in this room.": "URL previews are disabled by default for participants in this room.", + "URL Previews": "URL Previews", "Cannot add any more widgets": "Cannot add any more widgets", "The maximum permitted number of widgets have already been added to this room.": "The maximum permitted number of widgets have already been added to this room.", "Add a widget": "Add a widget", @@ -347,6 +369,7 @@ "Jump to read receipt": "Jump to read receipt", "Mention": "Mention", "Invite": "Invite", + "Share Link to User": "Share Link to User", "User Options": "User Options", "Direct chats": "Direct chats", "Unmute": "Unmute", @@ -394,11 +417,11 @@ "numbullet": "numbullet", "Markdown is disabled": "Markdown is disabled", "Markdown is enabled": "Markdown is enabled", - "Unpin Message": "Unpin Message", - "Jump to message": "Jump to message", "No pinned messages.": "No pinned messages.", "Loading...": "Loading...", "Pinned Messages": "Pinned Messages", + "Unpin Message": "Unpin Message", + "Jump to message": "Jump to message", "%(duration)ss": "%(duration)ss", "%(duration)sm": "%(duration)sm", "%(duration)sh": "%(duration)sh", @@ -428,6 +451,7 @@ "Settings": "Settings", "Forget room": "Forget room", "Search": "Search", + "Share room": "Share room", "Show panel": "Show panel", "Drop here to favourite": "Drop here to favourite", "Drop here to tag direct chat": "Drop here to tag direct chat", @@ -531,29 +555,6 @@ "Scroll to unread messages": "Scroll to unread messages", "Jump to first unread message.": "Jump to first unread message.", "Close": "Close", - "Invalid alias format": "Invalid alias format", - "'%(alias)s' is not a valid format for an alias": "'%(alias)s' is not a valid format for an alias", - "Invalid address format": "Invalid address format", - "'%(alias)s' is not a valid format for an address": "'%(alias)s' is not a valid format for an address", - "not specified": "not specified", - "not set": "not set", - "Remote addresses for this room:": "Remote addresses for this room:", - "Addresses": "Addresses", - "The main address for this room is": "The main address for this room is", - "Local addresses for this room:": "Local addresses for this room:", - "This room has no local addresses": "This room has no local addresses", - "New address (e.g. #foo:%(localDomain)s)": "New address (e.g. #foo:%(localDomain)s)", - "Invalid community ID": "Invalid community ID", - "'%(groupId)s' is not a valid community ID": "'%(groupId)s' is not a valid community ID", - "Flair": "Flair", - "Showing flair for these communities:": "Showing flair for these communities:", - "This room is not showing flair for any communities": "This room is not showing flair for any communities", - "New community ID (e.g. +foo:%(localDomain)s)": "New community ID (e.g. +foo:%(localDomain)s)", - "You have enabled URL previews by default.": "You have enabled URL previews by default.", - "You have disabled URL previews by default.": "You have disabled URL previews by default.", - "URL previews are enabled by default for participants in this room.": "URL previews are enabled by default for participants in this room.", - "URL previews are disabled by default for participants in this room.": "URL previews are disabled by default for participants in this room.", - "URL Previews": "URL Previews", "Sunday": "Sunday", "Monday": "Monday", "Tuesday": "Tuesday", @@ -664,6 +665,7 @@ "Delete widget": "Delete widget", "Revoke widget access": "Revoke widget access", "Minimize apps": "Minimize apps", + "Reload widget": "Reload widget", "Popout widget": "Popout widget", "Picture": "Picture", "Edit": "Edit", @@ -856,6 +858,11 @@ "(HTTP status %(httpStatus)s)": "(HTTP status %(httpStatus)s)", "Please set a password!": "Please set a password!", "This will allow you to return to your account after signing out, and sign in on other devices.": "This will allow you to return to your account after signing out, and sign in on other devices.", + "Share Room": "Share Room", + "Link to most recent message": "Link to most recent message", + "Share User": "Share User", + "Share Community": "Share Community", + "COPY": "COPY", "You are currently blacklisting unverified devices; to send messages to these devices you must verify them.": "You are currently blacklisting unverified devices; to send messages to these devices you must verify them.", "We recommend you go through the verification process for each device to confirm they belong to their legitimate owner, but you can resend the message without verifying if you prefer.": "We recommend you go through the verification process for each device to confirm they belong to their legitimate owner, but you can resend the message without verifying if you prefer.", "Room contains unknown devices": "Room contains unknown devices", diff --git a/src/i18n/strings/eu.json b/src/i18n/strings/eu.json index 909b466da3..fe9d3db424 100644 --- a/src/i18n/strings/eu.json +++ b/src/i18n/strings/eu.json @@ -1170,20 +1170,13 @@ "Enable widget screenshots on supported widgets": "Gaitu trepeten pantaila-argazkiak onartzen duten trepetetan", "Send analytics data": "Bidali datu analitikoak", "Muted Users": "Mutututako erabiltzaileak", - "Help improve Riot by sending usage data? This will use a cookie. (See our cookie and privacy policies).": "Riot hobetzen lagundu nahi erabilera datuak bidaliz? Honek cookie bat erabiliko du. (Ikusi gure Cookie eta pribatutasun politikak).", - "Help improve Riot by sending usage data? This will use a cookie.": "Riot hobetzen lagundu nahi erabilera datuak bidaliz? Honek cookie bat erabiliko du.", - "Yes please": "Bai mesedez", "Warning: This widget might use cookies.": "Abisua: Trepeta honek cookie-ak erabili litzake.", "Terms and Conditions": "Termino eta baldintzak", "To continue using the %(homeserverDomain)s homeserver you must review and agree to our terms and conditions.": "%(homeserverDomain)s hasiera-zerbitzaria erabiltzen jarraitzeko gure termino eta baldintzak irakurri eta onartu behar dituzu.", "Review terms and conditions": "Irakurri termino eta baldintzak", "Failed to indicate account erasure": "Ezin izan da kontuaren ezabaketa jakinarazi", - "This will make your account permanently unusable. You will not be able to log in, and no one will be able to re-register the same user ID. This action is irreversible.": "Honek zure kontua betiko erabilgaitz bihurtuko du. Ezin izango duzu saioa hasi, eta beste inork ezin izango du erabiltzaile ID bera erabili. Ez dago ekintza hau desegiterik.", - "Deactivating your account does not by default erase messages you have sent. If you would like to erase your messages, please tick the box below.": "Zure kontua desaktibatzean ez dira lehenetsita zuk bidalitako mezuak ezabatuko. Zuk bidalitako mezuak ezabatu nahi badituzu, markatu beheko kutxa.", - "Message visibility in Matrix is similar to email. Erasing your messages means that messages have you sent will not be shared with any new or unregistered users, but registered users who already had access to these messages will still have access to their copy.": "Matrix-eko mezuen ikusgaitasuna, e-mail mezuen antzekoa da. Zure mezuak ezabatzeak esan nahi du bidali dituzun mezuak ez direla erabiltzaile berriekin partekatuko, baina aurretik zure mezuak jaso dituzten erabiltzaile erregistratuek bere kopia izango dute.", "To continue, please enter your password:": "Jarraitzeko, sartu zure pasahitza:", "password": "pasahitza", - "Please erase all messages I have sent when my account is deactivated. (Warning: this will cause future users to see an incomplete view of conversations, which is a bad experience).": "Ezabatu bidali ditudan mezu guztiak nire kontua desaktibatzean. (Abisua: Etorkizuneko erabiltzaileek elkarrizketa partzialak ikusiko dituzte, esperientzia kaskarra sortuz).", "e.g. %(exampleValue)s": "adib. %(exampleValue)s", "Reload widget": "Birkargatu trepeta", "To notify everyone in the room, you must be a": "Gelan dauden guztiei jakinarazteko", diff --git a/src/i18n/strings/fr.json b/src/i18n/strings/fr.json index 8dd45192e6..367e89d2b6 100644 --- a/src/i18n/strings/fr.json +++ b/src/i18n/strings/fr.json @@ -1169,25 +1169,17 @@ "Collapse Reply Thread": "Dévoiler le fil de réponse", "Enable widget screenshots on supported widgets": "Activer les captures d'écran des widgets pris en charge", "Send analytics data": "Envoyer les données analytiques", - "Help improve Riot by sending usage data? This will use a cookie. (See our cookie and privacy policies).": "Aider Riot à s'améliorer en envoyant des données d'utilisation ? Ceci utilisera un cookie. (Voir nos politiques de cookie et de confidentialité).", - "Help improve Riot by sending usage data? This will use a cookie.": "Aider Riot à s'améliorer en envoyant des données d'utilisation ? Ceci utilisera un cookie.", - "Yes please": "Oui, s'il vous plaît", "Muted Users": "Utilisateurs ignorés", "Warning: This widget might use cookies.": "Avertissement : ce widget utilise peut-être des cookies.", "Terms and Conditions": "Conditions générales", "To continue using the %(homeserverDomain)s homeserver you must review and agree to our terms and conditions.": "Pour continuer à utiliser le serveur d'accueil %(homeserverDomain)s, vous devez lire et accepter nos conditions générales.", "Review terms and conditions": "Voir les conditions générales", "Failed to indicate account erasure": "Échec de notification de la suppression du compte", - "This will make your account permanently unusable. You will not be able to log in, and no one will be able to re-register the same user ID. This action is irreversible.": "Cela rendra votre compte inutilisable de façon permanente. Vous ne pourrez plus vous connecter et ne pourrez plus vous enregistrer avec le même identifiant d'utilisateur. Cette action est irréversible.", - "Deactivating your account does not by default erase messages you have sent. If you would like to erase your messages, please tick the box below.": "Désactiver votre compte ne supprime pas les messages que vous avez envoyés par défaut. Si vous souhaitez supprimer vos messages, cochez la case ci-dessous.", - "Message visibility in Matrix is similar to email. Erasing your messages means that messages have you sent will not be shared with any new or unregistered users, but registered users who already had access to these messages will still have access to their copy.": "La visibilité des messages dans Matrix est la même que celle des e-mails. Supprimer vos messages signifie que les messages que vous avez envoyés ne seront pas partagés avec de nouveaux utilisateurs ou les utilisateurs non enregistrés, mais les utilisateurs enregistrés qui ont déjà eu accès à vos messages continueront d'en avoir une copie.", "To continue, please enter your password:": "Pour continuer, veuillez renseigner votre mot de passe :", "password": "mot de passe", - "Please erase all messages I have sent when my account is deactivated. (Warning: this will cause future users to see an incomplete view of conversations, which is a bad experience).": "Veuillez supprimer tous les messages que j'ai envoyé quand mon compte est désactivé. (Attention : les futurs utilisateurs verront alors des conversations incomplètes, ce qui est une mauvaise expérience).", "This will make your account permanently unusable. You will not be able to log in, and no one will be able to re-register the same user ID. This will cause your account to leave all rooms it is participating in, and it will remove your account details from your identity server. This action is irreversible.": "Votre compte sera inutilisable de façon permanente. Vous ne pourrez plus vous reconnecter et personne ne pourra se réenregistrer avec le même identifiant d'utilisateur. Votre compte quittera tous les salons auxquels il participe et tous ses détails seront supprimés du serveur d'identité. Cette action est irréversible.", "Deactivating your account does not by default cause us to forget messages you have sent. If you would like us to forget your messages, please tick the box below.": "La désactivation du compte ne nous fait pas oublier les messages que vous avez envoyés par défaut. Si vous souhaitez que nous les oubliions, cochez la case ci-dessous.", "e.g. %(exampleValue)s": "par ex. %(exampleValue)s", - "Help improve Riot by sending usage data? This will use a cookie. (See our cookie and privacy policies).": "Aider Riot à s'améliorer en envoyant des données d'utilisation ? Cela utilisera un cookie. (Voir nos politiques de cookie et de confidentialité).", "Message visibility in Matrix is similar to email. Our forgetting your messages means that messages you have sent will not be shared with any new or unregistered users, but registered users who already have access to these messages will still have access to their copy.": "La visibilité des messages dans Matrix est la même que celle des e-mails. Quand nous oublions vos messages, cela signifie que les messages que vous avez envoyés ne seront partagés avec aucun nouvel utilisateur ou avec les utilisateurs non enregistrés, mais les utilisateurs enregistrés qui ont déjà eu accès à ces messages en conserveront leur propre copie.", "Please forget all messages I have sent when my account is deactivated (Warning: this will cause future users to see an incomplete view of conversations)": "Veuillez oublier tous les messages que j'ai envoyé quand mon compte sera désactivé (Avertissement : les futurs utilisateurs verront des conversations incomplètes)", "Reload widget": "Recharger le widget", diff --git a/src/i18n/strings/hu.json b/src/i18n/strings/hu.json index 6b52958ea6..3d8100d8f1 100644 --- a/src/i18n/strings/hu.json +++ b/src/i18n/strings/hu.json @@ -1169,27 +1169,19 @@ "Collapse Reply Thread": "Beszélgetés szál becsukása", "Enable widget screenshots on supported widgets": "Ahol az a kisalkalmazásban támogatott ott képernyőkép készítés engedélyezése", "Send analytics data": "Analitikai adatok küldése", - "Help improve Riot by sending usage data? This will use a cookie. (See our cookie and privacy policies).": "Szeretnél segíteni a Riot javításában analitikai adatok elküldésével? Ez sütit (cookie) használ. (Nézd meg a sütikről és titoktartási irányelvekről szóló leírást).", - "Help improve Riot by sending usage data? This will use a cookie.": "Szeretnél segíteni a Riot javításában analitikai adatok elküldésével? Ez sütit (cookie) használ.", - "Yes please": "Igen, kérlek", "Muted Users": "Elnémított felhasználók", "Warning: This widget might use cookies.": "Figyelmeztetés: Ez a kisalkalmazás sütiket (cookies) használhat.", "Terms and Conditions": "Általános Szerződési Feltételek", "To continue using the %(homeserverDomain)s homeserver you must review and agree to our terms and conditions.": "A %(homeserverDomain)s szerver használatának folytatásához el kell olvasnod és el kell fogadnod az általános szerződési feltételeket.", "Review terms and conditions": "Általános Szerződési Feltételek elolvasása", "Failed to indicate account erasure": "A fiók törlésének jelzése sikertelen", - "This will make your account permanently unusable. You will not be able to log in, and no one will be able to re-register the same user ID. This action is irreversible.": "Ezzel a felhasználói fiókod végleg használhatatlanná válik. Nem tudsz bejelentkezni, és senki más sem fog tudni újra regisztrálni ugyanezzel az azonosítóval. Ez a művelet visszafordíthatatlan.", - "Deactivating your account does not by default erase messages you have sent. If you would like to erase your messages, please tick the box below.": "A felhasználói fiók felfüggesztése alapértelmezetten nem töröli semelyik általad küldött üzenetet. Ha az elküldött üzeneteidet törölni szeretnéd pipáld be a jelölőnégyzetet alul.", - "Message visibility in Matrix is similar to email. Erasing your messages means that messages have you sent will not be shared with any new or unregistered users, but registered users who already had access to these messages will still have access to their copy.": "Az üzenetek láthatósága a Matrixban olyan mint az e-mail. Az üzeneted törlése azt jelenti, hogy amit elküldtél már nem lesz megosztva új- vagy vendég felhasználóval, de azok a regisztrált felhasználók akik már látták az üzenetet továbbra is hozzáférnek a saját példányukhoz.", "To continue, please enter your password:": "Folytatáshoz add meg a jelszavad:", "password": "jelszó", - "Please erase all messages I have sent when my account is deactivated. (Warning: this will cause future users to see an incomplete view of conversations, which is a bad experience).": "Töröld az összes üzenetet amit küldtem amikor felfüggeszted a felhasználói fiókomat. (Figyelem: ezzel a jövőbeni felhasználók csak részleges beszélgetést láthatnak majd, ami rosszul eshet).", "This will make your account permanently unusable. You will not be able to log in, and no one will be able to re-register the same user ID. This will cause your account to leave all rooms it is participating in, and it will remove your account details from your identity server. This action is irreversible.": "Ez végleg használhatatlanná teszi a fiókodat. Ezután nem fogsz tudni bejelentkezni, és más sem tud majd ezzel az azonosítóval fiókot létrehozni. Minden szobából amibe beléptél ki fogsz lépni, és törölni fogja minden fiók adatod az \"identity\" szerverről. Ez a művelet visszafordíthatatlan.", "Deactivating your account does not by default cause us to forget messages you have sent. If you would like us to forget your messages, please tick the box below.": "A fiókod felfüggesztése nem jelenti alapértelmezetten azt, hogy az általad küldött üzenetek elfelejtődnek. Ha törölni szeretnéd az általad küldött üzeneteket, pipáld be a jelölőnégyzetet alul.", "Message visibility in Matrix is similar to email. Our forgetting your messages means that messages you have sent will not be shared with any new or unregistered users, but registered users who already have access to these messages will still have access to their copy.": "Az üzenetek láthatósága a Matrixban hasonlít az emailhez. Az általad küldött üzenet törlése azt jelenti, hogy nem osztjuk meg új-, vagy vendég felhasználóval de a már regisztrált felhasználók akik már hozzáfértek az üzenethez továbbra is elérik a saját másolatukat.", "Please forget all messages I have sent when my account is deactivated (Warning: this will cause future users to see an incomplete view of conversations)": "Kérlek töröld az összes általam küldött üzenetet amikor a fiókomat felfüggesztem (Figyelem: ez azt eredményezheti, hogy a jövőbeni felhasználók csak részleges beszélgetést látnak majd)", "e.g. %(exampleValue)s": "pl. %(exampleValue)s", - "Help improve Riot by sending usage data? This will use a cookie. (See our cookie and privacy policies).": "Segítesz jobbá tenni a Riotot használati adat küldésével? Ez sütit (cookie) fog használni. (Nézd meg az Általános Szerződési Feltételeket).", "Reload widget": "Kisalkalmazás újratöltése", "Please help improve Riot.im by sending anonymous usage data. This will use a cookie (please see our Cookie Policy).": "Kérlek segíts javítani a Riot.im-et azzal, hogy anonim felhasználási adatokat küldesz. Ez szütit (cookie) fog használni (lásd a sütire vonatkozó szabályozásunkat).", "Please help improve Riot.im by sending anonymous usage data. This will use a cookie.": "Kérlek segíts javítani a Riot.im-et azzal, hogy anonim felhasználási adatokat küldesz. Ez szütit (cookie) fog használni.", diff --git a/src/i18n/strings/it.json b/src/i18n/strings/it.json index fa22725f78..c73dc8b60d 100644 --- a/src/i18n/strings/it.json +++ b/src/i18n/strings/it.json @@ -1159,9 +1159,6 @@ "Refresh": "Aggiorna", "We encountered an error trying to restore your previous session.": "Abbiamo riscontrato un errore tentando di ripristinare la tua sessione precedente.", "Send analytics data": "Invia dati statistici", - "Help improve Riot by sending usage data? This will use a cookie. (See our cookie and privacy policies).": "Aiutare a migliorare Riot inviando statistiche d'uso? Verrà usato un cookie. (Vedi la nostra politica sui cookie e sulla privacy).", - "Help improve Riot by sending usage data? This will use a cookie.": "Aiutare a migliorare Riot inviando statistiche d'uso? Verrà usato un cookie.", - "Yes please": "Sì grazie", "Clear Storage and Sign Out": "Elimina lo storage e disconnetti", "Send Logs": "Invia i log", "Clearing your browser's storage may fix the problem, but will sign you out and cause any encrypted chat history to become unreadable.": "Eliminare lo storage del browser potrebbe risolvere il problema, ma verrai disconnesso e la cronologia delle chat criptate sarà illeggibile.", diff --git a/src/i18n/strings/ru.json b/src/i18n/strings/ru.json index 9d7f8901ab..2bdce2fe4f 100644 --- a/src/i18n/strings/ru.json +++ b/src/i18n/strings/ru.json @@ -1167,16 +1167,12 @@ "Enable widget screenshots on supported widgets": "Включить скриншоты виджета в поддерживаемых виджетах", "Collapse Reply Thread": "Ответить с цитированием", "Send analytics data": "Отправить данные аналитики", - "Help improve Riot by sending usage data? This will use a cookie. (See our cookie and privacy policies).": "Помогите улучшить Riot, отправляя данные об использовании? Будут использоваться файлы cookie. (См. наши политики cookie и конфиденциальности).", - "Help improve Riot by sending usage data? This will use a cookie.": "Помогите улучшить Riot, отправляя данные об использовании? Будут использоваться файлы cookie.", - "Yes please": "Да, пожалуйста", "Muted Users": "Приглушенные пользователи", "Warning: This widget might use cookies.": "Внимание: этот виджет может использовать cookie.", "Terms and Conditions": "Условия и положения", "To continue using the %(homeserverDomain)s homeserver you must review and agree to our terms and conditions.": "Для продолжения использования сервера %(homeserverDomain)s вы должны ознакомиться и принять условия и положения.", "Review terms and conditions": "Просмотр условий и положений", "e.g. %(exampleValue)s": "напр. %(exampleValue)s", - "Help improve Riot by sending usage data? This will use a cookie. (See our cookie and privacy policies).": "Помогите улучшить Riot, отправляя данные использования? Будут использоваться файлы cookie. (Смотрите наши политики cookie и конфиденциальности).", "Failed to indicate account erasure": "Не удается удалить учетную запись", "This will make your account permanently unusable. You will not be able to log in, and no one will be able to re-register the same user ID. This will cause your account to leave all rooms it is participating in, and it will remove your account details from your identity server. This action is irreversible.": "Это навсегда сделает вашу учетную запись невозможной для использования. Вы не сможете войти в систему, и никто не сможет перерегистрировать тот же идентификатор пользователя. Это приведет к тому, что ваша учетная запись выйдет из всех комнат, в которые она входит, и будут удалены данные вашей учетной записи с сервера идентификации. Это действие необратимо.", "Deactivating your account does not by default cause us to forget messages you have sent. If you would like us to forget your messages, please tick the box below.": "По умолчанию деактивация вашей учетной записи не приведет к удалению всех ваших сообщений. Если вы хотите, чтобы мы удалили ваши сообщения, поставьте отметку в поле ниже.", diff --git a/src/i18n/strings/sv.json b/src/i18n/strings/sv.json index 8e5d8e2f21..ff64f1a8e6 100644 --- a/src/i18n/strings/sv.json +++ b/src/i18n/strings/sv.json @@ -901,8 +901,6 @@ "This setting cannot be changed later!": "Den här inställningen kan inte ändras senare!", "Unknown error": "Okänt fel", "Incorrect password": "Felaktigt lösenord", - "This will make your account permanently unusable. You will not be able to re-register the same user ID.": "Detta kommer att göra ditt konto permanent oanvändbart. Du kommer inte att kunna registrera samma användar-ID igen.", - "This action is irreversible.": "Denna åtgärd går inte att ångra.", "To verify that this device can be trusted, please contact its owner using some other means (e.g. in person or a phone call) and ask them whether the key they see in their User Settings for this device matches the key below:": "För att verifiera att denna enhet kan litas på, vänligen kontakta ägaren på annat sätt (t ex personligen eller med ett telefonsamtal) och fråga om nyckeln ägaren har i sina användarinställningar för enheten matchar nyckeln nedan:", "Device name": "Enhetsnamn", "Device key": "Enhetsnyckel", diff --git a/src/i18n/strings/zh_Hant.json b/src/i18n/strings/zh_Hant.json index 80dce1cc2d..95424eaefb 100644 --- a/src/i18n/strings/zh_Hant.json +++ b/src/i18n/strings/zh_Hant.json @@ -1170,9 +1170,6 @@ "Enable widget screenshots on supported widgets": "在支援的小工具上啟用小工具螢幕快照", "Send analytics data": "傳送分析資料", "Muted Users": "已靜音的使用者", - "Help improve Riot by sending usage data? This will use a cookie. (See our cookie and privacy policies).": "透過傳送使用情形資料來協助改善 Riot？這會使用 cookie。（參見我們的 cookie 與隱私政策）。", - "Help improve Riot by sending usage data? This will use a cookie.": "透過傳送使用情形資料來協助改善 Riot？這會使用 cookie。", - "Yes please": "好的，請", "e.g. %(exampleValue)s": "範例：%(exampleValue)s", "Reload widget": "重新載入小工具", "Please help improve Riot.im by sending anonymous usage data. This will use a cookie (please see our Cookie Policy).": "請透過傳送匿名使用資料來協助改善 Riot.im。這將會使用 cookie（請參見我們的 Cookie 政策）。", From 18546dbe06b86955b89a27dca5b29a3d3621bf11 Mon Sep 17 00:00:00 2001 From: Michael Telatynski <7t3chguy@gmail.com> Date: Tue, 12 Jun 2018 11:33:38 +0100 Subject: [PATCH 08/16] QR Code align [m] logo Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> --- src/components/views/dialogs/ShareDialog.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/components/views/dialogs/ShareDialog.js b/src/components/views/dialogs/ShareDialog.js index 8bfa0ad931..a88052ee6d 100644 --- a/src/components/views/dialogs/ShareDialog.js +++ b/src/components/views/dialogs/ShareDialog.js @@ -186,7 +186,7 @@ export default class ShareDialog extends React.Component {

QR Code

- +
From d4578783ef3b3ae6a788b2059f57d4b23381fea2 Mon Sep 17 00:00:00 2001 From: Michael Telatynski <7t3chguy@gmail.com> Date: Wed, 13 Jun 2018 18:46:02 +0100 Subject: [PATCH 09/16] apply pr review feedback fix copyright headers fix user settings link accessibility fix typo and add noopener Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> --- src/components/structures/ContextualMenu.js | 2 +- src/components/structures/UserSettings.js | 4 ++-- src/components/views/dialogs/ShareDialog.js | 9 +++++---- 3 files changed, 8 insertions(+), 7 deletions(-) diff --git a/src/components/structures/ContextualMenu.js b/src/components/structures/ContextualMenu.js index d6a11ca974..12603c1b45 100644 --- a/src/components/structures/ContextualMenu.js +++ b/src/components/structures/ContextualMenu.js @@ -1,6 +1,6 @@ /* Copyright 2015, 2016 OpenMarket Ltd -Copyright 2018 Vector Creations Ltd +Copyright 2018 New Vector Ltd Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/src/components/structures/UserSettings.js b/src/components/structures/UserSettings.js index 8511010ed6..25ca70056b 100644 --- a/src/components/structures/UserSettings.js +++ b/src/components/structures/UserSettings.js @@ -1304,9 +1304,9 @@ module.exports = React.createClass({
{ _t("Logged in as:") + ' ' } - + { this._me } - +
{ _t('Access Token:') + ' ' } diff --git a/src/components/views/dialogs/ShareDialog.js b/src/components/views/dialogs/ShareDialog.js index a88052ee6d..e68922d35a 100644 --- a/src/components/views/dialogs/ShareDialog.js +++ b/src/components/views/dialogs/ShareDialog.js @@ -1,5 +1,5 @@ /* -Copyright 2018 Vector Creations Ltd +Copyright 2018 New Vector Ltd Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. @@ -37,7 +37,7 @@ const socials = [ img: 'img/social/', url: (url) => `https://plus.google.com/share?url=${url}`, },*/ { - name: 'Linked In', + name: 'LinkedIn', img: 'img/social/linkedin.png', url: (url) => `https://www.linkedin.com/shareArticle?mini=true&url=${url}`, }, { @@ -193,13 +193,14 @@ export default class ShareDialog extends React.Component {

Social

{ - socials.map((social) => - + {social.name} ) }
From aa7d62b7402499297853fad02950679f8a279ce8 Mon Sep 17 00:00:00 2001 From: Michael Telatynski <7t3chguy@gmail.com> Date: Thu, 14 Jun 2018 13:20:16 +0100 Subject: [PATCH 10/16] fix naming of methods and fields Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> --- src/components/views/dialogs/ShareDialog.js | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/src/components/views/dialogs/ShareDialog.js b/src/components/views/dialogs/ShareDialog.js index e68922d35a..97d496adbc 100644 --- a/src/components/views/dialogs/ShareDialog.js +++ b/src/components/views/dialogs/ShareDialog.js @@ -67,10 +67,10 @@ export default class ShareDialog extends React.Component { super(props); this.onCopyClick = this.onCopyClick.bind(this); - this.onCheckboxClick = this.onCheckboxClick.bind(this); + this.onLinkRecentCheckboxClick = this.onLinkRecentCheckboxClick.bind(this); this.state = { - ticked: false, + linkRecentTicked: false, }; } @@ -116,9 +116,9 @@ export default class ShareDialog extends React.Component { e.target.onmouseleave = close; } - onCheckboxClick() { + onLinkRecentCheckboxClick() { this.setState({ - ticked: !this.state.ticked, + linkRecentTicked: !this.state.linkRecentTicked, }); } @@ -135,16 +135,16 @@ export default class ShareDialog extends React.Component { if (events.length > 0) { checkbox =
+ onClick={this.onLinkRecentCheckboxClick} />
; } - if (this.state.ticked) { + if (this.state.linkRecentTicked) { matrixToUrl = makeEventPermalink(this.props.target.roomId, events[events.length - 1].getId()); } else { matrixToUrl = makeRoomPermalink(this.props.target.roomId); From 7d7a6f3d9c904874c352470d658b981196b3c8c9 Mon Sep 17 00:00:00 2001 From: Michael Telatynski <7t3chguy@gmail.com> Date: Thu, 14 Jun 2018 13:35:35 +0100 Subject: [PATCH 11/16] ShareDialog share Message, link to timestamp and permalink in ctx menu Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> --- .../views/context_menus/MessageContextMenu.js | 11 ++++++++++- src/components/views/dialogs/ShareDialog.js | 7 +++++-- src/components/views/rooms/EventTile.js | 15 +++++++++++++-- 3 files changed, 28 insertions(+), 5 deletions(-) diff --git a/src/components/views/context_menus/MessageContextMenu.js b/src/components/views/context_menus/MessageContextMenu.js index 99ec493ced..bdd267c4ee 100644 --- a/src/components/views/context_menus/MessageContextMenu.js +++ b/src/components/views/context_menus/MessageContextMenu.js @@ -184,6 +184,15 @@ module.exports = React.createClass({ this.closeMenu(); }, + onPermalinkClick: function(e: Event) { + e.preventDefault(); + const ShareDialog = sdk.getComponent("dialogs.ShareDialog"); + Modal.createTrackedDialog('share room message dialog', '', ShareDialog, { + target: this.props.mxEvent, + }); + this.closeMenu(); + }, + onReplyClick: function() { dis.dispatch({ action: 'reply_to_event', @@ -290,7 +299,7 @@ module.exports = React.createClass({ const permalinkButton = (
{ _t('Permalink') } + target="_blank" rel="noopener" onClick={this.onPermalinkClick}>{ _t('Share Message') }
); diff --git a/src/components/views/dialogs/ShareDialog.js b/src/components/views/dialogs/ShareDialog.js index 97d496adbc..12efc8b919 100644 --- a/src/components/views/dialogs/ShareDialog.js +++ b/src/components/views/dialogs/ShareDialog.js @@ -16,7 +16,7 @@ limitations under the License. import React from 'react'; import PropTypes from 'prop-types'; -import {Room, User, Group, RoomMember} from 'matrix-js-sdk'; +import {Room, User, Group, RoomMember, MatrixEvent} from 'matrix-js-sdk'; import sdk from '../../../index'; import { _t } from '../../../languageHandler'; import QRCode from 'qrcode-react'; @@ -59,7 +59,7 @@ export default class ShareDialog extends React.Component { PropTypes.instanceOf(User), PropTypes.instanceOf(Group), PropTypes.instanceOf(RoomMember), - // PropTypes.instanceOf(MatrixEvent), + PropTypes.instanceOf(MatrixEvent), ]).isRequired, }; @@ -155,6 +155,9 @@ export default class ShareDialog extends React.Component { } else if (this.props.target instanceof Group) { title = _t('Share Community'); matrixToUrl = makeGroupPermalink(this.props.target.groupId); + } else if (this.props.target instanceof MatrixEvent) { + title = _t('Share Room Message'); + matrixToUrl = makeEventPermalink(this.props.target.roomId, this.props.target.eventId); } const encodedUrl = encodeURIComponent(matrixToUrl); diff --git a/src/components/views/rooms/EventTile.js b/src/components/views/rooms/EventTile.js index 589524bb9e..1160c7c886 100644 --- a/src/components/views/rooms/EventTile.js +++ b/src/components/views/rooms/EventTile.js @@ -438,6 +438,17 @@ module.exports = withMatrixClient(React.createClass({ }); }, + onPermalinkShareClicked: function(e) { + // These permalinks are like above, can be opened in new tab/window to matrix.to + // but otherwise fire the ShareDialog as it makes little sense to click permalink + // whilst it is in the current room + e.preventDefault(); + const ShareDialog = sdk.getComponent("dialogs.ShareDialog"); + Modal.createTrackedDialog('share room event dialog', '', ShareDialog, { + target: this.props.mxEvent, + }); + }, + _renderE2EPadlock: function() { const ev = this.props.mxEvent; const props = {onClick: this.onCryptoClicked}; @@ -667,7 +678,7 @@ module.exports = withMatrixClient(React.createClass({ { avatar } { sender }
- + { timestamp } { this._renderE2EPadlock() } @@ -694,7 +705,7 @@ module.exports = withMatrixClient(React.createClass({ { avatar } { sender }
- + { timestamp } { this._renderE2EPadlock() } From e1d3c2e4c73536f1f755edeb6aa18e7533b7b3fb Mon Sep 17 00:00:00 2001 From: Michael Telatynski <7t3chguy@gmail.com> Date: Thu, 14 Jun 2018 13:36:39 +0100 Subject: [PATCH 12/16] run gen-i18n and prune-i18n Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> --- src/i18n/strings/be.json | 1 - src/i18n/strings/bg.json | 1 - src/i18n/strings/ca.json | 1 - src/i18n/strings/cs.json | 1 - src/i18n/strings/da.json | 1 - src/i18n/strings/de_DE.json | 1 - src/i18n/strings/el.json | 1 - src/i18n/strings/en_EN.json | 3 ++- src/i18n/strings/en_US.json | 1 - src/i18n/strings/eo.json | 1 - src/i18n/strings/es.json | 1 - src/i18n/strings/eu.json | 1 - src/i18n/strings/fa.json | 1 - src/i18n/strings/fi.json | 1 - src/i18n/strings/fr.json | 1 - src/i18n/strings/gl.json | 1 - src/i18n/strings/he.json | 1 - src/i18n/strings/hu.json | 1 - src/i18n/strings/id.json | 1 - src/i18n/strings/is.json | 1 - src/i18n/strings/it.json | 1 - src/i18n/strings/ja.json | 1 - src/i18n/strings/ko.json | 1 - src/i18n/strings/lt.json | 1 - src/i18n/strings/lv.json | 1 - src/i18n/strings/ml.json | 1 - src/i18n/strings/nb_NO.json | 1 - src/i18n/strings/nl.json | 1 - src/i18n/strings/pl.json | 1 - src/i18n/strings/pt.json | 1 - src/i18n/strings/pt_BR.json | 1 - src/i18n/strings/ru.json | 1 - src/i18n/strings/sk.json | 1 - src/i18n/strings/sq.json | 1 - src/i18n/strings/sr.json | 1 - src/i18n/strings/sv.json | 1 - src/i18n/strings/ta.json | 1 - src/i18n/strings/th.json | 1 - src/i18n/strings/tr.json | 1 - src/i18n/strings/uk.json | 1 - src/i18n/strings/zh_Hans.json | 1 - src/i18n/strings/zh_Hant.json | 1 - 42 files changed, 2 insertions(+), 42 deletions(-) diff --git a/src/i18n/strings/be.json b/src/i18n/strings/be.json index 7e79f5d355..31360c87f4 100644 --- a/src/i18n/strings/be.json +++ b/src/i18n/strings/be.json @@ -31,7 +31,6 @@ "Noisy": "Шумна", "Resend": "Паўторна", "On": "Уключыць", - "Permalink": "Пастаянная спасылка", "remove %(name)s from the directory.": "выдаліць %(name)s з каталога.", "Off": "Выключыць", "Delete the room alias %(alias)s and remove %(name)s from the directory?": "Выдаліць псеўданім пакоя %(alias)s і выдаліць %(name)s з каталога?", diff --git a/src/i18n/strings/bg.json b/src/i18n/strings/bg.json index d157f4dff8..b86941b3b7 100644 --- a/src/i18n/strings/bg.json +++ b/src/i18n/strings/bg.json @@ -1125,7 +1125,6 @@ "Set Password": "Задаване на парола", "An error occurred whilst saving your email notification preferences.": "Възникна грешка при запазване на настройките за имейл известяване.", "Enable audible notifications in web client": "Включване на звукови известия в уеб клиент", - "Permalink": "Permalink", "Off": "Изключено", "Riot does not know how to join a room on this network": "Riot не знае как да се присъедини към стая от тази мрежа", "Mentions only": "Само при споменаване", diff --git a/src/i18n/strings/ca.json b/src/i18n/strings/ca.json index 407b9f61d4..f7212619b2 100644 --- a/src/i18n/strings/ca.json +++ b/src/i18n/strings/ca.json @@ -1004,7 +1004,6 @@ "Unable to fetch notification target list": "No s'ha pogut obtenir la llista d'objectius de les notificacions", "Set Password": "Establiu una contrasenya", "Enable audible notifications in web client": "Habilita les notificacions d'àudio al client web", - "Permalink": "Enllaç permanent", "Off": "Apagat", "Riot does not know how to join a room on this network": "El Riot no sap com unir-se a una sala en aquesta xarxa", "Mentions only": "Només mencions", diff --git a/src/i18n/strings/cs.json b/src/i18n/strings/cs.json index 33c7a3d5f1..99424d6043 100644 --- a/src/i18n/strings/cs.json +++ b/src/i18n/strings/cs.json @@ -1062,7 +1062,6 @@ "Set Password": "Nastavit heslo", "An error occurred whilst saving your email notification preferences.": "Při ukládání nastavení e-mailových upozornění nastala chyba.", "Enable audible notifications in web client": "Povolit zvuková upozornění ve webové aplikaci", - "Permalink": "Trvalý odkaz", "Off": "Vypnout", "#example": "#příklad", "Mentions only": "Pouze zmínky", diff --git a/src/i18n/strings/da.json b/src/i18n/strings/da.json index 2a59530d5a..02497a7934 100644 --- a/src/i18n/strings/da.json +++ b/src/i18n/strings/da.json @@ -371,7 +371,6 @@ "Unable to fetch notification target list": "Kan ikke hente meddelelsesmålliste", "Set Password": "Indstil Password", "Enable audible notifications in web client": "Aktivér hørbare underretninger i webklienten", - "Permalink": "Permanent link", "Resend": "Send igen", "Riot does not know how to join a room on this network": "Riot ved ikke, hvordan man kan deltage i et rum på dette netværk", "Mentions only": "Kun nævninger", diff --git a/src/i18n/strings/de_DE.json b/src/i18n/strings/de_DE.json index 8f75b71689..9688f4da8f 100644 --- a/src/i18n/strings/de_DE.json +++ b/src/i18n/strings/de_DE.json @@ -1126,7 +1126,6 @@ "Unable to fetch notification target list": "Liste der Benachrichtigungsempfänger konnte nicht abgerufen werden", "Set Password": "Passwort einrichten", "Enable audible notifications in web client": "Audio-Benachrichtigungen im Web-Client aktivieren", - "Permalink": "Permanenter Link", "Off": "Aus", "Riot does not know how to join a room on this network": "Riot weiß nicht, wie es einem Raum auf diesem Netzwerk beitreten soll", "Mentions only": "Nur, wenn du erwähnt wirst", diff --git a/src/i18n/strings/el.json b/src/i18n/strings/el.json index fabd88c74a..e12f9223a2 100644 --- a/src/i18n/strings/el.json +++ b/src/i18n/strings/el.json @@ -746,7 +746,6 @@ "What's New": "Τι νέο υπάρχει", "Set Password": "Ορισμός κωδικού πρόσβασης", "Enable audible notifications in web client": "Ενεργοποίηση ηχητικών ειδοποιήσεων", - "Permalink": "Μόνιμος σύνδεσμος", "Off": "Ανενεργό", "#example": "#παράδειγμα", "Mentions only": "Μόνο αναφορές", diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json index 76d0cb6f33..bb5ad5405b 100644 --- a/src/i18n/strings/en_EN.json +++ b/src/i18n/strings/en_EN.json @@ -862,6 +862,7 @@ "Link to most recent message": "Link to most recent message", "Share User": "Share User", "Share Community": "Share Community", + "Share Room Message": "Share Room Message", "COPY": "COPY", "You are currently blacklisting unverified devices; to send messages to these devices you must verify them.": "You are currently blacklisting unverified devices; to send messages to these devices you must verify them.", "We recommend you go through the verification process for each device to confirm they belong to their legitimate owner, but you can resend the message without verifying if you prefer.": "We recommend you go through the verification process for each device to confirm they belong to their legitimate owner, but you can resend the message without verifying if you prefer.", @@ -881,7 +882,7 @@ "View Source": "View Source", "View Decrypted Source": "View Decrypted Source", "Unhide Preview": "Unhide Preview", - "Permalink": "Permalink", + "Share Message": "Share Message", "Quote": "Quote", "Source URL": "Source URL", "Collapse Reply Thread": "Collapse Reply Thread", diff --git a/src/i18n/strings/en_US.json b/src/i18n/strings/en_US.json index 43e2041020..be71d0ae1d 100644 --- a/src/i18n/strings/en_US.json +++ b/src/i18n/strings/en_US.json @@ -816,7 +816,6 @@ "Unable to fetch notification target list": "Unable to fetch notification target list", "Set Password": "Set Password", "Enable audible notifications in web client": "Enable audible notifications in web client", - "Permalink": "Permalink", "Off": "Off", "Riot does not know how to join a room on this network": "Riot does not know how to join a room on this network", "Mentions only": "Mentions only", diff --git a/src/i18n/strings/eo.json b/src/i18n/strings/eo.json index 68645ffd9c..3c20baef9e 100644 --- a/src/i18n/strings/eo.json +++ b/src/i18n/strings/eo.json @@ -1077,7 +1077,6 @@ "Unable to fetch notification target list": "Malsukcesis akiri la liston de celoj por sciigoj", "Set Password": "Agordi pasvorton", "Enable audible notifications in web client": "Ŝalti aŭdeblajn sciigojn en la retkliento", - "Permalink": "Konstanta ligilo", "Off": "For", "Riot does not know how to join a room on this network": "Riot ne scias aliĝi al ĉambroj en tiu ĉi reto", "Mentions only": "Nur mencioj", diff --git a/src/i18n/strings/es.json b/src/i18n/strings/es.json index 8e7925ba36..b377e97e74 100644 --- a/src/i18n/strings/es.json +++ b/src/i18n/strings/es.json @@ -717,7 +717,6 @@ "Riot does not know how to join a room on this network": "Riot no sabe cómo unirse a una sala en esta red", "Set Password": "Establecer contraseña", "Enable audible notifications in web client": "Habilitar notificaciones audibles en el cliente web", - "Permalink": "Enlace permanente", "Off": "Apagado", "#example": "#ejemplo", "Mentions only": "Sólo menciones", diff --git a/src/i18n/strings/eu.json b/src/i18n/strings/eu.json index fe9d3db424..229c9d648e 100644 --- a/src/i18n/strings/eu.json +++ b/src/i18n/strings/eu.json @@ -1127,7 +1127,6 @@ "Unable to fetch notification target list": "Ezin izan da jakinarazpen helburuen zerrenda eskuratu", "Set Password": "Ezarri pasahitza", "Enable audible notifications in web client": "Gaitu jakinarazpen entzungarriak web bezeroan", - "Permalink": "Esteka iraunkorra", "Off": "Ez", "Riot does not know how to join a room on this network": "Riotek ez daki nola elkartu gela batetara sare honetan", "Mentions only": "Aipamenak besterik ez", diff --git a/src/i18n/strings/fa.json b/src/i18n/strings/fa.json index 0e532d9483..2b18ba7693 100644 --- a/src/i18n/strings/fa.json +++ b/src/i18n/strings/fa.json @@ -124,7 +124,6 @@ "Set Password": "پسوردتان را انتخاب کنید", "An error occurred whilst saving your email notification preferences.": "خطایی در حین ذخیره‌ی ترجیجات شما درباره‌ی رایانامه رخ داد.", "Enable audible notifications in web client": "آگاه‌سازی صدادار را در کارگزار وب فعال کن", - "Permalink": "پایاپیوند", "Off": "خاموش", "Riot does not know how to join a room on this network": "رایوت از چگونگی ورود به یک گپ در این شبکه اطلاعی ندارد", "Mentions only": "فقط نام‌بردن‌ها", diff --git a/src/i18n/strings/fi.json b/src/i18n/strings/fi.json index e5787ab561..204ed4ba87 100644 --- a/src/i18n/strings/fi.json +++ b/src/i18n/strings/fi.json @@ -1050,7 +1050,6 @@ "Set Password": "Aseta salasana", "An error occurred whilst saving your email notification preferences.": "Sähköposti-ilmoitusasetuksia tallettaessa tapahtui virhe.", "Enable audible notifications in web client": "Ota käyttöön äänelliset ilmoitukset", - "Permalink": "Pysyvä linkki", "remove %(name)s from the directory.": "poista %(name)s hakemistosta.", "Off": "Pois päältä", "Riot does not know how to join a room on this network": "Riot ei tiedä miten liittya huoneeseen tässä verkossa", diff --git a/src/i18n/strings/fr.json b/src/i18n/strings/fr.json index 367e89d2b6..fa33d58846 100644 --- a/src/i18n/strings/fr.json +++ b/src/i18n/strings/fr.json @@ -1121,7 +1121,6 @@ "Unable to fetch notification target list": "Impossible de récupérer la liste des appareils recevant les notifications", "Set Password": "Définir un mot de passe", "Enable audible notifications in web client": "Activer les notifications sonores pour le client web", - "Permalink": "Permalien", "Off": "Désactivé", "Riot does not know how to join a room on this network": "Riot ne peut pas joindre un salon sur ce réseau", "Mentions only": "Seulement les mentions", diff --git a/src/i18n/strings/gl.json b/src/i18n/strings/gl.json index fdab066031..70d0889ae0 100644 --- a/src/i18n/strings/gl.json +++ b/src/i18n/strings/gl.json @@ -1127,7 +1127,6 @@ "Unable to fetch notification target list": "Non se puido procesar a lista de obxetivo de notificacións", "Set Password": "Establecer contrasinal", "Enable audible notifications in web client": "Habilitar notificacións audibles no cliente web", - "Permalink": "Ligazón permanente", "Off": "Off", "Riot does not know how to join a room on this network": "Riot non sabe cómo conectar con unha sala en esta rede", "Mentions only": "Só mencións", diff --git a/src/i18n/strings/he.json b/src/i18n/strings/he.json index dbae2858a9..7d96dfa089 100644 --- a/src/i18n/strings/he.json +++ b/src/i18n/strings/he.json @@ -221,7 +221,6 @@ "Unable to fetch notification target list": "לא ניתן לאחזר רשימת יעדי התראה", "Set Password": "הגדר סיסמא", "Enable audible notifications in web client": "אפשר התראות קוליות בדפדפן", - "Permalink": "קישור קבוע", "Off": "סגור", "Riot does not know how to join a room on this network": "Riot אינו יודע כיצד להצטרף לחדר ברשת זו", "Mentions only": "מאזכר בלבד", diff --git a/src/i18n/strings/hu.json b/src/i18n/strings/hu.json index 3d8100d8f1..e142e7506a 100644 --- a/src/i18n/strings/hu.json +++ b/src/i18n/strings/hu.json @@ -1126,7 +1126,6 @@ "Unable to fetch notification target list": "Nem sikerült letölteni az értesítési célok listáját", "Set Password": "Jelszó beállítása", "Enable audible notifications in web client": "Hangértesítések engedélyezése a webkliensben", - "Permalink": "Állandó hivatkozás", "Off": "Ki", "Riot does not know how to join a room on this network": "A Riot nem tud csatlakozni szobához ezen a hálózaton", "Mentions only": "Csak ha megemlítenek", diff --git a/src/i18n/strings/id.json b/src/i18n/strings/id.json index 9db1a4a99c..f0506d873e 100644 --- a/src/i18n/strings/id.json +++ b/src/i18n/strings/id.json @@ -324,7 +324,6 @@ "Unable to fetch notification target list": "Tidak dapat mengambil daftar notifikasi target", "Set Password": "Ubah Password", "Enable audible notifications in web client": "Aktifkan notifikasi suara di klien web", - "Permalink": "Permalink", "Off": "Mati", "Riot does not know how to join a room on this network": "Riot tidak tau bagaimana gabung ruang di jaringan ini", "Mentions only": "Hanya jika disinggung", diff --git a/src/i18n/strings/is.json b/src/i18n/strings/is.json index d901c52f60..39f03156f5 100644 --- a/src/i18n/strings/is.json +++ b/src/i18n/strings/is.json @@ -380,7 +380,6 @@ "View Source": "Skoða frumkóða", "View Decrypted Source": "Skoða afkóðaða upprunaskrá", "Unhide Preview": "Birta forskoðun", - "Permalink": "Varanlegur tengill", "Quote": "Tilvitnun", "Source URL": "Upprunaslóð", "All messages (noisy)": "Öll skilaboð (hávært)", diff --git a/src/i18n/strings/it.json b/src/i18n/strings/it.json index c73dc8b60d..d96c315363 100644 --- a/src/i18n/strings/it.json +++ b/src/i18n/strings/it.json @@ -1122,7 +1122,6 @@ "What's New": "Novità", "Set Password": "Imposta Password", "Enable audible notifications in web client": "Abilita notifiche audio nel client web", - "Permalink": "Link permanente", "Off": "Spento", "#example": "#esempio", "Mentions only": "Solo le citazioni", diff --git a/src/i18n/strings/ja.json b/src/i18n/strings/ja.json index 80bd4f1ff5..741de4b551 100644 --- a/src/i18n/strings/ja.json +++ b/src/i18n/strings/ja.json @@ -223,7 +223,6 @@ "Event Type": "イベントの形式", "What's New": "新着", "Enable audible notifications in web client": "ウェブクライアントで音による通知を有効化", - "Permalink": "パーマリンク", "remove %(name)s from the directory.": "ディレクトリから %(name)s を消去する。", "Riot does not know how to join a room on this network": "Riotはこのネットワークで部屋に参加する方法を知りません", "You can now return to your account after signing out, and sign in on other devices.": "サインアウト後にあなたの\nアカウントに戻る、また、他の端末でサインインすることができます。", diff --git a/src/i18n/strings/ko.json b/src/i18n/strings/ko.json index 4e0a988223..7e58b9a253 100644 --- a/src/i18n/strings/ko.json +++ b/src/i18n/strings/ko.json @@ -754,7 +754,6 @@ "Riot does not know how to join a room on this network": "라이엇이 이 네트워크에서 방에 들어가는 법을 알 수 없어요", "Set Password": "비밀번호 설정", "Enable audible notifications in web client": "웹 클라이언트에서 알림 소리 켜기", - "Permalink": "고유주소", "Off": "끄기", "#example": "#예", "Mentions only": "답만 하기", diff --git a/src/i18n/strings/lt.json b/src/i18n/strings/lt.json index bd46c25ed8..e1525f7af1 100644 --- a/src/i18n/strings/lt.json +++ b/src/i18n/strings/lt.json @@ -161,7 +161,6 @@ "Set Password": "Nustatyti slaptažodį", "An error occurred whilst saving your email notification preferences.": "Įrašant pranešimų el. paštu nuostatas, įvyko klaida.", "Unable to join network": "Nepavyko prisijungti prie tinklo", - "Permalink": "Pastovioji nuoroda", "Register": "Registruotis", "Off": "Išjungta", "Edit": "Koreguoti", diff --git a/src/i18n/strings/lv.json b/src/i18n/strings/lv.json index 01e3ae5c6d..5622dcb408 100644 --- a/src/i18n/strings/lv.json +++ b/src/i18n/strings/lv.json @@ -1115,7 +1115,6 @@ "Unable to fetch notification target list": "Neizdevās iegūt paziņojumu mērķu sarakstu", "Set Password": "Iestatīt paroli", "Enable audible notifications in web client": "Iespējot skaņus paziņojumus web klientā", - "Permalink": "Pastāvīgā saite", "Off": "izslēgts", "Riot does not know how to join a room on this network": "Riot nezin kā pievienoties šajā tīklā esošajai istabai", "Mentions only": "Vienīgi atsauces", diff --git a/src/i18n/strings/ml.json b/src/i18n/strings/ml.json index 6de7e92df7..a4bf0b421a 100644 --- a/src/i18n/strings/ml.json +++ b/src/i18n/strings/ml.json @@ -137,7 +137,6 @@ "Unable to fetch notification target list": "നോട്ടിഫിക്കേഷന്‍ ടാര്‍ഗെറ്റ് ലിസ്റ്റ് നേടാനായില്ല", "Set Password": "രഹസ്യവാക്ക് സജ്ജീകരിക്കുക", "Enable audible notifications in web client": "വെബ് പതിപ്പിലെ അറിയിപ്പുകള്‍ കേള്‍ക്കാവുന്നതാക്കുക", - "Permalink": "പെര്‍മാലിങ്ക്", "remove %(name)s from the directory.": "%(name)s ഡയറക്റ്ററിയില്‍ നിന്ന് നീക്കം ചെയ്യുക.", "Off": "ഓഫ്", "Riot does not know how to join a room on this network": "ഈ നെറ്റ്‍വര്‍ക്കിലെ ഒരു റൂമില്‍ എങ്ങനെ അംഗമാകാമെന്ന് റയട്ടിന് അറിയില്ല", diff --git a/src/i18n/strings/nb_NO.json b/src/i18n/strings/nb_NO.json index 47da50122c..9a2b859854 100644 --- a/src/i18n/strings/nb_NO.json +++ b/src/i18n/strings/nb_NO.json @@ -98,7 +98,6 @@ "Riot does not know how to join a room on this network": "Riot vet ikke hvordan man kan komme inn på et rom på dette nettverket", "An error occurred whilst saving your email notification preferences.": "En feil oppsto i forbindelse med lagring av epost varsel innstillinger.", "Enable audible notifications in web client": "Aktiver lyd-varsel i webklient", - "Permalink": "Permanent lenke", "remove %(name)s from the directory.": "fjern %(name)s fra katalogen.", "Off": "Av", "#example": "#eksempel", diff --git a/src/i18n/strings/nl.json b/src/i18n/strings/nl.json index f09c63118e..bda64146cc 100644 --- a/src/i18n/strings/nl.json +++ b/src/i18n/strings/nl.json @@ -1120,7 +1120,6 @@ "Unable to fetch notification target list": "Het is mislukt om de lijst van notificatiedoelen op te halen", "Set Password": "Wachtwoord instellen", "Enable audible notifications in web client": "Geluidsmeldingen in de webclient aanzetten", - "Permalink": "Permanente link", "Off": "Uit", "Riot does not know how to join a room on this network": "Riot weet niet hoe het moet deelnemen in een ruimte op dit netwerk", "Mentions only": "Alleen vermeldingen", diff --git a/src/i18n/strings/pl.json b/src/i18n/strings/pl.json index d3dcb72f49..30afa07202 100644 --- a/src/i18n/strings/pl.json +++ b/src/i18n/strings/pl.json @@ -901,7 +901,6 @@ "Unable to fetch notification target list": "Nie można pobrać listy docelowej dla powiadomień", "Set Password": "Ustaw hasło", "Enable audible notifications in web client": "Włącz dźwiękowe powiadomienia w kliencie internetowym", - "Permalink": "Odnośnik bezpośredni", "Off": "Wyłącz", "Riot does not know how to join a room on this network": "Riot nie wie, jak dołączyć do pokoju w tej sieci", "Mentions only": "Tylko, gdy wymienieni", diff --git a/src/i18n/strings/pt.json b/src/i18n/strings/pt.json index d165c6c057..c8f7a45dcf 100644 --- a/src/i18n/strings/pt.json +++ b/src/i18n/strings/pt.json @@ -826,7 +826,6 @@ "Unable to fetch notification target list": "Não foi possível obter a lista de alvos de notificação", "Set Password": "Definir palavra-passe", "Enable audible notifications in web client": "Ativar notificações de áudio no cliente web", - "Permalink": "Link permanente", "Off": "Desativado", "Riot does not know how to join a room on this network": "O Riot não sabe como entrar numa sala nesta rede", "Mentions only": "Apenas menções", diff --git a/src/i18n/strings/pt_BR.json b/src/i18n/strings/pt_BR.json index 0a4d847805..a5c4e06922 100644 --- a/src/i18n/strings/pt_BR.json +++ b/src/i18n/strings/pt_BR.json @@ -1101,7 +1101,6 @@ "Unable to fetch notification target list": "Não foi possível obter a lista de alvos de notificação", "Set Password": "Definir senha", "Enable audible notifications in web client": "Ativar notificações de áudio no cliente web", - "Permalink": "Link permanente", "Off": "Desativado", "Riot does not know how to join a room on this network": "O sistema não sabe como entrar na sala desta rede", "Mentions only": "Apenas menções", diff --git a/src/i18n/strings/ru.json b/src/i18n/strings/ru.json index 2bdce2fe4f..599847ab84 100644 --- a/src/i18n/strings/ru.json +++ b/src/i18n/strings/ru.json @@ -1125,7 +1125,6 @@ "Unable to fetch notification target list": "Не удалось получить список устройств для уведомлений", "Set Password": "Задать пароль", "Enable audible notifications in web client": "Включить звуковые уведомления в веб-клиенте", - "Permalink": "Постоянная ссылка", "Off": "Выключить", "Riot does not know how to join a room on this network": "Riot не знает, как присоединиться к комнате, принадлежащей к этой сети", "Mentions only": "Только при упоминаниях", diff --git a/src/i18n/strings/sk.json b/src/i18n/strings/sk.json index ed07ff5c09..fb49973550 100644 --- a/src/i18n/strings/sk.json +++ b/src/i18n/strings/sk.json @@ -1126,7 +1126,6 @@ "Set Password": "Nastaviť Heslo", "An error occurred whilst saving your email notification preferences.": "Počas ukladania vašich nastavení oznamovania emailom sa vyskytla chyba.", "Enable audible notifications in web client": "Povoliť zvukové oznámenia vo webovom klientovi", - "Permalink": "Trvalý odkaz", "Off": "Zakázané", "Riot does not know how to join a room on this network": "Riot nedokáže vstúpiť do miestnosti na tejto sieti", "Mentions only": "Len zmienky", diff --git a/src/i18n/strings/sq.json b/src/i18n/strings/sq.json index 2936695a6d..66f6f032b7 100644 --- a/src/i18n/strings/sq.json +++ b/src/i18n/strings/sq.json @@ -269,7 +269,6 @@ "Set Password": "Caktoni Fjalëkalim", "An error occurred whilst saving your email notification preferences.": "Ndodhi një gabim teksa ruheshin parapëlqimet tuaja për njoftime me email.", "Enable audible notifications in web client": "Aktivizoni njoftime audio te klienti web", - "Permalink": "Permalidhje", "Register": "Regjistrohuni", "Off": "Off", "Edit": "Përpunoni", diff --git a/src/i18n/strings/sr.json b/src/i18n/strings/sr.json index ebacd28a5c..e24fa93c09 100644 --- a/src/i18n/strings/sr.json +++ b/src/i18n/strings/sr.json @@ -1101,7 +1101,6 @@ "Set Password": "Постави лозинку", "An error occurred whilst saving your email notification preferences.": "Догодила се грешка при чувању ваших поставки мејл обавештења.", "Enable audible notifications in web client": "Омогући звучна обавештења у веб клијенту", - "Permalink": "Трајна веза", "Resend": "Поново пошаљи", "Riot does not know how to join a room on this network": "Riot не зна како да приступи соби на овој мрежи", "Mentions only": "Само спомињања", diff --git a/src/i18n/strings/sv.json b/src/i18n/strings/sv.json index ff64f1a8e6..91d1477190 100644 --- a/src/i18n/strings/sv.json +++ b/src/i18n/strings/sv.json @@ -547,7 +547,6 @@ "Unable to fetch notification target list": "Det gick inte att hämta aviseringsmållistan", "Set Password": "Välj lösenord", "Enable audible notifications in web client": "Sätt på högljudda aviseringar i webbklienten", - "Permalink": "Permanent länk", "Off": "Av", "Riot does not know how to join a room on this network": "Riot kan inte gå med i ett rum på det här nätverket", "Mentions only": "Endast omnämnande", diff --git a/src/i18n/strings/ta.json b/src/i18n/strings/ta.json index 6aecb54bfd..b8fe318b46 100644 --- a/src/i18n/strings/ta.json +++ b/src/i18n/strings/ta.json @@ -78,7 +78,6 @@ "Off": "அமை", "On": "மீது", "Operation failed": "செயல்பாடு தோல்வியுற்றது", - "Permalink": "நிரந்தரத் தொடுப்பு", "powered by Matrix": "Matrix-ஆல் ஆனது", "Quote": "மேற்கோள்", "Reject": "நிராகரி", diff --git a/src/i18n/strings/th.json b/src/i18n/strings/th.json index 6fa7febabd..dac3656631 100644 --- a/src/i18n/strings/th.json +++ b/src/i18n/strings/th.json @@ -544,7 +544,6 @@ "Riot does not know how to join a room on this network": "Riot ไม่รู้วิธีเข้าร่วมห้องในเครือข่ายนี้", "Set Password": "ตั้งรหัสผ่าน", "Enable audible notifications in web client": "เปิดใช้งานเสียงแจ้งเตือนบนเว็บไคลเอนต์", - "Permalink": "ลิงก์ถาวร", "Off": "ปิด", "#example": "#example", "Mentions only": "เมื่อถูกกล่าวถึงเท่านั้น", diff --git a/src/i18n/strings/tr.json b/src/i18n/strings/tr.json index 797fed79ce..43ba89c968 100644 --- a/src/i18n/strings/tr.json +++ b/src/i18n/strings/tr.json @@ -741,7 +741,6 @@ "Unable to fetch notification target list": "Bildirim hedef listesi çekilemedi", "An error occurred whilst saving your email notification preferences.": "E-posta bildirim tercihlerinizi kaydetme işlemi sırasında bir hata oluştu.", "Enable audible notifications in web client": "Web istemcisinde sesli bildirimleri etkinleştir", - "Permalink": "Kalıcı Bağlantı(permalink)", "Off": "Kapalı", "Riot does not know how to join a room on this network": "Riot bu ağdaki bir odaya nasıl gireceğini bilmiyor", "Mentions only": "Sadece Mention'lar", diff --git a/src/i18n/strings/uk.json b/src/i18n/strings/uk.json index 74bf855d22..b07a5dadab 100644 --- a/src/i18n/strings/uk.json +++ b/src/i18n/strings/uk.json @@ -232,7 +232,6 @@ "Unable to fetch notification target list": "Неможливо отримати перелік цілей сповіщення", "Set Password": "Задати пароль", "Enable audible notifications in web client": "Увімкнути звукові сповіщення у мережевому застосунку", - "Permalink": "Постійне посилання", "Off": "Вимкнено", "Riot does not know how to join a room on this network": "Riot не знає як приєднатись до кімнати у цій мережі", "Mentions only": "Тільки згадки", diff --git a/src/i18n/strings/zh_Hans.json b/src/i18n/strings/zh_Hans.json index 8e2dc6e0f8..b1547170b0 100644 --- a/src/i18n/strings/zh_Hans.json +++ b/src/i18n/strings/zh_Hans.json @@ -1099,7 +1099,6 @@ "Unable to fetch notification target list": "无法获取通知目标列表", "Set Password": "设置密码", "Enable audible notifications in web client": "在网页客户端启用音频通知", - "Permalink": "永久链接", "Off": "关闭", "Riot does not know how to join a room on this network": "Riot 不知道如何在此网络中加入聊天室", "Mentions only": "只限提及", diff --git a/src/i18n/strings/zh_Hant.json b/src/i18n/strings/zh_Hant.json index 95424eaefb..1e43f27a59 100644 --- a/src/i18n/strings/zh_Hant.json +++ b/src/i18n/strings/zh_Hant.json @@ -1126,7 +1126,6 @@ "Riot does not know how to join a room on this network": "Riot 不知道如何在此網路中加入聊天室", "Set Password": "設定密碼", "Enable audible notifications in web client": "在網頁客戶端啟用音訊通知", - "Permalink": "永久連結", "Off": "關閉", "#example": "#範例", "Mentions only": "僅提及", From bef435e15af87ebd622d88647f98df086e06be2f Mon Sep 17 00:00:00 2001 From: Michael Telatynski <7t3chguy@gmail.com> Date: Thu, 14 Jun 2018 13:41:12 +0100 Subject: [PATCH 13/16] allow ShareEvent to devolve into ShareRoom using checkbox + i18n Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> --- src/components/views/dialogs/ShareDialog.js | 31 +++++++++++++++------ src/i18n/strings/en_EN.json | 1 + 2 files changed, 24 insertions(+), 8 deletions(-) diff --git a/src/components/views/dialogs/ShareDialog.js b/src/components/views/dialogs/ShareDialog.js index 12efc8b919..873fcc4dee 100644 --- a/src/components/views/dialogs/ShareDialog.js +++ b/src/components/views/dialogs/ShareDialog.js @@ -67,10 +67,11 @@ export default class ShareDialog extends React.Component { super(props); this.onCopyClick = this.onCopyClick.bind(this); - this.onLinkRecentCheckboxClick = this.onLinkRecentCheckboxClick.bind(this); + this.onLinkSpecificEventCheckboxClick = this.onLinkSpecificEventCheckboxClick.bind(this); this.state = { - linkRecentTicked: false, + // MatrixEvent defaults to share linkSpecificEvent + linkSpecificEvent: this.props.target instanceof MatrixEvent, }; } @@ -116,9 +117,9 @@ export default class ShareDialog extends React.Component { e.target.onmouseleave = close; } - onLinkRecentCheckboxClick() { + onLinkSpecificEventCheckboxClick() { this.setState({ - linkRecentTicked: !this.state.linkRecentTicked, + linkSpecificEvent: !this.state.linkSpecificEvent, }); } @@ -135,16 +136,16 @@ export default class ShareDialog extends React.Component { if (events.length > 0) { checkbox =
+ onClick={this.onLinkSpecificEventCheckboxClick} />
; } - if (this.state.linkRecentTicked) { + if (this.state.linkSpecificEvent) { matrixToUrl = makeEventPermalink(this.props.target.roomId, events[events.length - 1].getId()); } else { matrixToUrl = makeRoomPermalink(this.props.target.roomId); @@ -157,7 +158,21 @@ export default class ShareDialog extends React.Component { matrixToUrl = makeGroupPermalink(this.props.target.groupId); } else if (this.props.target instanceof MatrixEvent) { title = _t('Share Room Message'); - matrixToUrl = makeEventPermalink(this.props.target.roomId, this.props.target.eventId); + checkbox =
+ + +
; + + if (this.state.linkSpecificEvent) { + matrixToUrl = makeEventPermalink(this.props.target.roomId, this.props.target.eventId); + } else { + matrixToUrl = makeRoomPermalink(this.props.target.roomId); + } } const encodedUrl = encodeURIComponent(matrixToUrl); diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json index bb5ad5405b..3802c73431 100644 --- a/src/i18n/strings/en_EN.json +++ b/src/i18n/strings/en_EN.json @@ -863,6 +863,7 @@ "Share User": "Share User", "Share Community": "Share Community", "Share Room Message": "Share Room Message", + "Link to selected message": "Link to selected message", "COPY": "COPY", "You are currently blacklisting unverified devices; to send messages to these devices you must verify them.": "You are currently blacklisting unverified devices; to send messages to these devices you must verify them.", "We recommend you go through the verification process for each device to confirm they belong to their legitimate owner, but you can resend the message without verifying if you prefer.": "We recommend you go through the verification process for each device to confirm they belong to their legitimate owner, but you can resend the message without verifying if you prefer.", From ef178b282c2f82181584a284b14b3d3e56a22f87 Mon Sep 17 00:00:00 2001 From: Michael Telatynski <7t3chguy@gmail.com> Date: Thu, 14 Jun 2018 13:44:05 +0100 Subject: [PATCH 14/16] use getters on MatrixEvent for roomId and eventId Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> --- src/components/views/dialogs/ShareDialog.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/components/views/dialogs/ShareDialog.js b/src/components/views/dialogs/ShareDialog.js index 873fcc4dee..bbd381ad29 100644 --- a/src/components/views/dialogs/ShareDialog.js +++ b/src/components/views/dialogs/ShareDialog.js @@ -169,9 +169,9 @@ export default class ShareDialog extends React.Component {
; if (this.state.linkSpecificEvent) { - matrixToUrl = makeEventPermalink(this.props.target.roomId, this.props.target.eventId); + matrixToUrl = makeEventPermalink(this.props.target.getRoomId(), this.props.target.getId()); } else { - matrixToUrl = makeRoomPermalink(this.props.target.roomId); + matrixToUrl = makeRoomPermalink(this.props.target.getRoomId()); } } From 33a3cfead6e2766d9a0b7211f074290c92ae0257 Mon Sep 17 00:00:00 2001 From: Michael Telatynski <7t3chguy@gmail.com> Date: Thu, 14 Jun 2018 13:47:33 +0100 Subject: [PATCH 15/16] controlled checkboxes use `checked` not `value` Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> --- src/components/views/dialogs/ShareDialog.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/components/views/dialogs/ShareDialog.js b/src/components/views/dialogs/ShareDialog.js index bbd381ad29..a1a8598fdb 100644 --- a/src/components/views/dialogs/ShareDialog.js +++ b/src/components/views/dialogs/ShareDialog.js @@ -136,8 +136,8 @@ export default class ShareDialog extends React.Component { if (events.length > 0) { checkbox =