add config option to send on Enter vs send on CTRL-Enter

This commit is contained in:
or-else
2025-08-10 15:25:05 +03:00
parent 0b05d480c7
commit 79a1bc98b2
71 changed files with 891 additions and 232 deletions
+1
View File
@@ -1,3 +1,4 @@
umd/* binary
package-lock.json binary
*.min.css binary
src/i18n.min/* binary
+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
+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
+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
+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
+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
+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
+1 -1
View File
File diff suppressed because one or more lines are too long
+44 -9
View File
@@ -1767,13 +1767,6 @@
"missing": false,
"obsolete": false
},
"sidepanel_title_appearance": {
"translation": "المظهر",
"defaultMessage": "Appearance",
"description": "Sidepanel title for AccAppearanceView.",
"missing": false,
"obsolete": false
},
"label_text_size": {
"translation": "‏حجم النص:",
"defaultMessage": "Text size:",
@@ -1782,10 +1775,52 @@
"obsolete": false
},
"incognito_mode_description": {
"translation": "",
"translation": "إخفاء حالة اتصالك ومؤشرات الكتابة.",
"defaultMessage": "Hide your online status and typing indicators.",
"description": "Description for incognito mode toggle",
"missing": true,
"missing": false,
"obsolete": false
},
"send_command": {
"translation": "إرسال بـ {key}",
"defaultMessage": "Send on {key}",
"description": "Config option to send message on hitting CTRL(or Cmd)-Enter",
"missing": false,
"obsolete": false
},
"send_command_explained": {
"translation": "اضغط Enter لسطر جديد",
"defaultMessage": "Press Enter for new line",
"description": "Explanation how to enter newline when [Send on CTRL-Enter] is enabled",
"missing": false,
"obsolete": false
},
"send_plain": {
"translation": "إرسال بـ Enter",
"defaultMessage": "Send on Enter",
"description": "Config option to send message on hitting Enter",
"missing": false,
"obsolete": false
},
"send_plain_explained": {
"translation": "اضغط Shift + Enter لسطر جديد",
"defaultMessage": "Press Shift + Enter for new line",
"description": "Explanation how to enter newline when [Send on Enter] is enabled",
"missing": false,
"obsolete": false
},
"sidepanel_title_acc_general": {
"translation": "عام",
"defaultMessage": "General",
"description": "Sidepanel title for AccGeneralView.",
"missing": false,
"obsolete": false
},
"label_keyboard": {
"translation": "لوحة المفاتيح:",
"defaultMessage": "Keyboard:",
"description": "Label for send on enter settings",
"missing": false,
"obsolete": false
}
}
+44 -9
View File
@@ -1767,13 +1767,6 @@
"missing": false,
"obsolete": false
},
"sidepanel_title_appearance": {
"translation": "Erscheinungsbild",
"defaultMessage": "Appearance",
"description": "Sidepanel title for AccAppearanceView.",
"missing": false,
"obsolete": false
},
"label_text_size": {
"translation": "Textgröße:",
"defaultMessage": "Text size:",
@@ -1782,10 +1775,52 @@
"obsolete": false
},
"incognito_mode_description": {
"translation": "",
"translation": "Online-Status und Tipp-Indikatoren verbergen.",
"defaultMessage": "Hide your online status and typing indicators.",
"description": "Description for incognito mode toggle",
"missing": true,
"missing": false,
"obsolete": false
},
"send_command": {
"translation": "Senden mit {key}",
"defaultMessage": "Send on {key}",
"description": "Config option to send message on hitting CTRL(or Cmd)-Enter",
"missing": false,
"obsolete": false
},
"send_command_explained": {
"translation": "Drücken Sie Enter für eine neue Zeile",
"defaultMessage": "Press Enter for new line",
"description": "Explanation how to enter newline when [Send on CTRL-Enter] is enabled",
"missing": false,
"obsolete": false
},
"send_plain": {
"translation": "Senden mit Enter",
"defaultMessage": "Send on Enter",
"description": "Config option to send message on hitting Enter",
"missing": false,
"obsolete": false
},
"send_plain_explained": {
"translation": "Drücken Sie Shift + Enter für eine neue Zeile",
"defaultMessage": "Press Shift + Enter for new line",
"description": "Explanation how to enter newline when [Send on Enter] is enabled",
"missing": false,
"obsolete": false
},
"sidepanel_title_acc_general": {
"translation": "Allgemein",
"defaultMessage": "General",
"description": "Sidepanel title for AccGeneralView.",
"missing": false,
"obsolete": false
},
"label_keyboard": {
"translation": "Tastatur:",
"defaultMessage": "Keyboard:",
"description": "Label for send on enter settings",
"missing": false,
"obsolete": false
}
}
+42 -7
View File
@@ -1767,13 +1767,6 @@
"missing": false,
"obsolete": false
},
"sidepanel_title_appearance": {
"translation": "Appearance",
"defaultMessage": "Appearance",
"description": "Sidepanel title for AccAppearanceView.",
"missing": false,
"obsolete": false
},
"label_text_size": {
"translation": "Text size:",
"defaultMessage": "Text size:",
@@ -1787,5 +1780,47 @@
"description": "Description for incognito mode toggle",
"missing": false,
"obsolete": false
},
"send_command": {
"translation": "Send on {key}",
"defaultMessage": "Send on {key}",
"description": "Config option to send message on hitting CTRL(or Cmd)-Enter",
"missing": false,
"obsolete": false
},
"send_command_explained": {
"translation": "Press Enter for new line",
"defaultMessage": "Press Enter for new line",
"description": "Explanation how to enter newline when [Send on CTRL-Enter] is enabled",
"missing": false,
"obsolete": false
},
"send_plain": {
"translation": "Send on Enter",
"defaultMessage": "Send on Enter",
"description": "Config option to send message on hitting Enter",
"missing": false,
"obsolete": false
},
"send_plain_explained": {
"translation": "Press Shift + Enter for new line",
"defaultMessage": "Press Shift + Enter for new line",
"description": "Explanation how to enter newline when [Send on Enter] is enabled",
"missing": false,
"obsolete": false
},
"sidepanel_title_acc_general": {
"translation": "General",
"defaultMessage": "General",
"description": "Sidepanel title for AccGeneralView.",
"missing": false,
"obsolete": false
},
"label_keyboard": {
"translation": "Keyboard:",
"defaultMessage": "Keyboard:",
"description": "Label for send on enter settings",
"missing": false,
"obsolete": false
}
}
+44 -9
View File
@@ -1767,13 +1767,6 @@
"missing": false,
"obsolete": false
},
"sidepanel_title_appearance": {
"translation": "Apariencia",
"defaultMessage": "Appearance",
"description": "Sidepanel title for AccAppearanceView.",
"missing": false,
"obsolete": false
},
"label_text_size": {
"translation": "Tamaño del texto:",
"defaultMessage": "Text size:",
@@ -1782,10 +1775,52 @@
"obsolete": false
},
"incognito_mode_description": {
"translation": "",
"translation": "Ocultar tu estado en línea e indicadores de escritura.",
"defaultMessage": "Hide your online status and typing indicators.",
"description": "Description for incognito mode toggle",
"missing": true,
"missing": false,
"obsolete": false
},
"send_command": {
"translation": "Enviar con {key}",
"defaultMessage": "Send on {key}",
"description": "Config option to send message on hitting CTRL(or Cmd)-Enter",
"missing": false,
"obsolete": false
},
"send_command_explained": {
"translation": "Presiona Enter para nueva línea",
"defaultMessage": "Press Enter for new line",
"description": "Explanation how to enter newline when [Send on CTRL-Enter] is enabled",
"missing": false,
"obsolete": false
},
"send_plain": {
"translation": "Enviar con Enter",
"defaultMessage": "Send on Enter",
"description": "Config option to send message on hitting Enter",
"missing": false,
"obsolete": false
},
"send_plain_explained": {
"translation": "Presiona Shift + Enter para nueva línea",
"defaultMessage": "Press Shift + Enter for new line",
"description": "Explanation how to enter newline when [Send on Enter] is enabled",
"missing": false,
"obsolete": false
},
"sidepanel_title_acc_general": {
"translation": "General",
"defaultMessage": "General",
"description": "Sidepanel title for AccGeneralView.",
"missing": false,
"obsolete": false
},
"label_keyboard": {
"translation": "Teclado:",
"defaultMessage": "Keyboard:",
"description": "Label for send on enter settings",
"missing": false,
"obsolete": false
}
}
+24 -4
View File
@@ -438,6 +438,10 @@
"defaultMessage": "Incognito mode:",
"description": "Label for incognito mode toggle"
},
"label_keyboard": {
"defaultMessage": "Keyboard:",
"description": "Label for send on enter settings"
},
"label_message_sound": {
"defaultMessage": "Message sound:",
"description": "Label for message sounds toggle"
@@ -880,6 +884,26 @@
"defaultMessage": "Saved messages",
"description": "Name of self topic for UI"
},
"send_command": {
"defaultMessage": "Send on {key}",
"description": "Config option to send message on hitting CTRL(or Cmd)-Enter"
},
"send_command_explained": {
"defaultMessage": "Press Enter for new line",
"description": "Explanation how to enter newline when [Send on CTRL-Enter] is enabled"
},
"send_plain": {
"defaultMessage": "Send on Enter",
"description": "Config option to send message on hitting Enter"
},
"send_plain_explained": {
"defaultMessage": "Press Shift + Enter for new line",
"description": "Explanation how to enter newline when [Send on Enter] is enabled"
},
"sidepanel_title_acc_general": {
"defaultMessage": "General",
"description": "Sidepanel title for AccGeneralView."
},
"sidepanel_title_acc_notifications": {
"defaultMessage": "Notifications",
"description": "Sidepanel title for AccNotificationsView."
@@ -892,10 +916,6 @@
"defaultMessage": "Account Settings",
"description": "Sidepanel title for AccountSettingsView."
},
"sidepanel_title_appearance": {
"defaultMessage": "Appearance",
"description": "Sidepanel title for AccAppearanceView."
},
"sidepanel_title_archive": {
"defaultMessage": "Archived Chats",
"description": "Sidepanel title for ContactsView-Archive."
+44 -9
View File
@@ -1767,13 +1767,6 @@
"missing": false,
"obsolete": false
},
"sidepanel_title_appearance": {
"translation": "Apparence",
"defaultMessage": "Appearance",
"description": "Sidepanel title for AccAppearanceView.",
"missing": false,
"obsolete": false
},
"label_text_size": {
"translation": "Taille du texte :",
"defaultMessage": "Text size:",
@@ -1782,10 +1775,52 @@
"obsolete": false
},
"incognito_mode_description": {
"translation": "",
"translation": "Masquer votre statut en ligne et les indicateurs de frappe.",
"defaultMessage": "Hide your online status and typing indicators.",
"description": "Description for incognito mode toggle",
"missing": true,
"missing": false,
"obsolete": false
},
"send_command": {
"translation": "Envoyer avec {key}",
"defaultMessage": "Send on {key}",
"description": "Config option to send message on hitting CTRL(or Cmd)-Enter",
"missing": false,
"obsolete": false
},
"send_command_explained": {
"translation": "Appuyez sur Entrée pour une nouvelle ligne",
"defaultMessage": "Press Enter for new line",
"description": "Explanation how to enter newline when [Send on CTRL-Enter] is enabled",
"missing": false,
"obsolete": false
},
"send_plain": {
"translation": "Envoyer avec Entrée",
"defaultMessage": "Send on Enter",
"description": "Config option to send message on hitting Enter",
"missing": false,
"obsolete": false
},
"send_plain_explained": {
"translation": "Appuyez sur Shift + Entrée pour une nouvelle ligne",
"defaultMessage": "Press Shift + Enter for new line",
"description": "Explanation how to enter newline when [Send on Enter] is enabled",
"missing": false,
"obsolete": false
},
"sidepanel_title_acc_general": {
"translation": "Général",
"defaultMessage": "General",
"description": "Sidepanel title for AccGeneralView.",
"missing": false,
"obsolete": false
},
"label_keyboard": {
"translation": "Clavier :",
"defaultMessage": "Keyboard:",
"description": "Label for send on enter settings",
"missing": false,
"obsolete": false
}
}
+59 -24
View File
@@ -1739,53 +1739,88 @@
"missing": false,
"obsolete": false
},
"incognito_mode_description": {
"translation": "Nascondi il tuo stato online e gli indicatori di digitazione.",
"defaultMessage": "Hide your online status and typing indicators.",
"description": "Description for incognito mode toggle",
"missing": false,
"obsolete": false
},
"send_command": {
"translation": "Invia con {key}",
"defaultMessage": "Send on {key}",
"description": "Config option to send message on hitting CTRL(or Cmd)-Enter",
"missing": false,
"obsolete": false
},
"send_command_explained": {
"translation": "Premi Invio per una nuova riga",
"defaultMessage": "Press Enter for new line",
"description": "Explanation how to enter newline when [Send on CTRL-Enter] is enabled",
"missing": false,
"obsolete": false
},
"send_plain": {
"translation": "Invia con Invio",
"defaultMessage": "Send on Enter",
"description": "Config option to send message on hitting Enter",
"missing": false,
"obsolete": false
},
"send_plain_explained": {
"translation": "Premi Shift + Invio per una nuova riga",
"defaultMessage": "Press Shift + Enter for new line",
"description": "Explanation how to enter newline when [Send on Enter] is enabled",
"missing": false,
"obsolete": false
},
"sidepanel_title_acc_general": {
"translation": "Generale",
"defaultMessage": "General",
"description": "Sidepanel title for AccGeneralView.",
"missing": false,
"obsolete": false
},
"label_keyboard": {
"translation": "Tastiera:",
"defaultMessage": "Keyboard:",
"description": "Label for send on enter settings",
"missing": false,
"obsolete": false
},
"color_schema_dark": {
"translation": "",
"translation": "Scuro",
"defaultMessage": "Dark",
"description": "Name of the color schema",
"missing": true,
"missing": false,
"obsolete": false
},
"color_schema_light": {
"translation": "",
"translation": "Chiaro",
"defaultMessage": "Light",
"description": "Name of the color schema",
"missing": true,
"missing": false,
"obsolete": false
},
"color_schema_system": {
"translation": "",
"translation": "Predefinito del sistema",
"defaultMessage": "System default",
"description": "Name of the color schema",
"missing": true,
"obsolete": false
},
"incognito_mode_description": {
"translation": "",
"defaultMessage": "Hide your online status and typing indicators.",
"description": "Description for incognito mode toggle",
"missing": true,
"missing": false,
"obsolete": false
},
"label_color_schema": {
"translation": "",
"translation": "Tema:",
"defaultMessage": "Theme:",
"description": "Label for selecting color scheme (dark, light) in Settings",
"missing": true,
"missing": false,
"obsolete": false
},
"label_text_size": {
"translation": "",
"translation": "Dimensione testo:",
"defaultMessage": "Text size:",
"description": "Label adjusting text size",
"missing": true,
"obsolete": false
},
"sidepanel_title_appearance": {
"translation": "",
"defaultMessage": "Appearance",
"description": "Sidepanel title for AccAppearanceView.",
"missing": true,
"missing": false,
"obsolete": false
}
}
+44 -9
View File
@@ -1767,13 +1767,6 @@
"missing": false,
"obsolete": false
},
"sidepanel_title_appearance": {
"translation": "모양",
"defaultMessage": "Appearance",
"description": "Sidepanel title for AccAppearanceView.",
"missing": false,
"obsolete": false
},
"label_text_size": {
"translation": "텍스트 크기:",
"defaultMessage": "Text size:",
@@ -1782,10 +1775,52 @@
"obsolete": false
},
"incognito_mode_description": {
"translation": "",
"translation": "온라인 상태와 입력 표시기를 숨깁니다.",
"defaultMessage": "Hide your online status and typing indicators.",
"description": "Description for incognito mode toggle",
"missing": true,
"missing": false,
"obsolete": false
},
"send_command": {
"translation": "{key}로 전송",
"defaultMessage": "Send on {key}",
"description": "Config option to send message on hitting CTRL(or Cmd)-Enter",
"missing": false,
"obsolete": false
},
"send_command_explained": {
"translation": "새 줄로 이동하려면 Enter를 누르세요",
"defaultMessage": "Press Enter for new line",
"description": "Explanation how to enter newline when [Send on CTRL-Enter] is enabled",
"missing": false,
"obsolete": false
},
"send_plain": {
"translation": "Enter로 전송",
"defaultMessage": "Send on Enter",
"description": "Config option to send message on hitting Enter",
"missing": false,
"obsolete": false
},
"send_plain_explained": {
"translation": "새 줄로 이동하려면 Shift + Enter를 누르세요",
"defaultMessage": "Press Shift + Enter for new line",
"description": "Explanation how to enter newline when [Send on Enter] is enabled",
"missing": false,
"obsolete": false
},
"sidepanel_title_acc_general": {
"translation": "일반",
"defaultMessage": "General",
"description": "Sidepanel title for AccGeneralView.",
"missing": false,
"obsolete": false
},
"label_keyboard": {
"translation": "키보드:",
"defaultMessage": "Keyboard:",
"description": "Label for send on enter settings",
"missing": false,
"obsolete": false
}
}
+44 -9
View File
@@ -1767,13 +1767,6 @@
"missing": false,
"obsolete": false
},
"sidepanel_title_appearance": {
"translation": "Aspect",
"defaultMessage": "Appearance",
"description": "Sidepanel title for AccAppearanceView.",
"missing": false,
"obsolete": false
},
"label_text_size": {
"translation": "Dimensiune text:",
"defaultMessage": "Text size:",
@@ -1782,10 +1775,52 @@
"obsolete": false
},
"incognito_mode_description": {
"translation": "",
"translation": "Ascunde statusul tău online și indicatorii de tastare.",
"defaultMessage": "Hide your online status and typing indicators.",
"description": "Description for incognito mode toggle",
"missing": true,
"missing": false,
"obsolete": false
},
"send_command": {
"translation": "Trimite cu {key}",
"defaultMessage": "Send on {key}",
"description": "Config option to send message on hitting CTRL(or Cmd)-Enter",
"missing": false,
"obsolete": false
},
"send_command_explained": {
"translation": "Apasă Enter pentru linie nouă",
"defaultMessage": "Press Enter for new line",
"description": "Explanation how to enter newline when [Send on CTRL-Enter] is enabled",
"missing": false,
"obsolete": false
},
"send_plain": {
"translation": "Trimite cu Enter",
"defaultMessage": "Send on Enter",
"description": "Config option to send message on hitting Enter",
"missing": false,
"obsolete": false
},
"send_plain_explained": {
"translation": "Apasă Shift + Enter pentru linie nouă",
"defaultMessage": "Press Shift + Enter for new line",
"description": "Explanation how to enter newline when [Send on Enter] is enabled",
"missing": false,
"obsolete": false
},
"sidepanel_title_acc_general": {
"translation": "General",
"defaultMessage": "General",
"description": "Sidepanel title for AccGeneralView.",
"missing": false,
"obsolete": false
},
"label_keyboard": {
"translation": "Tastatură:",
"defaultMessage": "Keyboard:",
"description": "Label for send on enter settings",
"missing": false,
"obsolete": false
}
}
+44 -9
View File
@@ -1767,13 +1767,6 @@
"missing": false,
"obsolete": false
},
"sidepanel_title_appearance": {
"translation": "Оформление",
"defaultMessage": "Appearance",
"description": "Sidepanel title for AccAppearanceView.",
"missing": false,
"obsolete": false
},
"label_text_size": {
"translation": "Размер текста:",
"defaultMessage": "Text size:",
@@ -1782,10 +1775,52 @@
"obsolete": false
},
"incognito_mode_description": {
"translation": "",
"translation": "Скрывать онлайн статус и индикаторы набора текста.",
"defaultMessage": "Hide your online status and typing indicators.",
"description": "Description for incognito mode toggle",
"missing": true,
"missing": false,
"obsolete": false
},
"send_command": {
"translation": "Отправлять на {key}",
"defaultMessage": "Send on {key}",
"description": "Config option to send message on hitting CTRL(or Cmd)-Enter",
"missing": false,
"obsolete": false
},
"send_command_explained": {
"translation": "Нажмать Enter для новой строки",
"defaultMessage": "Press Enter for new line",
"description": "Explanation how to enter newline when [Send on CTRL-Enter] is enabled",
"missing": false,
"obsolete": false
},
"send_plain": {
"translation": "Отправлять на Enter",
"defaultMessage": "Send on Enter",
"description": "Config option to send message on hitting Enter",
"missing": false,
"obsolete": false
},
"send_plain_explained": {
"translation": "Нажимать Shift + Enter для новой строки",
"defaultMessage": "Press Shift + Enter for new line",
"description": "Explanation how to enter newline when [Send on Enter] is enabled",
"missing": false,
"obsolete": false
},
"sidepanel_title_acc_general": {
"translation": "Основные",
"defaultMessage": "General",
"description": "Sidepanel title for AccGeneralView.",
"missing": false,
"obsolete": false
},
"label_keyboard": {
"translation": "Клавиатура:",
"defaultMessage": "Keyboard:",
"description": "Label for send on enter settings",
"missing": false,
"obsolete": false
}
}
+44 -9
View File
@@ -1767,13 +1767,6 @@
"missing": false,
"obsolete": false
},
"sidepanel_title_appearance": {
"translation": "ลักษณะ",
"defaultMessage": "Appearance",
"description": "Sidepanel title for AccAppearanceView.",
"missing": false,
"obsolete": false
},
"label_text_size": {
"translation": "ขนาดตัวอักษร:",
"defaultMessage": "Text size:",
@@ -1782,10 +1775,52 @@
"obsolete": false
},
"incognito_mode_description": {
"translation": "",
"translation": "ซ่อนสถานะออนไลน์และตัวบ่งชี้การพิมพ์ของคุณ",
"defaultMessage": "Hide your online status and typing indicators.",
"description": "Description for incognito mode toggle",
"missing": true,
"missing": false,
"obsolete": false
},
"send_command": {
"translation": "ส่งด้วย {key}",
"defaultMessage": "Send on {key}",
"description": "Config option to send message on hitting CTRL(or Cmd)-Enter",
"missing": false,
"obsolete": false
},
"send_command_explained": {
"translation": "กด Enter เพื่อขึ้นบรรทัดใหม่",
"defaultMessage": "Press Enter for new line",
"description": "Explanation how to enter newline when [Send on CTRL-Enter] is enabled",
"missing": false,
"obsolete": false
},
"send_plain": {
"translation": "ส่งด้วย Enter",
"defaultMessage": "Send on Enter",
"description": "Config option to send message on hitting Enter",
"missing": false,
"obsolete": false
},
"send_plain_explained": {
"translation": "กด Shift + Enter เพื่อขึ้นบรรทัดใหม่",
"defaultMessage": "Press Shift + Enter for new line",
"description": "Explanation how to enter newline when [Send on Enter] is enabled",
"missing": false,
"obsolete": false
},
"sidepanel_title_acc_general": {
"translation": "ทั่วไป",
"defaultMessage": "General",
"description": "Sidepanel title for AccGeneralView.",
"missing": false,
"obsolete": false
},
"label_keyboard": {
"translation": "แป้นพิมพ์:",
"defaultMessage": "Keyboard:",
"description": "Label for send on enter settings",
"missing": false,
"obsolete": false
}
}
+44 -9
View File
@@ -1767,13 +1767,6 @@
"missing": false,
"obsolete": false
},
"sidepanel_title_appearance": {
"translation": "Вигляд",
"defaultMessage": "Appearance",
"description": "Sidepanel title for AccAppearanceView.",
"missing": false,
"obsolete": false
},
"label_text_size": {
"translation": "Розмір тексту:",
"defaultMessage": "Text size:",
@@ -1782,10 +1775,52 @@
"obsolete": false
},
"incognito_mode_description": {
"translation": "",
"translation": "Приховати ваш статус онлайн та індикатори набору тексту.",
"defaultMessage": "Hide your online status and typing indicators.",
"description": "Description for incognito mode toggle",
"missing": true,
"missing": false,
"obsolete": false
},
"send_command": {
"translation": "Надіслати на {key}",
"defaultMessage": "Send on {key}",
"description": "Config option to send message on hitting CTRL(or Cmd)-Enter",
"missing": false,
"obsolete": false
},
"send_command_explained": {
"translation": "Натисніть Enter для нового рядка",
"defaultMessage": "Press Enter for new line",
"description": "Explanation how to enter newline when [Send on CTRL-Enter] is enabled",
"missing": false,
"obsolete": false
},
"send_plain": {
"translation": "Надіслати на Enter",
"defaultMessage": "Send on Enter",
"description": "Config option to send message on hitting Enter",
"missing": false,
"obsolete": false
},
"send_plain_explained": {
"translation": "Натисніть Shift + Enter для нового рядка",
"defaultMessage": "Press Shift + Enter for new line",
"description": "Explanation how to enter newline when [Send on Enter] is enabled",
"missing": false,
"obsolete": false
},
"sidepanel_title_acc_general": {
"translation": "Загальні",
"defaultMessage": "General",
"description": "Sidepanel title for AccGeneralView.",
"missing": false,
"obsolete": false
},
"label_keyboard": {
"translation": "Клавіатура:",
"defaultMessage": "Keyboard:",
"description": "Label for send on enter settings",
"missing": false,
"obsolete": false
}
}
+44 -9
View File
@@ -1767,13 +1767,6 @@
"missing": false,
"obsolete": false
},
"sidepanel_title_appearance": {
"translation": "外觀",
"defaultMessage": "Appearance",
"description": "Sidepanel title for AccAppearanceView.",
"missing": false,
"obsolete": false
},
"label_text_size": {
"translation": "文字大小:",
"defaultMessage": "Text size:",
@@ -1782,10 +1775,52 @@
"obsolete": false
},
"incognito_mode_description": {
"translation": "",
"translation": "隱藏您的線上狀態和正在輸入指示器。",
"defaultMessage": "Hide your online status and typing indicators.",
"description": "Description for incognito mode toggle",
"missing": true,
"missing": false,
"obsolete": false
},
"send_command": {
"translation": "按 {key} 傳送",
"defaultMessage": "Send on {key}",
"description": "Config option to send message on hitting CTRL(or Cmd)-Enter",
"missing": false,
"obsolete": false
},
"send_command_explained": {
"translation": "按 Enter 換行",
"defaultMessage": "Press Enter for new line",
"description": "Explanation how to enter newline when [Send on CTRL-Enter] is enabled",
"missing": false,
"obsolete": false
},
"send_plain": {
"translation": "按 Enter 傳送",
"defaultMessage": "Send on Enter",
"description": "Config option to send message on hitting Enter",
"missing": false,
"obsolete": false
},
"send_plain_explained": {
"translation": "按 Shift + Enter 換行",
"defaultMessage": "Press Shift + Enter for new line",
"description": "Explanation how to enter newline when [Send on Enter] is enabled",
"missing": false,
"obsolete": false
},
"sidepanel_title_acc_general": {
"translation": "一般",
"defaultMessage": "General",
"description": "Sidepanel title for AccGeneralView.",
"missing": false,
"obsolete": false
},
"label_keyboard": {
"translation": "鍵盤:",
"defaultMessage": "Keyboard:",
"description": "Label for send on enter settings",
"missing": false,
"obsolete": false
}
}
+44 -9
View File
@@ -1767,13 +1767,6 @@
"missing": false,
"obsolete": false
},
"sidepanel_title_appearance": {
"translation": "外观",
"defaultMessage": "Appearance",
"description": "Sidepanel title for AccAppearanceView.",
"missing": false,
"obsolete": false
},
"label_text_size": {
"translation": "文字大小:",
"defaultMessage": "Text size:",
@@ -1782,10 +1775,52 @@
"obsolete": false
},
"incognito_mode_description": {
"translation": "",
"translation": "隐藏您的在线状态和正在输入指示器。",
"defaultMessage": "Hide your online status and typing indicators.",
"description": "Description for incognito mode toggle",
"missing": true,
"missing": false,
"obsolete": false
},
"send_command": {
"translation": "按 {key} 发送",
"defaultMessage": "Send on {key}",
"description": "Config option to send message on hitting CTRL(or Cmd)-Enter",
"missing": false,
"obsolete": false
},
"send_command_explained": {
"translation": "按 Enter 换行",
"defaultMessage": "Press Enter for new line",
"description": "Explanation how to enter newline when [Send on CTRL-Enter] is enabled",
"missing": false,
"obsolete": false
},
"send_plain": {
"translation": "按 Enter 发送",
"defaultMessage": "Send on Enter",
"description": "Config option to send message on hitting Enter",
"missing": false,
"obsolete": false
},
"send_plain_explained": {
"translation": "按 Shift + Enter 换行",
"defaultMessage": "Press Shift + Enter for new line",
"description": "Explanation how to enter newline when [Send on Enter] is enabled",
"missing": false,
"obsolete": false
},
"sidepanel_title_acc_general": {
"translation": "常规",
"defaultMessage": "General",
"description": "Sidepanel title for AccGeneralView.",
"missing": false,
"obsolete": false
},
"label_keyboard": {
"translation": "键盘:",
"defaultMessage": "Keyboard:",
"description": "Label for send on enter settings",
"missing": false,
"obsolete": false
}
}
@@ -2,17 +2,21 @@
import React from 'react';
import { FormattedMessage } from 'react-intl';
export default class AccAppearanceView extends React.PureComponent {
export default class AccGeneralView extends React.PureComponent {
constructor(props) {
super(props);
this.state = {
colorSchema: props.colorSchema || 'light dark',
textSize: (props.textSize * 10) || '100',
sendOnEnter: props.sendOnEnter || 'plain',
};
this.isMac = ((navigator.userAgentData && navigator.userAgentData.platform)
|| navigator.platform).toLowerCase().startsWith('mac');
this.handleColorSchemaSelected = this.handleColorSchemaSelected.bind(this);
this.handleTextSizeChanged = this.handleTextSizeChanged.bind(this);
this.handleSendOnEnterSelected = this.handleSendOnEnterSelected.bind(this);
}
handleColorSchemaSelected(e) {
@@ -27,6 +31,12 @@ export default class AccAppearanceView extends React.PureComponent {
this.props.onTextSizeChanged((e.currentTarget.value / 10) | 0);
}
handleSendOnEnterSelected(e) {
console.log('handleSendOnEnterSelected', e.currentTarget.value);
this.setState({sendOnEnter: e.currentTarget.value});
this.props.onSendOnEnterChanged(e.currentTarget.value);
}
render() {
return (
<div id="settings-form" className="scrollable-panel">
@@ -40,7 +50,7 @@ export default class AccAppearanceView extends React.PureComponent {
<ul className="quoted">
<li key="system">
<input type="radio" id="system" name="color-scheme-select" value="light dark"
checked={this.state.colorSchema === 'light dark'}
checked={this.state.colorSchema == 'light dark'}
onChange={this.handleColorSchemaSelected} />&nbsp;
<label htmlFor="system">
<FormattedMessage id="color_schema_system" defaultMessage="System default" description="Name of the color schema"/>&nbsp;
@@ -49,7 +59,7 @@ export default class AccAppearanceView extends React.PureComponent {
</li>
<li key="light">
<input type="radio" id="light" name="color-scheme-select" value="light"
checked={this.state.colorSchema === 'light'}
checked={this.state.colorSchema == 'light'}
onChange={this.handleColorSchemaSelected} />&nbsp;
<label htmlFor="light">
<FormattedMessage id="color_schema_light" defaultMessage="Light" description="Name of the color schema"/>&nbsp;
@@ -58,7 +68,7 @@ export default class AccAppearanceView extends React.PureComponent {
</li>
<li key="dark">
<input type="radio" id="dark" name="color-scheme-select" value="dark"
checked={this.state.colorSchema === 'dark'}
checked={this.state.colorSchema == 'dark'}
onChange={this.handleColorSchemaSelected} />&nbsp;
<label htmlFor="dark">
<FormattedMessage id="color_schema_dark" defaultMessage="Dark" description="Name of the color schema"/>&nbsp;
@@ -89,6 +99,48 @@ export default class AccAppearanceView extends React.PureComponent {
</datalist>
</div>
</div>
<div className="hr" />
<div className="panel-form-row">
<label className="small">
<FormattedMessage id="label_keyboard" defaultMessage="Keyboard:"
description="Label for send on enter settings" />
</label>
</div>
<div className="panel-form-row">
<ul className="quoted">
<li key="plain">
<input type="radio" id="plain" name="send-select" value="plain"
checked={this.state.sendOnEnter == 'plain'}
onChange={this.handleSendOnEnterSelected} />&nbsp;
<label htmlFor="send_plain">
<FormattedMessage id="send_plain" defaultMessage="Send on Enter"
description="Config option to send message on hitting Enter"/>&nbsp;
</label>
<div className="panel-form-row">
<span className="small gray">
<FormattedMessage id="send_plain_explained" defaultMessage="Press Shift + Enter for new line"
description="Explanation how to enter newline when [Send on Enter] is enabled" />
</span>
</div>
</li>
<li key="command">
<input type="radio" id="command" name="send-select" value="command"
checked={this.state.sendOnEnter == 'command'}
onChange={this.handleSendOnEnterSelected} />&nbsp;
<label htmlFor="send_command">
<FormattedMessage id="send_command" defaultMessage="Send on {key}"
values={{key: this.isMac ? '⌘ + Enter' : 'Ctrl + Enter'}}
description="Config option to send message on hitting CTRL(or Cmd)-Enter"/>&nbsp;
</label>
<div className="panel-form-row">
<span className="small gray">
<FormattedMessage id="send_command_explained" defaultMessage="Press Enter for new line"
description="Explanation how to enter newline when [Send on CTRL-Enter] is enabled" />
</span>
</div>
</li>
</ul>
</div>
</div>
);
}
+1 -1
View File
@@ -124,7 +124,7 @@ class AccSecurityView extends React.Component {
checked={this.props.incognitoMode} onChange={this.handleCheckboxClick} />
</div>
<div className="panel-form-row">
<span className="small">
<span className="small gray">
<FormattedMessage id="incognito_mode_description" defaultMessage="Hide your online status and typing indicators."
description="Description for incognito mode toggle" />
</span>
+3 -3
View File
@@ -148,9 +148,9 @@ export default class AccountSettingsView extends React.Component {
</div>
<div className="hr" />
<div className="panel-form-column">
<a href="#" className="flat-button" onClick={e => {e.preventDefault(); this.props.onNavigate('appearance');}}>
<i className="material-icons">tune</i>&nbsp;<FormattedMessage id="sidepanel_title_appearance"
defaultMessage="Appearance" description="Sidepanel title for AccAppearanceView." />
<a href="#" className="flat-button" onClick={e => {e.preventDefault(); this.props.onNavigate('acc_general');}}>
<i className="material-icons">tune</i>&nbsp;<FormattedMessage id="sidepanel_title_acc_general"
defaultMessage="General" description="Sidepanel title for AccGeneralView." />
</a>
<a href="#" className="flat-button" onClick={e => {e.preventDefault(); this.props.onNavigate('notif');}}>
<i className="material-icons">notifications</i>&nbsp;<FormattedMessage id="sidepanel_title_acc_notifications"
+1
View File
@@ -1712,6 +1712,7 @@ class MessagesView extends React.Component {
disabled={!this.state.isWriter || this.state.deleted}
reply={this.state.reply}
initMessage={this.state.contentToEdit}
sendOnEnter={this.props.sendOnEnter}
onKeyPress={this.sendKeyPress}
onRecordingProgress={this.sendKeyPress}
onSendMessage={this.sendMessage}
+10 -8
View File
@@ -9,7 +9,7 @@ import TopicCommonView from './topic-common-view.jsx';
const AccountSettingsView = React.lazy(_ => import('./account-settings-view.jsx'));
import ContactsView from './contacts-view.jsx';
const CreateAccountView = React.lazy(_ => import('./create-account-view.jsx'));
import AccAppearanceView from './acc-appearance-view.jsx';
import AccGeneralView from './acc-general-view.jsx';
import AccNotificationsView from './acc-notifications-view.jsx';
const AccSecurityView = React.lazy(_ => import('./acc-security-view.jsx'));
import AccSupportView from './acc-support-view.jsx';
@@ -61,10 +61,10 @@ const messages = defineMessages({
description: 'Sidepanel title for AccNotificationsView.',
defaultMessage: 'Notifications'
},
appearance: {
id: 'sidepanel_title_appearance',
description: 'Sidepanel title for AccAppearanceView.',
defaultMessage: 'Appearance'
acc_general: {
id: 'sidepanel_title_acc_general',
description: 'Sidepanel title for AccGeneralView.',
defaultMessage: 'General'
},
support: {
id: 'sidepanel_title_acc_support',
@@ -206,12 +206,14 @@ class SidepanelView extends React.PureComponent {
onUpdateTagsRequest={this.props.onUpdateAccountTags}
onError={this.props.onError} /> :
view === 'appearance' ?
<AccAppearanceView
view === 'acc_general' ?
<AccGeneralView
colorSchema={this.props.colorSchema}
textSize={this.props.textSize}
sendOnEnter={this.props.sendOnEnter}
onChangeColorSchema={this.props.onChangeColorSchema}
onTextSizeChanged={this.props.onTextSizeChanged} /> :
onTextSizeChanged={this.props.onTextSizeChanged}
onSendOnEnterChanged={this.props.onSendOnEnterChanged} /> :
view === 'notif' ?
<AccNotificationsView
+12 -3
View File
@@ -136,6 +136,7 @@ class TinodeWeb extends React.Component {
this.handleToggleIncognitoMode = this.handleToggleIncognitoMode.bind(this);
this.handleChangeColorSchema = this.handleChangeColorSchema.bind(this);
this.handleChangeTextSize = this.handleChangeTextSize.bind(this);
this.handleSendOnEnter = this.handleSendOnEnter.bind(this);
this.handleSettings = this.handleSettings.bind(this);
this.handleGlobalSettings = this.handleGlobalSettings.bind(this);
this.handleShowArchive = this.handleShowArchive.bind(this);
@@ -217,6 +218,7 @@ class TinodeWeb extends React.Component {
incognitoMode: false,
colorSchema: settings.colorSchema || DEFAULT_COLOR_SCHEME, // default: system default
textSize: settings.textSize || DEFAULT_TEXT_SIZE, // default size: 10pt
sendOnEnter: settings.sendOnEnter || 'plain', // default: 'plain' (just Enter)
// Persistent request to enable alerts.
desktopAlerts: persist && !!settings.desktopAlerts,
// Enable / disable checkbox.
@@ -524,7 +526,7 @@ class TinodeWeb extends React.Component {
if (hash.path && hash.path.length > 0) {
// Left-side panel selector.
if (['register','settings','edit','notif','appearance','security','support','general','crop',
if (['register','settings','edit','notif','acc_general','security','support','general','crop',
'cred','reset','newtpk','archive','blocked','contacts',''].includes(hash.path[0])) {
newState.sidePanelSelected = hash.path[0];
} else {
@@ -1223,6 +1225,11 @@ class TinodeWeb extends React.Component {
document.documentElement.style.setProperty('--message-text-size', `${size}pt`);
}
handleSendOnEnter(option) {
this.setState({sendOnEnter: option});
LocalStorageUtil.updateObject('settings', {sendOnEnter: option});
}
handleUpdateAccountTagsRequest(_, tags) {
this.tinode.getMeTopic().setMeta({tags: tags})
.catch(err => this.handleError(err.message, 'err'));
@@ -1335,7 +1342,7 @@ class TinodeWeb extends React.Component {
handleSidepanelCancel() {
const parsed = HashNavigation.parseUrlHash(window.location.hash);
let path = '';
if (['security','support','general','notif','appearance'].includes(parsed.path[0])) {
if (['security','support','general','notif','acc_general'].includes(parsed.path[0])) {
path = 'edit';
} else if ('crop' == parsed.path[0]) {
path = 'general';
@@ -2084,6 +2091,7 @@ class TinodeWeb extends React.Component {
reqCredMethod={this.state.reqCredMethod}
textSize={this.state.textSize}
colorSchema={this.state.colorSchema}
sendOnEnter={this.state.sendOnEnter}
onGlobalSettings={this.handleGlobalSettings}
onSignUp={this.handleNewAccount}
@@ -2100,6 +2108,7 @@ class TinodeWeb extends React.Component {
onToggleIncognitoMode={this.handleToggleIncognitoMode}
onChangeColorSchema={this.handleChangeColorSchema}
onTextSizeChanged={this.handleChangeTextSize}
onSendOnEnterChanged={this.handleSendOnEnter}
onCredAdd={this.handleCredAdd}
onCredDelete={this.handleCredDelete}
onCredConfirm={this.handleCredConfirm}
@@ -2142,7 +2151,7 @@ class TinodeWeb extends React.Component {
serverAddress={this.state.serverAddress}
applicationVisible={this.state.applicationVisible}
colorSchema={this.state.colorSchema}
sendOnEnter={this.state.sendOnEnter}
forwardMessage={this.state.forwardMessage}
onCancelForwardMessage={this.handleHideForwardDialog}
+15 -6
View File
@@ -200,14 +200,23 @@ class SendMessage extends React.PureComponent {
return;
}
// Remove this if you don't want Enter to trigger send
// Enter pressed: either send, or enter a new line.
if (e.key === 'Enter') {
// Have Shift-Enter insert a line break instead
if (!e.shiftKey) {
e.preventDefault();
e.stopPropagation();
if (this.props.sendOnEnter == 'plain') {
// Have Shift-Enter insert a line break instead
if (!e.shiftKey) {
e.preventDefault();
e.stopPropagation();
this.handleSend(e);
this.handleSend(e);
}
} else {
if (e.ctrlKey || e.metaKey) {
e.preventDefault();
e.stopPropagation();
this.handleSend(e);
}
}
}
}
+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
+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
+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
+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
+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
+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
+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
+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
+133 -23
View File
@@ -8665,15 +8665,15 @@ const PACKAGE_VERSION = "0.25.0";
/***/ }),
/***/ "./src/views/acc-appearance-view.jsx":
/*!*******************************************!*\
!*** ./src/views/acc-appearance-view.jsx ***!
\*******************************************/
/***/ "./src/views/acc-general-view.jsx":
/*!****************************************!*\
!*** ./src/views/acc-general-view.jsx ***!
\****************************************/
/***/ (function(__unused_webpack_module, __webpack_exports__, __webpack_require__) {
__webpack_require__.r(__webpack_exports__);
/* harmony export */ __webpack_require__.d(__webpack_exports__, {
/* harmony export */ "default": function() { return /* binding */ AccAppearanceView; }
/* harmony export */ "default": function() { return /* binding */ AccGeneralView; }
/* 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__);
@@ -8681,15 +8681,18 @@ __webpack_require__.r(__webpack_exports__);
/* harmony import */ var react_intl__WEBPACK_IMPORTED_MODULE_1___default = /*#__PURE__*/__webpack_require__.n(react_intl__WEBPACK_IMPORTED_MODULE_1__);
class AccAppearanceView extends (react__WEBPACK_IMPORTED_MODULE_0___default().PureComponent) {
class AccGeneralView extends (react__WEBPACK_IMPORTED_MODULE_0___default().PureComponent) {
constructor(props) {
super(props);
this.state = {
colorSchema: props.colorSchema || 'light dark',
textSize: props.textSize * 10 || '100'
textSize: props.textSize * 10 || '100',
sendOnEnter: props.sendOnEnter || 'plain'
};
this.isMac = (navigator.userAgentData && navigator.userAgentData.platform || navigator.platform).toLowerCase().startsWith('mac');
this.handleColorSchemaSelected = this.handleColorSchemaSelected.bind(this);
this.handleTextSizeChanged = this.handleTextSizeChanged.bind(this);
this.handleSendOnEnterSelected = this.handleSendOnEnterSelected.bind(this);
}
handleColorSchemaSelected(e) {
this.setState({
@@ -8703,6 +8706,13 @@ class AccAppearanceView extends (react__WEBPACK_IMPORTED_MODULE_0___default().Pu
});
this.props.onTextSizeChanged(e.currentTarget.value / 10 | 0);
}
handleSendOnEnterSelected(e) {
console.log('handleSendOnEnterSelected', e.currentTarget.value);
this.setState({
sendOnEnter: e.currentTarget.value
});
this.props.onSendOnEnterChanged(e.currentTarget.value);
}
render() {
return react__WEBPACK_IMPORTED_MODULE_0___default().createElement("div", {
id: "settings-form",
@@ -8728,7 +8738,7 @@ class AccAppearanceView extends (react__WEBPACK_IMPORTED_MODULE_0___default().Pu
id: "system",
name: "color-scheme-select",
value: "light dark",
checked: this.state.colorSchema === 'light dark',
checked: this.state.colorSchema == 'light dark',
onChange: this.handleColorSchemaSelected
}), "\xA0", react__WEBPACK_IMPORTED_MODULE_0___default().createElement("label", {
htmlFor: "system"
@@ -8752,7 +8762,7 @@ class AccAppearanceView extends (react__WEBPACK_IMPORTED_MODULE_0___default().Pu
id: "light",
name: "color-scheme-select",
value: "light",
checked: this.state.colorSchema === 'light',
checked: this.state.colorSchema == 'light',
onChange: this.handleColorSchemaSelected
}), "\xA0", react__WEBPACK_IMPORTED_MODULE_0___default().createElement("label", {
htmlFor: "light"
@@ -8771,7 +8781,7 @@ class AccAppearanceView extends (react__WEBPACK_IMPORTED_MODULE_0___default().Pu
id: "dark",
name: "color-scheme-select",
value: "dark",
checked: this.state.colorSchema === 'dark',
checked: this.state.colorSchema == 'dark',
onChange: this.handleColorSchemaSelected
}), "\xA0", react__WEBPACK_IMPORTED_MODULE_0___default().createElement("label", {
htmlFor: "dark"
@@ -8828,7 +8838,83 @@ class AccAppearanceView extends (react__WEBPACK_IMPORTED_MODULE_0___default().Pu
}), react__WEBPACK_IMPORTED_MODULE_0___default().createElement("option", {
value: "120",
label: "120%"
})))));
})))), react__WEBPACK_IMPORTED_MODULE_0___default().createElement("div", {
className: "hr"
}), react__WEBPACK_IMPORTED_MODULE_0___default().createElement("div", {
className: "panel-form-row"
}, react__WEBPACK_IMPORTED_MODULE_0___default().createElement("label", {
className: "small"
}, react__WEBPACK_IMPORTED_MODULE_0___default().createElement(react_intl__WEBPACK_IMPORTED_MODULE_1__.FormattedMessage, {
id: "label_keyboard",
defaultMessage: [{
"type": 0,
"value": "Keyboard:"
}]
}))), react__WEBPACK_IMPORTED_MODULE_0___default().createElement("div", {
className: "panel-form-row"
}, react__WEBPACK_IMPORTED_MODULE_0___default().createElement("ul", {
className: "quoted"
}, react__WEBPACK_IMPORTED_MODULE_0___default().createElement("li", {
key: "plain"
}, react__WEBPACK_IMPORTED_MODULE_0___default().createElement("input", {
type: "radio",
id: "plain",
name: "send-select",
value: "plain",
checked: this.state.sendOnEnter == 'plain',
onChange: this.handleSendOnEnterSelected
}), "\xA0", react__WEBPACK_IMPORTED_MODULE_0___default().createElement("label", {
htmlFor: "send_plain"
}, react__WEBPACK_IMPORTED_MODULE_0___default().createElement(react_intl__WEBPACK_IMPORTED_MODULE_1__.FormattedMessage, {
id: "send_plain",
defaultMessage: [{
"type": 0,
"value": "Send on Enter"
}]
}), "\xA0"), react__WEBPACK_IMPORTED_MODULE_0___default().createElement("div", {
className: "panel-form-row"
}, react__WEBPACK_IMPORTED_MODULE_0___default().createElement("span", {
className: "small gray"
}, react__WEBPACK_IMPORTED_MODULE_0___default().createElement(react_intl__WEBPACK_IMPORTED_MODULE_1__.FormattedMessage, {
id: "send_plain_explained",
defaultMessage: [{
"type": 0,
"value": "Press Shift + Enter for new line"
}]
})))), react__WEBPACK_IMPORTED_MODULE_0___default().createElement("li", {
key: "command"
}, react__WEBPACK_IMPORTED_MODULE_0___default().createElement("input", {
type: "radio",
id: "command",
name: "send-select",
value: "command",
checked: this.state.sendOnEnter == 'command',
onChange: this.handleSendOnEnterSelected
}), "\xA0", react__WEBPACK_IMPORTED_MODULE_0___default().createElement("label", {
htmlFor: "send_command"
}, react__WEBPACK_IMPORTED_MODULE_0___default().createElement(react_intl__WEBPACK_IMPORTED_MODULE_1__.FormattedMessage, {
id: "send_command",
defaultMessage: [{
"type": 0,
"value": "Send on "
}, {
"type": 1,
"value": "key"
}],
values: {
key: this.isMac ? '⌘ + Enter' : 'Ctrl + Enter'
}
}), "\xA0"), react__WEBPACK_IMPORTED_MODULE_0___default().createElement("div", {
className: "panel-form-row"
}, react__WEBPACK_IMPORTED_MODULE_0___default().createElement("span", {
className: "small gray"
}, react__WEBPACK_IMPORTED_MODULE_0___default().createElement(react_intl__WEBPACK_IMPORTED_MODULE_1__.FormattedMessage, {
id: "send_command_explained",
defaultMessage: [{
"type": 0,
"value": "Press Enter for new line"
}]
})))))));
}
}
;
@@ -10907,6 +10993,7 @@ class MessagesView extends (react__WEBPACK_IMPORTED_MODULE_0___default().Compone
disabled: !this.state.isWriter || this.state.deleted,
reply: this.state.reply,
initMessage: this.state.contentToEdit,
sendOnEnter: this.props.sendOnEnter,
onKeyPress: this.sendKeyPress,
onRecordingProgress: this.sendKeyPress,
onSendMessage: this.sendMessage,
@@ -11364,7 +11451,7 @@ __webpack_require__.r(__webpack_exports__);
/* harmony import */ var _widgets_side_navbar_jsx__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(/*! ../widgets/side-navbar.jsx */ "./src/widgets/side-navbar.jsx");
/* harmony import */ var _topic_common_view_jsx__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(/*! ./topic-common-view.jsx */ "./src/views/topic-common-view.jsx");
/* harmony import */ var _contacts_view_jsx__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(/*! ./contacts-view.jsx */ "./src/views/contacts-view.jsx");
/* harmony import */ var _acc_appearance_view_jsx__WEBPACK_IMPORTED_MODULE_7__ = __webpack_require__(/*! ./acc-appearance-view.jsx */ "./src/views/acc-appearance-view.jsx");
/* harmony import */ var _acc_general_view_jsx__WEBPACK_IMPORTED_MODULE_7__ = __webpack_require__(/*! ./acc-general-view.jsx */ "./src/views/acc-general-view.jsx");
/* harmony import */ var _acc_notifications_view_jsx__WEBPACK_IMPORTED_MODULE_8__ = __webpack_require__(/*! ./acc-notifications-view.jsx */ "./src/views/acc-notifications-view.jsx");
/* harmony import */ var _acc_support_view_jsx__WEBPACK_IMPORTED_MODULE_9__ = __webpack_require__(/*! ./acc-support-view.jsx */ "./src/views/acc-support-view.jsx");
/* harmony import */ var _login_view_jsx__WEBPACK_IMPORTED_MODULE_10__ = __webpack_require__(/*! ./login-view.jsx */ "./src/views/login-view.jsx");
@@ -11446,11 +11533,11 @@ const messages = (0,react_intl__WEBPACK_IMPORTED_MODULE_1__.defineMessages)({
"value": "Notifications"
}]
},
appearance: {
id: "sidepanel_title_appearance",
acc_general: {
id: "sidepanel_title_acc_general",
defaultMessage: [{
"type": 0,
"value": "Appearance"
"value": "General"
}]
},
support: {
@@ -11602,11 +11689,13 @@ class SidepanelView extends (react__WEBPACK_IMPORTED_MODULE_0___default().PureCo
onUpdateTopicDesc: this.props.onUpdateAccountDesc,
onUpdateTagsRequest: this.props.onUpdateAccountTags,
onError: this.props.onError
}) : view === 'appearance' ? react__WEBPACK_IMPORTED_MODULE_0___default().createElement(_acc_appearance_view_jsx__WEBPACK_IMPORTED_MODULE_7__["default"], {
}) : view === 'acc_general' ? react__WEBPACK_IMPORTED_MODULE_0___default().createElement(_acc_general_view_jsx__WEBPACK_IMPORTED_MODULE_7__["default"], {
colorSchema: this.props.colorSchema,
textSize: this.props.textSize,
sendOnEnter: this.props.sendOnEnter,
onChangeColorSchema: this.props.onChangeColorSchema,
onTextSizeChanged: this.props.onTextSizeChanged
onTextSizeChanged: this.props.onTextSizeChanged,
onSendOnEnterChanged: this.props.onSendOnEnterChanged
}) : view === 'notif' ? react__WEBPACK_IMPORTED_MODULE_0___default().createElement(_acc_notifications_view_jsx__WEBPACK_IMPORTED_MODULE_8__["default"], {
messageSounds: this.props.messageSounds,
desktopAlerts: this.props.desktopAlerts,
@@ -11867,6 +11956,7 @@ class TinodeWeb extends (react__WEBPACK_IMPORTED_MODULE_0___default().Component)
this.handleToggleIncognitoMode = this.handleToggleIncognitoMode.bind(this);
this.handleChangeColorSchema = this.handleChangeColorSchema.bind(this);
this.handleChangeTextSize = this.handleChangeTextSize.bind(this);
this.handleSendOnEnter = this.handleSendOnEnter.bind(this);
this.handleSettings = this.handleSettings.bind(this);
this.handleGlobalSettings = this.handleGlobalSettings.bind(this);
this.handleShowArchive = this.handleShowArchive.bind(this);
@@ -11935,6 +12025,7 @@ class TinodeWeb extends (react__WEBPACK_IMPORTED_MODULE_0___default().Component)
incognitoMode: false,
colorSchema: settings.colorSchema || _config_js__WEBPACK_IMPORTED_MODULE_11__.DEFAULT_COLOR_SCHEME,
textSize: settings.textSize || _config_js__WEBPACK_IMPORTED_MODULE_11__.DEFAULT_TEXT_SIZE,
sendOnEnter: settings.sendOnEnter || 'plain',
desktopAlerts: persist && !!settings.desktopAlerts,
desktopAlertsEnabled: ((0,_lib_host_name_js__WEBPACK_IMPORTED_MODULE_15__.isSecureConnection)() || (0,_lib_host_name_js__WEBPACK_IMPORTED_MODULE_15__.isLocalHost)()) && typeof firebase_app__WEBPACK_IMPORTED_MODULE_2__.initializeApp != 'undefined' && typeof navigator != 'undefined' && typeof FIREBASE_INIT != 'undefined',
firebaseToken: persist ? _lib_local_storage_js__WEBPACK_IMPORTED_MODULE_16__["default"].getObject('firebase-token') : null,
@@ -12204,7 +12295,7 @@ class TinodeWeb extends (react__WEBPACK_IMPORTED_MODULE_0___default().Component)
newTopicTabSelected: hash.params.tab
};
if (hash.path && hash.path.length > 0) {
if (['register', 'settings', 'edit', 'notif', 'appearance', 'security', 'support', 'general', 'crop', 'cred', 'reset', 'newtpk', 'archive', 'blocked', 'contacts', ''].includes(hash.path[0])) {
if (['register', 'settings', 'edit', 'notif', 'acc_general', 'security', 'support', 'general', 'crop', 'cred', 'reset', 'newtpk', 'archive', 'blocked', 'contacts', ''].includes(hash.path[0])) {
newState.sidePanelSelected = hash.path[0];
} else {
console.warn("Unknown sidepanel view", hash.path[0]);
@@ -12797,6 +12888,14 @@ class TinodeWeb extends (react__WEBPACK_IMPORTED_MODULE_0___default().Component)
});
document.documentElement.style.setProperty('--message-text-size', `${size}pt`);
}
handleSendOnEnter(option) {
this.setState({
sendOnEnter: option
});
_lib_local_storage_js__WEBPACK_IMPORTED_MODULE_16__["default"].updateObject('settings', {
sendOnEnter: option
});
}
handleUpdateAccountTagsRequest(_, tags) {
this.tinode.getMeTopic().setMeta({
tags: tags
@@ -12910,7 +13009,7 @@ class TinodeWeb extends (react__WEBPACK_IMPORTED_MODULE_0___default().Component)
handleSidepanelCancel() {
const parsed = _lib_navigation_js__WEBPACK_IMPORTED_MODULE_17__["default"].parseUrlHash(window.location.hash);
let path = '';
if (['security', 'support', 'general', 'notif', 'appearance'].includes(parsed.path[0])) {
if (['security', 'support', 'general', 'notif', 'acc_general'].includes(parsed.path[0])) {
path = 'edit';
} else if ('crop' == parsed.path[0]) {
path = 'general';
@@ -13580,6 +13679,7 @@ class TinodeWeb extends (react__WEBPACK_IMPORTED_MODULE_0___default().Component)
reqCredMethod: this.state.reqCredMethod,
textSize: this.state.textSize,
colorSchema: this.state.colorSchema,
sendOnEnter: this.state.sendOnEnter,
onGlobalSettings: this.handleGlobalSettings,
onSignUp: this.handleNewAccount,
onSettings: this.handleSettings,
@@ -13595,6 +13695,7 @@ class TinodeWeb extends (react__WEBPACK_IMPORTED_MODULE_0___default().Component)
onToggleIncognitoMode: this.handleToggleIncognitoMode,
onChangeColorSchema: this.handleChangeColorSchema,
onTextSizeChanged: this.handleChangeTextSize,
onSendOnEnterChanged: this.handleSendOnEnter,
onCredAdd: this.handleCredAdd,
onCredDelete: this.handleCredDelete,
onCredConfirm: this.handleCredConfirm,
@@ -13631,6 +13732,7 @@ class TinodeWeb extends (react__WEBPACK_IMPORTED_MODULE_0___default().Component)
serverAddress: this.state.serverAddress,
applicationVisible: this.state.applicationVisible,
colorSchema: this.state.colorSchema,
sendOnEnter: this.state.sendOnEnter,
forwardMessage: this.state.forwardMessage,
onCancelForwardMessage: this.handleHideForwardDialog,
callTopic: this.state.callTopic,
@@ -19483,10 +19585,18 @@ class SendMessage extends (react__WEBPACK_IMPORTED_MODULE_0___default().PureComp
return;
}
if (e.key === 'Enter') {
if (!e.shiftKey) {
e.preventDefault();
e.stopPropagation();
this.handleSend(e);
if (this.props.sendOnEnter == 'plain') {
if (!e.shiftKey) {
e.preventDefault();
e.stopPropagation();
this.handleSend(e);
}
} else {
if (e.ctrlKey || e.metaKey) {
e.preventDefault();
e.stopPropagation();
this.handleSend(e);
}
}
}
}
+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
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
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
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
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
+1 -1
View File
@@ -145,7 +145,7 @@ class AccSecurityView extends (react__WEBPACK_IMPORTED_MODULE_0___default().Comp
})), react__WEBPACK_IMPORTED_MODULE_0___default().createElement("div", {
className: "panel-form-row"
}, react__WEBPACK_IMPORTED_MODULE_0___default().createElement("span", {
className: "small"
className: "small gray"
}, react__WEBPACK_IMPORTED_MODULE_0___default().createElement(react_intl__WEBPACK_IMPORTED_MODULE_1__.FormattedMessage, {
id: "incognito_mode_description",
defaultMessage: [{
File diff suppressed because one or more lines are too long
@@ -219,15 +219,15 @@ class AccountSettingsView extends (react__WEBPACK_IMPORTED_MODULE_0___default().
className: "flat-button",
onClick: e => {
e.preventDefault();
this.props.onNavigate('appearance');
this.props.onNavigate('acc_general');
}
}, react__WEBPACK_IMPORTED_MODULE_0___default().createElement("i", {
className: "material-icons"
}, "tune"), "\xA0", react__WEBPACK_IMPORTED_MODULE_0___default().createElement(react_intl__WEBPACK_IMPORTED_MODULE_1__.FormattedMessage, {
id: "sidepanel_title_appearance",
id: "sidepanel_title_acc_general",
defaultMessage: [{
"type": 0,
"value": "Appearance"
"value": "General"
}]
})), react__WEBPACK_IMPORTED_MODULE_0___default().createElement("a", {
href: "#",
File diff suppressed because one or more lines are too long