oxen-io/session-desktop
1
0
Fork 0
mirror of https://github.com/oxen-io/session-desktop.git synced 2023-12-14 02:12:57 +01:00
Code Issues Projects Releases Wiki Activity

yarn linting fixes.

Browse source
This commit is contained in:
Warrick Corfe-Tan 2021-06-18 16:36:43 +10:00
parent f356c9b843
commit 6affca034d
2 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
ts/components/session/SessionWrapperModal.tsx
View file

@ -75,7 +75,7 @@ export const SessionWrapperModal = (props: SessionWrapperModalType) => {
}; };
return ( return (
<div className={'loki-dialog modal ' + additionalClassName}> <div className={`loki-dialog modal ${additionalClassName}`}>
<div className="session-confirm-wrapper"> <div className="session-confirm-wrapper">
<div className="session-modal"> <div className="session-modal">
{showHeader ? ( {showHeader ? (

8
ts/components/session/conversation/SessionCompositionBox.tsx
View file

@ -226,6 +226,8 @@ export class SessionCompositionBox extends React.Component<Props, State> {
break; break;
case 'text': case 'text':
this.showLinkSharingConfirmationModalDialog(e); this.showLinkSharingConfirmationModalDialog(e);
break;
default:
} }
} }
if (imgBlob !== null) { if (imgBlob !== null) {
@ -243,7 +245,7 @@ export class SessionCompositionBox extends React.Component<Props, State> {
* @param e paste event * @param e paste event
*/ */
private showLinkSharingConfirmationModalDialog(e: any) { private showLinkSharingConfirmationModalDialog(e: any) {
let pastedText = e.clipboardData.getData('text'); const pastedText = e.clipboardData.getData('text');
if (this.isURL(pastedText)) { if (this.isURL(pastedText)) {
this.props.updateConfirmModal({ this.props.updateConfirmModal({
shouldShowConfirm: () => !window.getSettingValue('link-preview-setting'), shouldShowConfirm: () => !window.getSettingValue('link-preview-setting'),
@ -263,9 +265,9 @@ export class SessionCompositionBox extends React.Component<Props, State> {
* @returns boolean if the string is true or false * @returns boolean if the string is true or false
*/ */
private isURL(str: string) { private isURL(str: string) {
var urlRegex = const urlRegex =
'^(?!mailto:)(?:(?:http|https|ftp)://)(?:\\S+(?::\\S*)?@)?(?:(?:(?:[1-9]\\d?|1\\d\\d|2[01]\\d|22[0-3])(?:\\.(?:1?\\d{1,2}|2[0-4]\\d|25[0-5])){2}(?:\\.(?:[0-9]\\d?|1\\d\\d|2[0-4]\\d|25[0-4]))|(?:(?:[a-z\\u00a1-\\uffff0-9]+-?)*[a-z\\u00a1-\\uffff0-9]+)(?:\\.(?:[a-z\\u00a1-\\uffff0-9]+-?)*[a-z\\u00a1-\\uffff0-9]+)*(?:\\.(?:[a-z\\u00a1-\\uffff]{2,})))|localhost)(?::\\d{2,5})?(?:(/|\\?|#)[^\\s]*)?$'; '^(?!mailto:)(?:(?:http|https|ftp)://)(?:\\S+(?::\\S*)?@)?(?:(?:(?:[1-9]\\d?|1\\d\\d|2[01]\\d|22[0-3])(?:\\.(?:1?\\d{1,2}|2[0-4]\\d|25[0-5])){2}(?:\\.(?:[0-9]\\d?|1\\d\\d|2[0-4]\\d|25[0-4]))|(?:(?:[a-z\\u00a1-\\uffff0-9]+-?)*[a-z\\u00a1-\\uffff0-9]+)(?:\\.(?:[a-z\\u00a1-\\uffff0-9]+-?)*[a-z\\u00a1-\\uffff0-9]+)*(?:\\.(?:[a-z\\u00a1-\\uffff]{2,})))|localhost)(?::\\d{2,5})?(?:(/|\\?|#)[^\\s]*)?$';
var url = new RegExp(urlRegex, 'i'); const url = new RegExp(urlRegex, 'i');
return str.length < 2083 && url.test(str); return str.length < 2083 && url.test(str);
} }