This commit is contained in:
or-else
2022-12-14 14:27:56 -08:00
parent 4e42d96d66
commit 830d15f7ec
20 changed files with 273 additions and 196 deletions
+1 -1
View File
File diff suppressed because one or more lines are too long
+1 -1
View File
File diff suppressed because one or more lines are too long
+10 -3
View File
@@ -317,21 +317,21 @@
"drafty_attachment": { "drafty_attachment": {
"translation": "Dateianhang", "translation": "Dateianhang",
"defaultMessage": "Attachment", "defaultMessage": "Attachment",
"description": "Comment for attachment in drafty", "description": "Comment for attachment in Drafty",
"missing": false, "missing": false,
"obsolete": false "obsolete": false
}, },
"drafty_form": { "drafty_form": {
"translation": "Formular:", "translation": "Formular:",
"defaultMessage": "Form:", "defaultMessage": "Form:",
"description": "Comment for form in drafty", "description": "Comment for form in Drafty",
"missing": false, "missing": false,
"obsolete": false "obsolete": false
}, },
"drafty_image": { "drafty_image": {
"translation": "Bild", "translation": "Bild",
"defaultMessage": "Picture", "defaultMessage": "Picture",
"description": "Comment for embedded images in drafty", "description": "Comment for embedded images in Drafty",
"missing": false, "missing": false,
"obsolete": false "obsolete": false
}, },
@@ -1528,5 +1528,12 @@
"description": "Prompt on the file drag-n-drop overlay banner", "description": "Prompt on the file drag-n-drop overlay banner",
"missing": true, "missing": true,
"obsolete": false "obsolete": false
},
"drafty_video": {
"translation": "",
"defaultMessage": "Video recording",
"description": "Comment for videos embedded in Drafty",
"missing": true,
"obsolete": false
} }
} }
+10 -3
View File
@@ -317,21 +317,21 @@
"drafty_attachment": { "drafty_attachment": {
"translation": "Attachment", "translation": "Attachment",
"defaultMessage": "Attachment", "defaultMessage": "Attachment",
"description": "Comment for attachment in drafty", "description": "Comment for attachment in Drafty",
"missing": false, "missing": false,
"obsolete": false "obsolete": false
}, },
"drafty_form": { "drafty_form": {
"translation": "Form:", "translation": "Form:",
"defaultMessage": "Form:", "defaultMessage": "Form:",
"description": "Comment for form in drafty", "description": "Comment for form in Drafty",
"missing": false, "missing": false,
"obsolete": false "obsolete": false
}, },
"drafty_image": { "drafty_image": {
"translation": "Picture", "translation": "Picture",
"defaultMessage": "Picture", "defaultMessage": "Picture",
"description": "Comment for embedded images in drafty", "description": "Comment for embedded images in Drafty",
"missing": false, "missing": false,
"obsolete": false "obsolete": false
}, },
@@ -1528,5 +1528,12 @@
"description": "Prompt on the file drag-n-drop overlay banner", "description": "Prompt on the file drag-n-drop overlay banner",
"missing": false, "missing": false,
"obsolete": false "obsolete": false
},
"drafty_video": {
"translation": "Video recording",
"defaultMessage": "Video recording",
"description": "Comment for videos embedded in Drafty",
"missing": false,
"obsolete": false
} }
} }
+10 -3
View File
@@ -317,21 +317,21 @@
"drafty_attachment": { "drafty_attachment": {
"translation": "Archivo", "translation": "Archivo",
"defaultMessage": "Attachment", "defaultMessage": "Attachment",
"description": "Comment for attachment in drafty", "description": "Comment for attachment in Drafty",
"missing": false, "missing": false,
"obsolete": false "obsolete": false
}, },
"drafty_form": { "drafty_form": {
"translation": "Formulario:", "translation": "Formulario:",
"defaultMessage": "Form:", "defaultMessage": "Form:",
"description": "Comment for form in drafty", "description": "Comment for form in Drafty",
"missing": false, "missing": false,
"obsolete": false "obsolete": false
}, },
"drafty_image": { "drafty_image": {
"translation": "Imagen", "translation": "Imagen",
"defaultMessage": "Picture", "defaultMessage": "Picture",
"description": "Comment for embedded images in drafty", "description": "Comment for embedded images in Drafty",
"missing": false, "missing": false,
"obsolete": false "obsolete": false
}, },
@@ -1528,5 +1528,12 @@
"description": "Prompt on the file drag-n-drop overlay banner", "description": "Prompt on the file drag-n-drop overlay banner",
"missing": true, "missing": true,
"obsolete": false "obsolete": false
},
"drafty_video": {
"translation": "",
"defaultMessage": "Video recording",
"description": "Comment for videos embedded in Drafty",
"missing": true,
"obsolete": false
} }
} }
+7 -3
View File
@@ -225,20 +225,24 @@
}, },
"drafty_attachment": { "drafty_attachment": {
"defaultMessage": "Attachment", "defaultMessage": "Attachment",
"description": "Comment for attachment in drafty" "description": "Comment for attachment in Drafty"
}, },
"drafty_form": { "drafty_form": {
"defaultMessage": "Form:", "defaultMessage": "Form:",
"description": "Comment for form in drafty" "description": "Comment for form in Drafty"
}, },
"drafty_image": { "drafty_image": {
"defaultMessage": "Picture", "defaultMessage": "Picture",
"description": "Comment for embedded images in drafty" "description": "Comment for embedded images in Drafty"
}, },
"drafty_unknown": { "drafty_unknown": {
"defaultMessage": "Unsupported", "defaultMessage": "Unsupported",
"description": "Unsupported entity in drafty" "description": "Unsupported entity in drafty"
}, },
"drafty_video": {
"defaultMessage": "Video recording",
"description": "Comment for videos embedded in Drafty"
},
"drag_file": { "drag_file": {
"defaultMessage": "Drag file here", "defaultMessage": "Drag file here",
"description": "Prompt on the file drag-n-drop overlay banner" "description": "Prompt on the file drag-n-drop overlay banner"
+10 -3
View File
@@ -317,21 +317,21 @@
"drafty_attachment": { "drafty_attachment": {
"translation": "Pièce(s) jointe(s)", "translation": "Pièce(s) jointe(s)",
"defaultMessage": "Attachment", "defaultMessage": "Attachment",
"description": "Comment for attachment in drafty", "description": "Comment for attachment in Drafty",
"missing": false, "missing": false,
"obsolete": false "obsolete": false
}, },
"drafty_form": { "drafty_form": {
"translation": "Formulaire:", "translation": "Formulaire:",
"defaultMessage": "Form:", "defaultMessage": "Form:",
"description": "Comment for form in drafty", "description": "Comment for form in Drafty",
"missing": false, "missing": false,
"obsolete": false "obsolete": false
}, },
"drafty_image": { "drafty_image": {
"translation": "Image", "translation": "Image",
"defaultMessage": "Picture", "defaultMessage": "Picture",
"description": "Comment for embedded images in drafty", "description": "Comment for embedded images in Drafty",
"missing": false, "missing": false,
"obsolete": false "obsolete": false
}, },
@@ -1528,5 +1528,12 @@
"description": "Prompt on the file drag-n-drop overlay banner", "description": "Prompt on the file drag-n-drop overlay banner",
"missing": true, "missing": true,
"obsolete": false "obsolete": false
},
"drafty_video": {
"translation": "",
"defaultMessage": "Video recording",
"description": "Comment for videos embedded in Drafty",
"missing": true,
"obsolete": false
} }
} }
+10 -3
View File
@@ -317,21 +317,21 @@
"drafty_attachment": { "drafty_attachment": {
"translation": "부착", "translation": "부착",
"defaultMessage": "Attachment", "defaultMessage": "Attachment",
"description": "Comment for attachment in drafty", "description": "Comment for attachment in Drafty",
"missing": false, "missing": false,
"obsolete": false "obsolete": false
}, },
"drafty_form": { "drafty_form": {
"translation": "형태:", "translation": "형태:",
"defaultMessage": "Form:", "defaultMessage": "Form:",
"description": "Comment for form in drafty", "description": "Comment for form in Drafty",
"missing": false, "missing": false,
"obsolete": false "obsolete": false
}, },
"drafty_image": { "drafty_image": {
"translation": "이미지", "translation": "이미지",
"defaultMessage": "Picture", "defaultMessage": "Picture",
"description": "Comment for embedded images in drafty", "description": "Comment for embedded images in Drafty",
"missing": false, "missing": false,
"obsolete": false "obsolete": false
}, },
@@ -1528,5 +1528,12 @@
"description": "Prompt on the file drag-n-drop overlay banner", "description": "Prompt on the file drag-n-drop overlay banner",
"missing": true, "missing": true,
"obsolete": false "obsolete": false
},
"drafty_video": {
"translation": "",
"defaultMessage": "Video recording",
"description": "Comment for videos embedded in Drafty",
"missing": true,
"obsolete": false
} }
} }
+10 -3
View File
@@ -317,21 +317,21 @@
"drafty_attachment": { "drafty_attachment": {
"translation": "Atasament", "translation": "Atasament",
"defaultMessage": "Attachment", "defaultMessage": "Attachment",
"description": "Comment for attachment in drafty", "description": "Comment for attachment in Drafty",
"missing": false, "missing": false,
"obsolete": false "obsolete": false
}, },
"drafty_form": { "drafty_form": {
"translation": "Formă:", "translation": "Formă:",
"defaultMessage": "Form:", "defaultMessage": "Form:",
"description": "Comment for form in drafty", "description": "Comment for form in Drafty",
"missing": false, "missing": false,
"obsolete": false "obsolete": false
}, },
"drafty_image": { "drafty_image": {
"translation": "Imagine", "translation": "Imagine",
"defaultMessage": "Picture", "defaultMessage": "Picture",
"description": "Comment for embedded images in drafty", "description": "Comment for embedded images in Drafty",
"missing": false, "missing": false,
"obsolete": false "obsolete": false
}, },
@@ -1528,5 +1528,12 @@
"description": "Prompt on the file drag-n-drop overlay banner", "description": "Prompt on the file drag-n-drop overlay banner",
"missing": true, "missing": true,
"obsolete": false "obsolete": false
},
"drafty_video": {
"translation": "",
"defaultMessage": "Video recording",
"description": "Comment for videos embedded in Drafty",
"missing": true,
"obsolete": false
} }
} }
+10 -3
View File
@@ -317,21 +317,21 @@
"drafty_attachment": { "drafty_attachment": {
"translation": "Аттачмент", "translation": "Аттачмент",
"defaultMessage": "Attachment", "defaultMessage": "Attachment",
"description": "Comment for attachment in drafty", "description": "Comment for attachment in Drafty",
"missing": false, "missing": false,
"obsolete": false "obsolete": false
}, },
"drafty_form": { "drafty_form": {
"translation": "Форма:", "translation": "Форма:",
"defaultMessage": "Form:", "defaultMessage": "Form:",
"description": "Comment for form in drafty", "description": "Comment for form in Drafty",
"missing": false, "missing": false,
"obsolete": false "obsolete": false
}, },
"drafty_image": { "drafty_image": {
"translation": "Картинка", "translation": "Картинка",
"defaultMessage": "Picture", "defaultMessage": "Picture",
"description": "Comment for embedded images in drafty", "description": "Comment for embedded images in Drafty",
"missing": false, "missing": false,
"obsolete": false "obsolete": false
}, },
@@ -1528,5 +1528,12 @@
"description": "Prompt on the file drag-n-drop overlay banner", "description": "Prompt on the file drag-n-drop overlay banner",
"missing": true, "missing": true,
"obsolete": false "obsolete": false
},
"drafty_video": {
"translation": "",
"defaultMessage": "Video recording",
"description": "Comment for videos embedded in Drafty",
"missing": true,
"obsolete": false
} }
} }
+10 -3
View File
@@ -317,21 +317,21 @@
"drafty_attachment": { "drafty_attachment": {
"translation": "附加檔案", "translation": "附加檔案",
"defaultMessage": "Attachment", "defaultMessage": "Attachment",
"description": "Comment for attachment in drafty", "description": "Comment for attachment in Drafty",
"missing": false, "missing": false,
"obsolete": false "obsolete": false
}, },
"drafty_form": { "drafty_form": {
"translation": "表單:", "translation": "表單:",
"defaultMessage": "Form:", "defaultMessage": "Form:",
"description": "Comment for form in drafty", "description": "Comment for form in Drafty",
"missing": false, "missing": false,
"obsolete": false "obsolete": false
}, },
"drafty_image": { "drafty_image": {
"translation": "圖片", "translation": "圖片",
"defaultMessage": "Picture", "defaultMessage": "Picture",
"description": "Comment for embedded images in drafty", "description": "Comment for embedded images in Drafty",
"missing": false, "missing": false,
"obsolete": false "obsolete": false
}, },
@@ -1528,5 +1528,12 @@
"description": "Prompt on the file drag-n-drop overlay banner", "description": "Prompt on the file drag-n-drop overlay banner",
"missing": true, "missing": true,
"obsolete": false "obsolete": false
},
"drafty_video": {
"translation": "",
"defaultMessage": "Video recording",
"description": "Comment for videos embedded in Drafty",
"missing": true,
"obsolete": false
} }
} }
+10 -3
View File
@@ -317,21 +317,21 @@
"drafty_attachment": { "drafty_attachment": {
"translation": "附件", "translation": "附件",
"defaultMessage": "Attachment", "defaultMessage": "Attachment",
"description": "Comment for attachment in drafty", "description": "Comment for attachment in Drafty",
"missing": false, "missing": false,
"obsolete": false "obsolete": false
}, },
"drafty_form": { "drafty_form": {
"translation": "形式:", "translation": "形式:",
"defaultMessage": "Form:", "defaultMessage": "Form:",
"description": "Comment for form in drafty", "description": "Comment for form in Drafty",
"missing": false, "missing": false,
"obsolete": false "obsolete": false
}, },
"drafty_image": { "drafty_image": {
"translation": "图像", "translation": "图像",
"defaultMessage": "Picture", "defaultMessage": "Picture",
"description": "Comment for embedded images in drafty", "description": "Comment for embedded images in Drafty",
"missing": false, "missing": false,
"obsolete": false "obsolete": false
}, },
@@ -1528,5 +1528,12 @@
"description": "Prompt on the file drag-n-drop overlay banner", "description": "Prompt on the file drag-n-drop overlay banner",
"missing": true, "missing": true,
"obsolete": false "obsolete": false
},
"drafty_video": {
"translation": "",
"defaultMessage": "Video recording",
"description": "Comment for videos embedded in Drafty",
"missing": true,
"obsolete": false
} }
} }
+1 -1
View File
File diff suppressed because one or more lines are too long
+166 -156
View File
@@ -2610,6 +2610,13 @@ const messages = (0,react_intl__WEBPACK_IMPORTED_MODULE_1__.defineMessages)({
"value": "Picture" "value": "Picture"
}] }]
}, },
drafty_video: {
id: "drafty_video",
defaultMessage: [{
"type": 0,
"value": "Video recording"
}]
},
drafty_unknown: { drafty_unknown: {
id: "drafty_unknown", id: "drafty_unknown",
defaultMessage: [{ defaultMessage: [{
@@ -2865,6 +2872,13 @@ function previewFormatter(style, data, values, key) {
el = null; el = null;
values = null; values = null;
break; break;
case 'VD':
el = (react__WEBPACK_IMPORTED_MODULE_0___default().Fragment);
values = [react__WEBPACK_IMPORTED_MODULE_0___default().createElement("i", {
key: "im",
className: "material-icons"
}, "play_circle_outline"), ' ', this.formatMessage(messages.drafty_video)];
break;
default: default:
if (!el) { if (!el) {
el = (react__WEBPACK_IMPORTED_MODULE_0___default().Fragment); el = (react__WEBPACK_IMPORTED_MODULE_0___default().Fragment);
@@ -2896,6 +2910,15 @@ function inlineImageAttr(attr, data) {
attr.title = attr.alt; attr.title = attr.alt;
return attr; return attr;
} }
function inlineVideoAttr(attr, data) {
inlineImageAttr.call(this, attr, data);
attr.alt = this.formatMessage(messages.drafty_video);
attr.title = attr.alt;
if (!data) {
attr.src = 'img/broken_video.png';
}
return attr;
}
function quoteFormatter(style, data, values, key) { function quoteFormatter(style, data, values, key) {
if (['BR', 'EX', 'IM', 'MN'].includes(style)) { if (['BR', 'EX', 'IM', 'MN'].includes(style)) {
let el = tinode_sdk__WEBPACK_IMPORTED_MODULE_2__.Drafty.tagName(style); let el = tinode_sdk__WEBPACK_IMPORTED_MODULE_2__.Drafty.tagName(style);
@@ -2913,6 +2936,14 @@ function quoteFormatter(style, data, values, key) {
key: key key: key
}; };
break; break;
case 'VD':
attr = inlineVideoAttr.call(this, attr, data);
values = [react__WEBPACK_IMPORTED_MODULE_0___default().createElement('img', attr, null), ' ', attr.alt];
el = (react__WEBPACK_IMPORTED_MODULE_0___default().Fragment);
attr = {
key: key
};
break;
case 'MN': case 'MN':
el = 'span'; el = 'span';
attr.className = 'mention'; attr.className = 'mention';
@@ -2982,8 +3013,10 @@ function quoteImage(data) {
}); });
} }
function replyFormatter(style, data, values, key, stack) { function replyFormatter(style, data, values, key, stack) {
if (style == 'IM') { if (style == 'IM' || style == 'VD') {
const attr = inlineImageAttr.call(this, { const attr = style == 'IM' ? inlineImageAttr.call(this, {
key: key
}, data) : inlineVideoAttr.call(this, {
key: key key: key
}, data); }, data);
let loadedPromise; let loadedPromise;
@@ -5355,23 +5388,21 @@ __webpack_require__.r(__webpack_exports__);
/* harmony import */ var _widgets_chat_message_jsx__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(/*! ../widgets/chat-message.jsx */ "./src/widgets/chat-message.jsx"); /* harmony import */ var _widgets_chat_message_jsx__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(/*! ../widgets/chat-message.jsx */ "./src/widgets/chat-message.jsx");
/* harmony import */ var _widgets_contact_badges_jsx__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(/*! ../widgets/contact-badges.jsx */ "./src/widgets/contact-badges.jsx"); /* harmony import */ var _widgets_contact_badges_jsx__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(/*! ../widgets/contact-badges.jsx */ "./src/widgets/contact-badges.jsx");
/* harmony import */ var _widgets_doc_preview_jsx__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(/*! ../widgets/doc-preview.jsx */ "./src/widgets/doc-preview.jsx"); /* harmony import */ var _widgets_doc_preview_jsx__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(/*! ../widgets/doc-preview.jsx */ "./src/widgets/doc-preview.jsx");
/* harmony import */ var _widgets_drag_and_drop_jsx__WEBPACK_IMPORTED_MODULE_7__ = __webpack_require__(/*! ../widgets/drag-and-drop.jsx */ "./src/widgets/drag-and-drop.jsx"); /* harmony import */ var _widgets_error_panel_jsx__WEBPACK_IMPORTED_MODULE_7__ = __webpack_require__(/*! ../widgets/error-panel.jsx */ "./src/widgets/error-panel.jsx");
/* harmony import */ var _widgets_error_panel_jsx__WEBPACK_IMPORTED_MODULE_8__ = __webpack_require__(/*! ../widgets/error-panel.jsx */ "./src/widgets/error-panel.jsx"); /* harmony import */ var _widgets_group_subs_jsx__WEBPACK_IMPORTED_MODULE_8__ = __webpack_require__(/*! ../widgets/group-subs.jsx */ "./src/widgets/group-subs.jsx");
/* harmony import */ var _widgets_group_subs_jsx__WEBPACK_IMPORTED_MODULE_9__ = __webpack_require__(/*! ../widgets/group-subs.jsx */ "./src/widgets/group-subs.jsx"); /* harmony import */ var _widgets_image_preview_jsx__WEBPACK_IMPORTED_MODULE_9__ = __webpack_require__(/*! ../widgets/image-preview.jsx */ "./src/widgets/image-preview.jsx");
/* harmony import */ var _widgets_image_preview_jsx__WEBPACK_IMPORTED_MODULE_10__ = __webpack_require__(/*! ../widgets/image-preview.jsx */ "./src/widgets/image-preview.jsx"); /* harmony import */ var _widgets_invitation_jsx__WEBPACK_IMPORTED_MODULE_10__ = __webpack_require__(/*! ../widgets/invitation.jsx */ "./src/widgets/invitation.jsx");
/* harmony import */ var _widgets_invitation_jsx__WEBPACK_IMPORTED_MODULE_11__ = __webpack_require__(/*! ../widgets/invitation.jsx */ "./src/widgets/invitation.jsx"); /* harmony import */ var _widgets_letter_tile_jsx__WEBPACK_IMPORTED_MODULE_11__ = __webpack_require__(/*! ../widgets/letter-tile.jsx */ "./src/widgets/letter-tile.jsx");
/* harmony import */ var _widgets_letter_tile_jsx__WEBPACK_IMPORTED_MODULE_12__ = __webpack_require__(/*! ../widgets/letter-tile.jsx */ "./src/widgets/letter-tile.jsx"); /* harmony import */ var _widgets_load_spinner_jsx__WEBPACK_IMPORTED_MODULE_12__ = __webpack_require__(/*! ../widgets/load-spinner.jsx */ "./src/widgets/load-spinner.jsx");
/* harmony import */ var _widgets_load_spinner_jsx__WEBPACK_IMPORTED_MODULE_13__ = __webpack_require__(/*! ../widgets/load-spinner.jsx */ "./src/widgets/load-spinner.jsx"); /* harmony import */ var _logo_view_jsx__WEBPACK_IMPORTED_MODULE_13__ = __webpack_require__(/*! ./logo-view.jsx */ "./src/views/logo-view.jsx");
/* harmony import */ var _logo_view_jsx__WEBPACK_IMPORTED_MODULE_14__ = __webpack_require__(/*! ./logo-view.jsx */ "./src/views/logo-view.jsx"); /* harmony import */ var _widgets_meta_message_jsx__WEBPACK_IMPORTED_MODULE_14__ = __webpack_require__(/*! ../widgets/meta-message.jsx */ "./src/widgets/meta-message.jsx");
/* harmony import */ var _widgets_meta_message_jsx__WEBPACK_IMPORTED_MODULE_15__ = __webpack_require__(/*! ../widgets/meta-message.jsx */ "./src/widgets/meta-message.jsx"); /* harmony import */ var _widgets_send_message_jsx__WEBPACK_IMPORTED_MODULE_15__ = __webpack_require__(/*! ../widgets/send-message.jsx */ "./src/widgets/send-message.jsx");
/* harmony import */ var _widgets_send_message_jsx__WEBPACK_IMPORTED_MODULE_16__ = __webpack_require__(/*! ../widgets/send-message.jsx */ "./src/widgets/send-message.jsx"); /* harmony import */ var _widgets_video_preview_jsx__WEBPACK_IMPORTED_MODULE_16__ = __webpack_require__(/*! ../widgets/video-preview.jsx */ "./src/widgets/video-preview.jsx");
/* harmony import */ var _widgets_video_preview_jsx__WEBPACK_IMPORTED_MODULE_17__ = __webpack_require__(/*! ../widgets/video-preview.jsx */ "./src/widgets/video-preview.jsx"); /* harmony import */ var _config_js__WEBPACK_IMPORTED_MODULE_17__ = __webpack_require__(/*! ../config.js */ "./src/config.js");
/* harmony import */ var _config_js__WEBPACK_IMPORTED_MODULE_18__ = __webpack_require__(/*! ../config.js */ "./src/config.js"); /* harmony import */ var _constants_js__WEBPACK_IMPORTED_MODULE_18__ = __webpack_require__(/*! ../constants.js */ "./src/constants.js");
/* harmony import */ var _constants_js__WEBPACK_IMPORTED_MODULE_19__ = __webpack_require__(/*! ../constants.js */ "./src/constants.js"); /* harmony import */ var _lib_blob_helpers_js__WEBPACK_IMPORTED_MODULE_19__ = __webpack_require__(/*! ../lib/blob-helpers.js */ "./src/lib/blob-helpers.js");
/* harmony import */ var _lib_blob_helpers_js__WEBPACK_IMPORTED_MODULE_20__ = __webpack_require__(/*! ../lib/blob-helpers.js */ "./src/lib/blob-helpers.js"); /* harmony import */ var _lib_navigation_js__WEBPACK_IMPORTED_MODULE_20__ = __webpack_require__(/*! ../lib/navigation.js */ "./src/lib/navigation.js");
/* harmony import */ var _lib_navigation_js__WEBPACK_IMPORTED_MODULE_21__ = __webpack_require__(/*! ../lib/navigation.js */ "./src/lib/navigation.js"); /* harmony import */ var _lib_strformat_js__WEBPACK_IMPORTED_MODULE_21__ = __webpack_require__(/*! ../lib/strformat.js */ "./src/lib/strformat.js");
/* harmony import */ var _lib_strformat_js__WEBPACK_IMPORTED_MODULE_22__ = __webpack_require__(/*! ../lib/strformat.js */ "./src/lib/strformat.js");
@@ -5481,7 +5512,7 @@ function isPeerRestricted(acs) {
return false; return false;
} }
function shouldPresentCallPanel(callState) { function shouldPresentCallPanel(callState) {
return callState == _constants_js__WEBPACK_IMPORTED_MODULE_19__.CALL_STATE_OUTGOING_INITATED || callState == _constants_js__WEBPACK_IMPORTED_MODULE_19__.CALL_STATE_IN_PROGRESS; return callState == _constants_js__WEBPACK_IMPORTED_MODULE_18__.CALL_STATE_OUTGOING_INITATED || callState == _constants_js__WEBPACK_IMPORTED_MODULE_18__.CALL_STATE_IN_PROGRESS;
} }
class MessagesView extends (react__WEBPACK_IMPORTED_MODULE_0___default().Component) { class MessagesView extends (react__WEBPACK_IMPORTED_MODULE_0___default().Component) {
constructor(props) { constructor(props) {
@@ -5497,6 +5528,7 @@ class MessagesView extends (react__WEBPACK_IMPORTED_MODULE_0___default().Compone
this.sendKeyPress = this.sendKeyPress.bind(this); this.sendKeyPress = this.sendKeyPress.bind(this);
this.subscribe = this.subscribe.bind(this); this.subscribe = this.subscribe.bind(this);
this.handleScrollReference = this.handleScrollReference.bind(this); this.handleScrollReference = this.handleScrollReference.bind(this);
this.mountDnDEvents = this.mountDnDEvents.bind(this);
this.handleScrollEvent = this.handleScrollEvent.bind(this); this.handleScrollEvent = this.handleScrollEvent.bind(this);
this.handleDescChange = this.handleDescChange.bind(this); this.handleDescChange = this.handleDescChange.bind(this);
this.handleSubsUpdated = this.handleSubsUpdated.bind(this); this.handleSubsUpdated = this.handleSubsUpdated.bind(this);
@@ -5522,8 +5554,15 @@ class MessagesView extends (react__WEBPACK_IMPORTED_MODULE_0___default().Compone
this.handleCancelReply = this.handleCancelReply.bind(this); this.handleCancelReply = this.handleCancelReply.bind(this);
this.handleQuoteClick = this.handleQuoteClick.bind(this); this.handleQuoteClick = this.handleQuoteClick.bind(this);
this.handleCallHangup = this.handleCallHangup.bind(this); this.handleCallHangup = this.handleCallHangup.bind(this);
this.isDragEnabled = this.isDragEnabled.bind(this);
this.handleDragIn = this.handleDragIn.bind(this);
this.handleDragOut = this.handleDragOut.bind(this);
this.handleDrag = this.handleDrag.bind(this);
this.handleDrop = this.handleDrop.bind(this);
this.chatMessageRefs = {}; this.chatMessageRefs = {};
this.getOrCreateMessageRef = this.getOrCreateMessageRef.bind(this); this.getOrCreateMessageRef = this.getOrCreateMessageRef.bind(this);
this.dragCounter = 0;
this.dndRef = null;
this.readNotificationQueue = []; this.readNotificationQueue = [];
this.readNotificationTimer = null; this.readNotificationTimer = null;
this.keyPressTimer = null; this.keyPressTimer = null;
@@ -5540,12 +5579,24 @@ class MessagesView extends (react__WEBPACK_IMPORTED_MODULE_0___default().Compone
if (this.messagesScroller) { if (this.messagesScroller) {
this.messagesScroller.addEventListener('scroll', this.handleScrollEvent); this.messagesScroller.addEventListener('scroll', this.handleScrollEvent);
} }
if (this.dndRef) {
this.dndRef.addEventListener('dragenter', this.handleDragIn);
this.dndRef.addEventListener('dragleave', this.handleDragOut);
this.dndRef.addEventListener('dragover', this.handleDrag);
this.dndRef.addEventListener('drop', this.handleDrop);
}
} }
componentWillUnmount() { componentWillUnmount() {
if (this.messagesScroller) { if (this.messagesScroller) {
this.messagesScroller.removeEventListener('scroll', this.handleScrollEvent); this.messagesScroller.removeEventListener('scroll', this.handleScrollEvent);
} }
this.clearNotificationQueue(); this.clearNotificationQueue();
if (this.dndRef) {
this.dndRef.removeEventListener('dragenter', this.handleDragIn);
this.dndRef.removeEventListener('dragleave', this.handleDragOut);
this.dndRef.removeEventListener('dragover', this.handleDrag);
this.dndRef.removeEventListener('drop', this.handleDrop);
}
} }
componentDidUpdate(prevProps, prevState) { componentDidUpdate(prevProps, prevState) {
if (this.messagesScroller && (prevState.topic != this.state.topic || prevState.messageCount != this.state.messageCount)) { if (this.messagesScroller && (prevState.topic != this.state.topic || prevState.messageCount != this.state.messageCount)) {
@@ -5645,7 +5696,7 @@ class MessagesView extends (react__WEBPACK_IMPORTED_MODULE_0___default().Compone
if (topic.public) { if (topic.public) {
Object.assign(nextState, { Object.assign(nextState, {
title: topic.public.fn, title: topic.public.fn,
avatar: (0,_lib_blob_helpers_js__WEBPACK_IMPORTED_MODULE_20__.makeImageUrl)(topic.public.photo) avatar: (0,_lib_blob_helpers_js__WEBPACK_IMPORTED_MODULE_19__.makeImageUrl)(topic.public.photo)
}); });
} else { } else {
Object.assign(nextState, { Object.assign(nextState, {
@@ -5729,7 +5780,7 @@ class MessagesView extends (react__WEBPACK_IMPORTED_MODULE_0___default().Compone
const newTopic = this.props.newTopicParams && this.props.newTopicParams._topicName == this.props.topic; const newTopic = this.props.newTopicParams && this.props.newTopicParams._topicName == this.props.topic;
let getQuery = topic.startMetaQuery().withLaterDesc().withLaterSub(); let getQuery = topic.startMetaQuery().withLaterDesc().withLaterSub();
if (this.state.isReader || newTopic) { if (this.state.isReader || newTopic) {
getQuery = getQuery.withLaterData(_config_js__WEBPACK_IMPORTED_MODULE_18__.MESSAGES_PAGE); getQuery = getQuery.withLaterData(_config_js__WEBPACK_IMPORTED_MODULE_17__.MESSAGES_PAGE);
if (this.state.isReader) { if (this.state.isReader) {
getQuery = getQuery.withLaterDel(); getQuery = getQuery.withLaterDel();
} }
@@ -5740,7 +5791,7 @@ class MessagesView extends (react__WEBPACK_IMPORTED_MODULE_0___default().Compone
const setQuery = newTopic ? this.props.newTopicParams : undefined; const setQuery = newTopic ? this.props.newTopicParams : undefined;
topic.subscribe(getQuery.build(), setQuery).then(ctrl => { topic.subscribe(getQuery.build(), setQuery).then(ctrl => {
if (ctrl.code == 303) { if (ctrl.code == 303) {
_lib_navigation_js__WEBPACK_IMPORTED_MODULE_21__["default"].navigateTo(_lib_navigation_js__WEBPACK_IMPORTED_MODULE_21__["default"].setUrlTopic('', ctrl.params.topic)); _lib_navigation_js__WEBPACK_IMPORTED_MODULE_20__["default"].navigateTo(_lib_navigation_js__WEBPACK_IMPORTED_MODULE_20__["default"].setUrlTopic('', ctrl.params.topic));
return; return;
} }
if (this.state.topic != ctrl.topic) { if (this.state.topic != ctrl.topic) {
@@ -5814,13 +5865,22 @@ class MessagesView extends (react__WEBPACK_IMPORTED_MODULE_0___default().Compone
this.setState({ this.setState({
fetchingMessages: true fetchingMessages: true
}, _ => { }, _ => {
topic.getMessagesPage(_config_js__WEBPACK_IMPORTED_MODULE_18__.MESSAGES_PAGE).catch(err => this.props.onError(err.message, 'err')).finally(_ => this.setState({ topic.getMessagesPage(_config_js__WEBPACK_IMPORTED_MODULE_17__.MESSAGES_PAGE).catch(err => this.props.onError(err.message, 'err')).finally(_ => this.setState({
fetchingMessages: false fetchingMessages: false
})); }));
}); });
} }
} }
} }
mountDnDEvents(dnd) {
if (dnd) {
dnd.addEventListener('dragenter', this.handleDragIn);
dnd.addEventListener('dragleave', this.handleDragOut);
dnd.addEventListener('dragover', this.handleDrag);
dnd.addEventListener('drop', this.handleDrop);
this.dndRef = dnd;
}
}
goToLatestMessage() { goToLatestMessage() {
this.setState({ this.setState({
scrollPosition: 0 scrollPosition: 0
@@ -5833,7 +5893,7 @@ class MessagesView extends (react__WEBPACK_IMPORTED_MODULE_0___default().Compone
if (desc.public) { if (desc.public) {
this.setState({ this.setState({
title: desc.public.fn, title: desc.public.fn,
avatar: (0,_lib_blob_helpers_js__WEBPACK_IMPORTED_MODULE_20__.makeImageUrl)(desc.public.photo) avatar: (0,_lib_blob_helpers_js__WEBPACK_IMPORTED_MODULE_19__.makeImageUrl)(desc.public.photo)
}); });
} else { } else {
this.setState({ this.setState({
@@ -5888,7 +5948,7 @@ class MessagesView extends (react__WEBPACK_IMPORTED_MODULE_0___default().Compone
this.readNotificationQueue.push({ this.readNotificationQueue.push({
topicName: this.state.topic, topicName: this.state.topic,
seq: seq, seq: seq,
sendAt: now.setMilliseconds(now.getMilliseconds() + _config_js__WEBPACK_IMPORTED_MODULE_18__.READ_DELAY) sendAt: now.setMilliseconds(now.getMilliseconds() + _config_js__WEBPACK_IMPORTED_MODULE_17__.READ_DELAY)
}); });
} }
clearNotificationQueue() { clearNotificationQueue() {
@@ -5966,7 +6026,7 @@ class MessagesView extends (react__WEBPACK_IMPORTED_MODULE_0___default().Compone
clearTimeout(this.keyPressTimer); clearTimeout(this.keyPressTimer);
this.keyPressTimer = setTimeout(_ => this.setState({ this.keyPressTimer = setTimeout(_ => this.setState({
typingIndicator: false typingIndicator: false
}), _config_js__WEBPACK_IMPORTED_MODULE_18__.KEYPRESS_DELAY + 1000); }), _config_js__WEBPACK_IMPORTED_MODULE_17__.KEYPRESS_DELAY + 1000);
if (!this.state.typingIndicator) { if (!this.state.typingIndicator) {
this.setState({ this.setState({
typingIndicator: true typingIndicator: true
@@ -6058,7 +6118,7 @@ class MessagesView extends (react__WEBPACK_IMPORTED_MODULE_0___default().Compone
} }
handleEnablePeer(e) { handleEnablePeer(e) {
e.preventDefault(); e.preventDefault();
this.props.onChangePermissions(this.state.topic, _config_js__WEBPACK_IMPORTED_MODULE_18__.DEFAULT_P2P_ACCESS_MODE, this.state.topic); this.props.onChangePermissions(this.state.topic, _config_js__WEBPACK_IMPORTED_MODULE_17__.DEFAULT_P2P_ACCESS_MODE, this.state.topic);
} }
sendKeyPress(audio) { sendKeyPress(audio) {
const topic = this.props.tinode.getTopic(this.state.topic); const topic = this.props.tinode.getTopic(this.state.topic);
@@ -6105,7 +6165,7 @@ class MessagesView extends (react__WEBPACK_IMPORTED_MODULE_0___default().Compone
}); });
} }
sendFileAttachment(file) { sendFileAttachment(file) {
const maxInbandAttachmentSize = this.props.tinode.getServerParam('maxMessageSize', _config_js__WEBPACK_IMPORTED_MODULE_18__.MAX_INBAND_ATTACHMENT_SIZE) * 0.75 - 1024 | 0; const maxInbandAttachmentSize = this.props.tinode.getServerParam('maxMessageSize', _config_js__WEBPACK_IMPORTED_MODULE_17__.MAX_INBAND_ATTACHMENT_SIZE) * 0.75 - 1024 | 0;
if (file.size > maxInbandAttachmentSize) { if (file.size > maxInbandAttachmentSize) {
const uploader = this.props.tinode.getLargeFileHelper(); const uploader = this.props.tinode.getLargeFileHelper();
if (!uploader) { if (!uploader) {
@@ -6121,7 +6181,7 @@ class MessagesView extends (react__WEBPACK_IMPORTED_MODULE_0___default().Compone
}); });
this.sendMessage(msg, uploadCompletionPromise, uploader); this.sendMessage(msg, uploadCompletionPromise, uploader);
} else { } else {
(0,_lib_blob_helpers_js__WEBPACK_IMPORTED_MODULE_20__.fileToBase64)(file).then(b64 => this.sendMessage(tinode_sdk__WEBPACK_IMPORTED_MODULE_2__.Drafty.attachFile(null, { (0,_lib_blob_helpers_js__WEBPACK_IMPORTED_MODULE_19__.fileToBase64)(file).then(b64 => this.sendMessage(tinode_sdk__WEBPACK_IMPORTED_MODULE_2__.Drafty.attachFile(null, {
mime: b64.mime, mime: b64.mime,
data: b64.bits, data: b64.bits,
filename: b64.name filename: b64.name
@@ -6129,11 +6189,11 @@ class MessagesView extends (react__WEBPACK_IMPORTED_MODULE_0___default().Compone
} }
} }
handleAttachFile(file) { handleAttachFile(file) {
const maxExternAttachmentSize = this.props.tinode.getServerParam('maxFileUploadSize', _config_js__WEBPACK_IMPORTED_MODULE_18__.MAX_EXTERN_ATTACHMENT_SIZE); const maxExternAttachmentSize = this.props.tinode.getServerParam('maxFileUploadSize', _config_js__WEBPACK_IMPORTED_MODULE_17__.MAX_EXTERN_ATTACHMENT_SIZE);
if (file.size > maxExternAttachmentSize) { if (file.size > maxExternAttachmentSize) {
this.props.onError(this.props.intl.formatMessage(messages.file_attachment_too_large, { this.props.onError(this.props.intl.formatMessage(messages.file_attachment_too_large, {
size: (0,_lib_strformat_js__WEBPACK_IMPORTED_MODULE_22__.bytesToHumanSize)(file.size), size: (0,_lib_strformat_js__WEBPACK_IMPORTED_MODULE_21__.bytesToHumanSize)(file.size),
limit: (0,_lib_strformat_js__WEBPACK_IMPORTED_MODULE_22__.bytesToHumanSize)(maxExternAttachmentSize) limit: (0,_lib_strformat_js__WEBPACK_IMPORTED_MODULE_21__.bytesToHumanSize)(maxExternAttachmentSize)
}), 'err'); }), 'err');
} else { } else {
this.setState({ this.setState({
@@ -6158,7 +6218,7 @@ class MessagesView extends (react__WEBPACK_IMPORTED_MODULE_0___default().Compone
const width = this.state.imagePreview.width; const width = this.state.imagePreview.width;
const height = this.state.imagePreview.height; const height = this.state.imagePreview.height;
const fname = this.state.imagePreview.name; const fname = this.state.imagePreview.name;
const maxInbandAttachmentSize = this.props.tinode.getServerParam('maxMessageSize', _config_js__WEBPACK_IMPORTED_MODULE_18__.MAX_INBAND_ATTACHMENT_SIZE) * 0.75 - 1024 | 0; const maxInbandAttachmentSize = this.props.tinode.getServerParam('maxMessageSize', _config_js__WEBPACK_IMPORTED_MODULE_17__.MAX_INBAND_ATTACHMENT_SIZE) * 0.75 - 1024 | 0;
if (blob.size > maxInbandAttachmentSize) { if (blob.size > maxInbandAttachmentSize) {
const uploader = this.props.tinode.getLargeFileHelper(); const uploader = this.props.tinode.getLargeFileHelper();
if (!uploader) { if (!uploader) {
@@ -6166,7 +6226,7 @@ class MessagesView extends (react__WEBPACK_IMPORTED_MODULE_0___default().Compone
return; return;
} }
const uploadCompletionPromise = uploader.upload(blob); const uploadCompletionPromise = uploader.upload(blob);
(0,_lib_blob_helpers_js__WEBPACK_IMPORTED_MODULE_20__.imageScaled)(blob, _config_js__WEBPACK_IMPORTED_MODULE_18__.IMAGE_PREVIEW_DIM, _config_js__WEBPACK_IMPORTED_MODULE_18__.IMAGE_PREVIEW_DIM, -1, false).then(scaled => (0,_lib_blob_helpers_js__WEBPACK_IMPORTED_MODULE_20__.blobToBase64)(scaled.blob)).then(b64 => { (0,_lib_blob_helpers_js__WEBPACK_IMPORTED_MODULE_19__.imageScaled)(blob, _config_js__WEBPACK_IMPORTED_MODULE_17__.IMAGE_PREVIEW_DIM, _config_js__WEBPACK_IMPORTED_MODULE_17__.IMAGE_PREVIEW_DIM, -1, false).then(scaled => (0,_lib_blob_helpers_js__WEBPACK_IMPORTED_MODULE_19__.blobToBase64)(scaled.blob)).then(b64 => {
let msg = tinode_sdk__WEBPACK_IMPORTED_MODULE_2__.Drafty.insertImage(null, 0, { let msg = tinode_sdk__WEBPACK_IMPORTED_MODULE_2__.Drafty.insertImage(null, 0, {
mime: mime, mime: mime,
_tempPreview: b64.bits, _tempPreview: b64.bits,
@@ -6185,7 +6245,7 @@ class MessagesView extends (react__WEBPACK_IMPORTED_MODULE_0___default().Compone
}).catch(err => this.props.onError(err, 'err')); }).catch(err => this.props.onError(err, 'err'));
return; return;
} }
(0,_lib_blob_helpers_js__WEBPACK_IMPORTED_MODULE_20__.blobToBase64)(blob).then(b64 => { (0,_lib_blob_helpers_js__WEBPACK_IMPORTED_MODULE_19__.blobToBase64)(blob).then(b64 => {
let msg = tinode_sdk__WEBPACK_IMPORTED_MODULE_2__.Drafty.insertImage(null, 0, { let msg = tinode_sdk__WEBPACK_IMPORTED_MODULE_2__.Drafty.insertImage(null, 0, {
mime: b64.mime, mime: b64.mime,
bits: b64.bits, bits: b64.bits,
@@ -6204,7 +6264,7 @@ class MessagesView extends (react__WEBPACK_IMPORTED_MODULE_0___default().Compone
sendVideoAttachment(caption, videoBlob, previewBlob, params) { sendVideoAttachment(caption, videoBlob, previewBlob, params) {
const width = params.width; const width = params.width;
const height = params.height; const height = params.height;
const maxInbandAttachmentSize = this.props.tinode.getServerParam('maxMessageSize', _config_js__WEBPACK_IMPORTED_MODULE_18__.MAX_INBAND_ATTACHMENT_SIZE) * 0.75 - 1024 | 0; const maxInbandAttachmentSize = this.props.tinode.getServerParam('maxMessageSize', _config_js__WEBPACK_IMPORTED_MODULE_17__.MAX_INBAND_ATTACHMENT_SIZE) * 0.75 - 1024 | 0;
const uploads = []; const uploads = [];
let uploader; let uploader;
if (videoBlob.size + previewBlob.size > maxInbandAttachmentSize) { if (videoBlob.size + previewBlob.size > maxInbandAttachmentSize) {
@@ -6217,7 +6277,7 @@ class MessagesView extends (react__WEBPACK_IMPORTED_MODULE_0___default().Compone
uploads[1] = previewBlob.size > maxInbandAttachmentSize * 0.275 ? uploader.upload(previewBlob) : null; uploads[1] = previewBlob.size > maxInbandAttachmentSize * 0.275 ? uploader.upload(previewBlob) : null;
} }
if (uploads.length == 0) { if (uploads.length == 0) {
Promise.all((0,_lib_blob_helpers_js__WEBPACK_IMPORTED_MODULE_20__.blobToBase64)(videoBlob), (0,_lib_blob_helpers_js__WEBPACK_IMPORTED_MODULE_20__.blobToBase64)(previewBlob)).then(b64s => { Promise.all((0,_lib_blob_helpers_js__WEBPACK_IMPORTED_MODULE_19__.blobToBase64)(videoBlob), (0,_lib_blob_helpers_js__WEBPACK_IMPORTED_MODULE_19__.blobToBase64)(previewBlob)).then(b64s => {
const [v64, i64] = b64s; const [v64, i64] = b64s;
let msg = tinode_sdk__WEBPACK_IMPORTED_MODULE_2__.Drafty.insertVideo(null, 0, { let msg = tinode_sdk__WEBPACK_IMPORTED_MODULE_2__.Drafty.insertVideo(null, 0, {
mime: v64.mime, mime: v64.mime,
@@ -6240,9 +6300,9 @@ class MessagesView extends (react__WEBPACK_IMPORTED_MODULE_0___default().Compone
} }
const uploadCompletionPromise = Promise.all(uploads); const uploadCompletionPromise = Promise.all(uploads);
const b64conv = []; const b64conv = [];
b64conv[0] = uploads[0] ? null : (0,_lib_blob_helpers_js__WEBPACK_IMPORTED_MODULE_20__.blobToBase64)(videoBlob); b64conv[0] = uploads[0] ? null : (0,_lib_blob_helpers_js__WEBPACK_IMPORTED_MODULE_19__.blobToBase64)(videoBlob);
b64conv[1] = uploads[1] ? null : (0,_lib_blob_helpers_js__WEBPACK_IMPORTED_MODULE_20__.imageScaled)(previewBlob, _config_js__WEBPACK_IMPORTED_MODULE_18__.MAX_IMAGE_DIM, _config_js__WEBPACK_IMPORTED_MODULE_18__.MAX_IMAGE_DIM, -1, false).then(scaled => (0,_lib_blob_helpers_js__WEBPACK_IMPORTED_MODULE_20__.blobToBase64)(scaled.blob)); b64conv[1] = uploads[1] ? null : (0,_lib_blob_helpers_js__WEBPACK_IMPORTED_MODULE_19__.imageScaled)(previewBlob, _config_js__WEBPACK_IMPORTED_MODULE_17__.MAX_IMAGE_DIM, _config_js__WEBPACK_IMPORTED_MODULE_17__.MAX_IMAGE_DIM, -1, false).then(scaled => (0,_lib_blob_helpers_js__WEBPACK_IMPORTED_MODULE_19__.blobToBase64)(scaled.blob));
b64conv[2] = (0,_lib_blob_helpers_js__WEBPACK_IMPORTED_MODULE_20__.imageScaled)(previewBlob, _config_js__WEBPACK_IMPORTED_MODULE_18__.VIDEO_PREVIEW_DIM, _config_js__WEBPACK_IMPORTED_MODULE_18__.VIDEO_PREVIEW_DIM, -1, false).then(scaled => (0,_lib_blob_helpers_js__WEBPACK_IMPORTED_MODULE_20__.blobToBase64)(scaled.blob)); b64conv[2] = (0,_lib_blob_helpers_js__WEBPACK_IMPORTED_MODULE_19__.imageScaled)(previewBlob, _config_js__WEBPACK_IMPORTED_MODULE_17__.VIDEO_PREVIEW_DIM, _config_js__WEBPACK_IMPORTED_MODULE_17__.VIDEO_PREVIEW_DIM, -1, false).then(scaled => (0,_lib_blob_helpers_js__WEBPACK_IMPORTED_MODULE_19__.blobToBase64)(scaled.blob));
Promise.all(b64conv).then(b64s => { Promise.all(b64conv).then(b64s => {
const [video, img, preview] = b64s; const [video, img, preview] = b64s;
let msg = tinode_sdk__WEBPACK_IMPORTED_MODULE_2__.Drafty.insertVideo(null, 0, { let msg = tinode_sdk__WEBPACK_IMPORTED_MODULE_2__.Drafty.insertVideo(null, 0, {
@@ -6266,7 +6326,7 @@ class MessagesView extends (react__WEBPACK_IMPORTED_MODULE_0___default().Compone
}).catch(err => this.props.onError(err.message, 'err')); }).catch(err => this.props.onError(err.message, 'err'));
} }
handleAttachImageOrVideo(file) { handleAttachImageOrVideo(file) {
const maxExternAttachmentSize = this.props.tinode.getServerParam('maxFileUploadSize', _config_js__WEBPACK_IMPORTED_MODULE_18__.MAX_EXTERN_ATTACHMENT_SIZE); const maxExternAttachmentSize = this.props.tinode.getServerParam('maxFileUploadSize', _config_js__WEBPACK_IMPORTED_MODULE_17__.MAX_EXTERN_ATTACHMENT_SIZE);
if (file.type.startsWith('video/')) { if (file.type.startsWith('video/')) {
this.setState({ this.setState({
videoPreview: { videoPreview: {
@@ -6279,7 +6339,7 @@ class MessagesView extends (react__WEBPACK_IMPORTED_MODULE_0___default().Compone
}); });
return; return;
} }
(0,_lib_blob_helpers_js__WEBPACK_IMPORTED_MODULE_20__.imageScaled)(file, _config_js__WEBPACK_IMPORTED_MODULE_18__.MAX_IMAGE_DIM, _config_js__WEBPACK_IMPORTED_MODULE_18__.MAX_IMAGE_DIM, maxExternAttachmentSize, false).then(scaled => { (0,_lib_blob_helpers_js__WEBPACK_IMPORTED_MODULE_19__.imageScaled)(file, _config_js__WEBPACK_IMPORTED_MODULE_17__.MAX_IMAGE_DIM, _config_js__WEBPACK_IMPORTED_MODULE_17__.MAX_IMAGE_DIM, maxExternAttachmentSize, false).then(scaled => {
this.setState({ this.setState({
imagePreview: { imagePreview: {
url: URL.createObjectURL(scaled.blob), url: URL.createObjectURL(scaled.blob),
@@ -6308,7 +6368,7 @@ class MessagesView extends (react__WEBPACK_IMPORTED_MODULE_0___default().Compone
} }
sendAudioAttachment(url, preview, duration) { sendAudioAttachment(url, preview, duration) {
fetch(url).then(result => result.blob()).then(blob => { fetch(url).then(result => result.blob()).then(blob => {
const maxInbandAttachmentSize = this.props.tinode.getServerParam('maxMessageSize', _config_js__WEBPACK_IMPORTED_MODULE_18__.MAX_INBAND_ATTACHMENT_SIZE) * 0.75 - 1024; const maxInbandAttachmentSize = this.props.tinode.getServerParam('maxMessageSize', _config_js__WEBPACK_IMPORTED_MODULE_17__.MAX_INBAND_ATTACHMENT_SIZE) * 0.75 - 1024;
if (blob.size > maxInbandAttachmentSize) { if (blob.size > maxInbandAttachmentSize) {
const uploader = this.props.tinode.getLargeFileHelper(); const uploader = this.props.tinode.getLargeFileHelper();
if (!uploader) { if (!uploader) {
@@ -6325,7 +6385,7 @@ class MessagesView extends (react__WEBPACK_IMPORTED_MODULE_0___default().Compone
}); });
this.sendMessage(msg, uploadCompletionPromise, uploader); this.sendMessage(msg, uploadCompletionPromise, uploader);
} else { } else {
(0,_lib_blob_helpers_js__WEBPACK_IMPORTED_MODULE_20__.blobToBase64)(blob).then(b64 => { (0,_lib_blob_helpers_js__WEBPACK_IMPORTED_MODULE_19__.blobToBase64)(blob).then(b64 => {
this.sendMessage(tinode_sdk__WEBPACK_IMPORTED_MODULE_2__.Drafty.appendAudio(null, { this.sendMessage(tinode_sdk__WEBPACK_IMPORTED_MODULE_2__.Drafty.appendAudio(null, {
mime: b64.mime, mime: b64.mime,
bits: b64.bits, bits: b64.bits,
@@ -6357,7 +6417,7 @@ class MessagesView extends (react__WEBPACK_IMPORTED_MODULE_0___default().Compone
} }
content = typeof content == 'string' ? tinode_sdk__WEBPACK_IMPORTED_MODULE_2__.Drafty.init(content) : content; content = typeof content == 'string' ? tinode_sdk__WEBPACK_IMPORTED_MODULE_2__.Drafty.init(content) : content;
if (tinode_sdk__WEBPACK_IMPORTED_MODULE_2__.Drafty.isValid(content)) { if (tinode_sdk__WEBPACK_IMPORTED_MODULE_2__.Drafty.isValid(content)) {
content = tinode_sdk__WEBPACK_IMPORTED_MODULE_2__.Drafty.replyContent(content, _config_js__WEBPACK_IMPORTED_MODULE_18__.QUOTED_REPLY_LENGTH); content = tinode_sdk__WEBPACK_IMPORTED_MODULE_2__.Drafty.replyContent(content, _config_js__WEBPACK_IMPORTED_MODULE_17__.QUOTED_REPLY_LENGTH);
} else { } else {
content = tinode_sdk__WEBPACK_IMPORTED_MODULE_2__.Drafty.append(tinode_sdk__WEBPACK_IMPORTED_MODULE_2__.Drafty.init('\u26A0 '), tinode_sdk__WEBPACK_IMPORTED_MODULE_2__.Drafty.wrapInto(this.props.intl.formatMessage(messages.invalid_content), 'EM')); content = tinode_sdk__WEBPACK_IMPORTED_MODULE_2__.Drafty.append(tinode_sdk__WEBPACK_IMPORTED_MODULE_2__.Drafty.init('\u26A0 '), tinode_sdk__WEBPACK_IMPORTED_MODULE_2__.Drafty.wrapInto(this.props.intl.formatMessage(messages.invalid_content), 'EM'));
} }
@@ -6379,7 +6439,7 @@ class MessagesView extends (react__WEBPACK_IMPORTED_MODULE_0___default().Compone
content = typeof content == 'string' ? tinode_sdk__WEBPACK_IMPORTED_MODULE_2__.Drafty.init(content) : content; content = typeof content == 'string' ? tinode_sdk__WEBPACK_IMPORTED_MODULE_2__.Drafty.init(content) : content;
const editable = tinode_sdk__WEBPACK_IMPORTED_MODULE_2__.Drafty.toMarkdown(content); const editable = tinode_sdk__WEBPACK_IMPORTED_MODULE_2__.Drafty.toMarkdown(content);
if (tinode_sdk__WEBPACK_IMPORTED_MODULE_2__.Drafty.isValid(content)) { if (tinode_sdk__WEBPACK_IMPORTED_MODULE_2__.Drafty.isValid(content)) {
content = tinode_sdk__WEBPACK_IMPORTED_MODULE_2__.Drafty.replyContent(content, _config_js__WEBPACK_IMPORTED_MODULE_18__.EDIT_PREVIEW_LENGTH); content = tinode_sdk__WEBPACK_IMPORTED_MODULE_2__.Drafty.replyContent(content, _config_js__WEBPACK_IMPORTED_MODULE_17__.EDIT_PREVIEW_LENGTH);
} else { } else {
content = tinode_sdk__WEBPACK_IMPORTED_MODULE_2__.Drafty.append(tinode_sdk__WEBPACK_IMPORTED_MODULE_2__.Drafty.init('\u26A0 '), tinode_sdk__WEBPACK_IMPORTED_MODULE_2__.Drafty.wrapInto(this.props.intl.formatMessage(messages.invalid_content), 'EM')); content = tinode_sdk__WEBPACK_IMPORTED_MODULE_2__.Drafty.append(tinode_sdk__WEBPACK_IMPORTED_MODULE_2__.Drafty.init('\u26A0 '), tinode_sdk__WEBPACK_IMPORTED_MODULE_2__.Drafty.wrapInto(this.props.intl.formatMessage(messages.invalid_content), 'EM'));
} }
@@ -6415,6 +6475,45 @@ class MessagesView extends (react__WEBPACK_IMPORTED_MODULE_0___default().Compone
console.error("Unresolved message ref", replyToSeq); console.error("Unresolved message ref", replyToSeq);
} }
} }
isDragEnabled() {
return this.state.isWriter && !this.state.unconfirmed && !this.props.forwardMessage && !this.state.peerMessagingDisabled;
}
handleDrag(e) {
e.preventDefault();
e.stopPropagation();
}
handleDragIn(e) {
e.preventDefault();
e.stopPropagation();
this.dragCounter++;
if (e.dataTransfer.items && e.dataTransfer.items.length > 0) {
this.setState({
dragging: true
});
}
}
handleDragOut(e) {
e.preventDefault();
e.stopPropagation();
this.dragCounter--;
if (this.dragCounter <= 0) {
this.setState({
dragging: false
});
}
}
handleDrop(e) {
e.preventDefault();
e.stopPropagation();
this.setState({
dragging: false
});
if (this.isDragEnabled() && e.dataTransfer.files && e.dataTransfer.files.length > 0) {
this.handleFileDrop(e.dataTransfer.files);
e.dataTransfer.clearData();
this.dragCounter = 0;
}
}
render() { render() {
const { const {
formatMessage formatMessage
@@ -6423,14 +6522,14 @@ class MessagesView extends (react__WEBPACK_IMPORTED_MODULE_0___default().Compone
if (this.props.hideSelf) { if (this.props.hideSelf) {
component = null; component = null;
} else if (!this.state.topic) { } else if (!this.state.topic) {
component = react__WEBPACK_IMPORTED_MODULE_0___default().createElement(_logo_view_jsx__WEBPACK_IMPORTED_MODULE_14__["default"], { component = react__WEBPACK_IMPORTED_MODULE_0___default().createElement(_logo_view_jsx__WEBPACK_IMPORTED_MODULE_13__["default"], {
serverVersion: this.props.serverVersion, serverVersion: this.props.serverVersion,
serverAddress: this.props.serverAddress serverAddress: this.props.serverAddress
}); });
} else { } else {
let component2; let component2;
if (this.state.imagePreview) { if (this.state.imagePreview) {
component2 = react__WEBPACK_IMPORTED_MODULE_0___default().createElement(_widgets_image_preview_jsx__WEBPACK_IMPORTED_MODULE_10__["default"], { component2 = react__WEBPACK_IMPORTED_MODULE_0___default().createElement(_widgets_image_preview_jsx__WEBPACK_IMPORTED_MODULE_9__["default"], {
content: this.state.imagePreview, content: this.state.imagePreview,
tinode: this.props.tinode, tinode: this.props.tinode,
reply: this.state.reply, reply: this.state.reply,
@@ -6439,7 +6538,7 @@ class MessagesView extends (react__WEBPACK_IMPORTED_MODULE_0___default().Compone
onSendMessage: this.sendImageAttachment onSendMessage: this.sendImageAttachment
}); });
} else if (this.state.videoPreview) { } else if (this.state.videoPreview) {
component2 = react__WEBPACK_IMPORTED_MODULE_0___default().createElement(_widgets_video_preview_jsx__WEBPACK_IMPORTED_MODULE_17__["default"], { component2 = react__WEBPACK_IMPORTED_MODULE_0___default().createElement(_widgets_video_preview_jsx__WEBPACK_IMPORTED_MODULE_16__["default"], {
content: this.state.videoPreview, content: this.state.videoPreview,
tinode: this.props.tinode, tinode: this.props.tinode,
reply: this.state.reply, reply: this.state.reply,
@@ -6448,7 +6547,7 @@ class MessagesView extends (react__WEBPACK_IMPORTED_MODULE_0___default().Compone
onSendMessage: this.sendVideoAttachment onSendMessage: this.sendVideoAttachment
}); });
} else if (this.state.imagePostview) { } else if (this.state.imagePostview) {
component2 = react__WEBPACK_IMPORTED_MODULE_0___default().createElement(_widgets_image_preview_jsx__WEBPACK_IMPORTED_MODULE_10__["default"], { component2 = react__WEBPACK_IMPORTED_MODULE_0___default().createElement(_widgets_image_preview_jsx__WEBPACK_IMPORTED_MODULE_9__["default"], {
content: this.state.imagePostview, content: this.state.imagePostview,
onClose: this.handleClosePreview onClose: this.handleClosePreview
}); });
@@ -6527,7 +6626,7 @@ class MessagesView extends (react__WEBPACK_IMPORTED_MODULE_0___default().Compone
const user = topic.userDesc(thisFrom); const user = topic.userDesc(thisFrom);
if (user && user.public) { if (user && user.public) {
userName = user.public.fn; userName = user.public.fn;
userAvatar = (0,_lib_blob_helpers_js__WEBPACK_IMPORTED_MODULE_20__.makeImageUrl)(user.public.photo); userAvatar = (0,_lib_blob_helpers_js__WEBPACK_IMPORTED_MODULE_19__.makeImageUrl)(user.public.photo);
} }
chatBoxClass = groupTopic ? 'chat-box group' : 'chat-box'; chatBoxClass = groupTopic ? 'chat-box group' : 'chat-box';
const ref = this.getOrCreateMessageRef(msg.seq); const ref = this.getOrCreateMessageRef(msg.seq);
@@ -6536,15 +6635,15 @@ class MessagesView extends (react__WEBPACK_IMPORTED_MODULE_0___default().Compone
replyToSeq = null; replyToSeq = null;
} }
if (msg.hi) { if (msg.hi) {
messageNodes.push(react__WEBPACK_IMPORTED_MODULE_0___default().createElement(_widgets_meta_message_jsx__WEBPACK_IMPORTED_MODULE_15__["default"], { messageNodes.push(react__WEBPACK_IMPORTED_MODULE_0___default().createElement(_widgets_meta_message_jsx__WEBPACK_IMPORTED_MODULE_14__["default"], {
deleted: true, deleted: true,
key: msg.seq key: msg.seq
})); }));
} else { } else {
const thisDate = new Date(msg.ts); const thisDate = new Date(msg.ts);
if (!prevDate || prevDate.toDateString() != thisDate.toDateString()) { if (!prevDate || prevDate.toDateString() != thisDate.toDateString()) {
messageNodes.push(react__WEBPACK_IMPORTED_MODULE_0___default().createElement(_widgets_meta_message_jsx__WEBPACK_IMPORTED_MODULE_15__["default"], { messageNodes.push(react__WEBPACK_IMPORTED_MODULE_0___default().createElement(_widgets_meta_message_jsx__WEBPACK_IMPORTED_MODULE_14__["default"], {
date: (0,_lib_strformat_js__WEBPACK_IMPORTED_MODULE_22__.relativeDateFormat)(msg.ts), date: (0,_lib_strformat_js__WEBPACK_IMPORTED_MODULE_21__.relativeDateFormat)(msg.ts),
locale: this.props.intl.locale, locale: this.props.intl.locale,
key: 'date-' + msg.seq key: 'date-' + msg.seq
})); }));
@@ -6591,7 +6690,7 @@ class MessagesView extends (react__WEBPACK_IMPORTED_MODULE_0___default().Compone
if (cont.online) { if (cont.online) {
lastSeen = formatMessage(messages.online_now); lastSeen = formatMessage(messages.online_now);
} else if (cont.seen) { } else if (cont.seen) {
lastSeen = formatMessage(messages.last_seen) + ": " + (0,_lib_strformat_js__WEBPACK_IMPORTED_MODULE_22__.shortDateFormat)(cont.seen.when, this.props.intl.locale); lastSeen = formatMessage(messages.last_seen) + ": " + (0,_lib_strformat_js__WEBPACK_IMPORTED_MODULE_21__.shortDateFormat)(cont.seen.when, this.props.intl.locale);
} }
} }
} }
@@ -6640,9 +6739,9 @@ class MessagesView extends (react__WEBPACK_IMPORTED_MODULE_0___default().Compone
"type": 0, "type": 0,
"value": "Enable" "value": "Enable"
}] }]
})), ".") : null, this.state.unconfirmed ? react__WEBPACK_IMPORTED_MODULE_0___default().createElement(_widgets_invitation_jsx__WEBPACK_IMPORTED_MODULE_11__["default"], { })), ".") : null, this.state.unconfirmed ? react__WEBPACK_IMPORTED_MODULE_0___default().createElement(_widgets_invitation_jsx__WEBPACK_IMPORTED_MODULE_10__["default"], {
onAction: this.handleNewChatAcceptance onAction: this.handleNewChatAcceptance
}) : react__WEBPACK_IMPORTED_MODULE_0___default().createElement(_widgets_send_message_jsx__WEBPACK_IMPORTED_MODULE_16__["default"], { }) : react__WEBPACK_IMPORTED_MODULE_0___default().createElement(_widgets_send_message_jsx__WEBPACK_IMPORTED_MODULE_15__["default"], {
tinode: this.props.tinode, tinode: this.props.tinode,
topicName: this.state.topic, topicName: this.state.topic,
noInput: !!this.props.forwardMessage, noInput: !!this.props.forwardMessage,
@@ -6673,7 +6772,7 @@ class MessagesView extends (react__WEBPACK_IMPORTED_MODULE_0___default().Compone
className: "material-icons" className: "material-icons"
}, "arrow_back")) : null, react__WEBPACK_IMPORTED_MODULE_0___default().createElement("div", { }, "arrow_back")) : null, react__WEBPACK_IMPORTED_MODULE_0___default().createElement("div", {
className: "avatar-box" className: "avatar-box"
}, react__WEBPACK_IMPORTED_MODULE_0___default().createElement(_widgets_letter_tile_jsx__WEBPACK_IMPORTED_MODULE_12__["default"], { }, react__WEBPACK_IMPORTED_MODULE_0___default().createElement(_widgets_letter_tile_jsx__WEBPACK_IMPORTED_MODULE_11__["default"], {
tinode: this.props.tinode, tinode: this.props.tinode,
avatar: avatar, avatar: avatar,
topic: this.state.topic, topic: this.state.topic,
@@ -6696,7 +6795,7 @@ class MessagesView extends (react__WEBPACK_IMPORTED_MODULE_0___default().Compone
badges: icon_badges badges: icon_badges
})), react__WEBPACK_IMPORTED_MODULE_0___default().createElement("div", { })), react__WEBPACK_IMPORTED_MODULE_0___default().createElement("div", {
id: "topic-last-seen" id: "topic-last-seen"
}, lastSeen)), groupTopic ? react__WEBPACK_IMPORTED_MODULE_0___default().createElement(_widgets_group_subs_jsx__WEBPACK_IMPORTED_MODULE_9__["default"], { }, lastSeen)), groupTopic ? react__WEBPACK_IMPORTED_MODULE_0___default().createElement(_widgets_group_subs_jsx__WEBPACK_IMPORTED_MODULE_8__["default"], {
tinode: this.props.tinode, tinode: this.props.tinode,
subscribers: this.state.onlineSubs subscribers: this.state.onlineSubs
}) : react__WEBPACK_IMPORTED_MODULE_0___default().createElement("div", { }) : react__WEBPACK_IMPORTED_MODULE_0___default().createElement("div", {
@@ -6706,19 +6805,19 @@ class MessagesView extends (react__WEBPACK_IMPORTED_MODULE_0___default().Compone
onClick: this.handleContextClick onClick: this.handleContextClick
}, react__WEBPACK_IMPORTED_MODULE_0___default().createElement("i", { }, react__WEBPACK_IMPORTED_MODULE_0___default().createElement("i", {
className: "material-icons" className: "material-icons"
}, "more_vert")))), this.props.displayMobile ? react__WEBPACK_IMPORTED_MODULE_0___default().createElement(_widgets_error_panel_jsx__WEBPACK_IMPORTED_MODULE_8__["default"], { }, "more_vert")))), this.props.displayMobile ? react__WEBPACK_IMPORTED_MODULE_0___default().createElement(_widgets_error_panel_jsx__WEBPACK_IMPORTED_MODULE_7__["default"], {
level: this.props.errorLevel, level: this.props.errorLevel,
text: this.props.errorText, text: this.props.errorText,
onClearError: this.props.onError onClearError: this.props.onError
}) : null, react__WEBPACK_IMPORTED_MODULE_0___default().createElement(_widgets_load_spinner_jsx__WEBPACK_IMPORTED_MODULE_13__["default"], { }) : null, react__WEBPACK_IMPORTED_MODULE_0___default().createElement(_widgets_load_spinner_jsx__WEBPACK_IMPORTED_MODULE_12__["default"], {
show: this.state.fetchingMessages show: this.state.fetchingMessages
}), !this.state.unconfirmed && !this.props.forwardMessage && this.state.isWriter && !this.state.peerMessagingDisabled ? react__WEBPACK_IMPORTED_MODULE_0___default().createElement(_widgets_drag_and_drop_jsx__WEBPACK_IMPORTED_MODULE_7__["default"], { }), messagesComponent, this.state.dragging && this.isDragEnabled() ? react__WEBPACK_IMPORTED_MODULE_0___default().createElement("div", {
actionPrompt: this.props.intl.formatMessage(messages.drag_file), className: "drag-n-drop"
onDrop: this.handleFileDrop }, formatMessage(messages.drag_file)) : null);
}, messagesComponent) : messagesComponent);
} }
component = react__WEBPACK_IMPORTED_MODULE_0___default().createElement("div", { component = react__WEBPACK_IMPORTED_MODULE_0___default().createElement("div", {
id: "topic-view" id: "topic-view",
ref: this.mountDnDEvents
}, component2); }, component2);
} }
return component; return component;
@@ -12675,95 +12774,6 @@ class DocPreview extends (react__WEBPACK_IMPORTED_MODULE_0___default().PureCompo
/***/ }), /***/ }),
/***/ "./src/widgets/drag-and-drop.jsx":
/*!***************************************!*\
!*** ./src/widgets/drag-and-drop.jsx ***!
\***************************************/
/***/ ((__unused_webpack_module, __webpack_exports__, __webpack_require__) => {
__webpack_require__.r(__webpack_exports__);
/* harmony export */ __webpack_require__.d(__webpack_exports__, {
/* harmony export */ "default": () => (/* binding */ DragAndDrop)
/* harmony export */ });
/* harmony import */ var react__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! react */ "react");
/* harmony import */ var react__WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(react__WEBPACK_IMPORTED_MODULE_0__);
class DragAndDrop extends (react__WEBPACK_IMPORTED_MODULE_0___default().PureComponent) {
constructor(props) {
super(props);
this.state = {
dragging: false
};
this.dropRef = react__WEBPACK_IMPORTED_MODULE_0___default().createRef();
this.dragCounter = 0;
this.handleDrag = this.handleDrag.bind(this);
this.handleDragIn = this.handleDragIn.bind(this);
this.handleDragOut = this.handleDragOut.bind(this);
this.handleDrop = this.handleDrop.bind(this);
}
componentDidMount() {
const div = this.dropRef.current;
div.addEventListener('dragenter', this.handleDragIn);
div.addEventListener('dragleave', this.handleDragOut);
div.addEventListener('dragover', this.handleDrag);
div.addEventListener('drop', this.handleDrop);
}
componentWillUnmount() {
const div = this.dropRef.current;
div.removeEventListener('dragenter', this.handleDragIn);
div.removeEventListener('dragleave', this.handleDragOut);
div.removeEventListener('dragover', this.handleDrag);
div.removeEventListener('drop', this.handleDrop);
}
handleDrag(e) {
e.preventDefault();
e.stopPropagation();
}
handleDragIn(e) {
e.preventDefault();
e.stopPropagation();
this.dragCounter++;
if (e.dataTransfer.items && e.dataTransfer.items.length > 0) {
this.setState({
dragging: true
});
}
}
handleDragOut(e) {
e.preventDefault();
e.stopPropagation();
this.dragCounter--;
if (this.dragCounter <= 0) {
this.setState({
dragging: false
});
}
}
handleDrop(e) {
e.preventDefault();
e.stopPropagation();
this.setState({
dragging: false
});
if (e.dataTransfer.files && e.dataTransfer.files.length > 0) {
this.props.onDrop(e.dataTransfer.files);
e.dataTransfer.clearData();
this.dragCounter = 0;
}
}
render() {
return react__WEBPACK_IMPORTED_MODULE_0___default().createElement("div", {
className: "drag-and-drop",
ref: this.dropRef
}, this.state.dragging ? react__WEBPACK_IMPORTED_MODULE_0___default().createElement("div", {
className: "banner"
}, this.props.actionPrompt) : null, this.props.children);
}
}
;
/***/ }),
/***/ "./src/widgets/error-panel.jsx": /***/ "./src/widgets/error-panel.jsx":
/*!*************************************!*\ /*!*************************************!*\
!*** ./src/widgets/error-panel.jsx ***! !*** ./src/widgets/error-panel.jsx ***!
+1 -1
View File
File diff suppressed because one or more lines are too long
+1 -1
View File
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
+2 -2
View File
File diff suppressed because one or more lines are too long
+1 -1
View File
File diff suppressed because one or more lines are too long