pro/im_webapp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'vc' of https://github.com/tinode/webapp into vc

Browse Source
This commit is contained in:
aforge
2023-06-29 03:57:12 -07:00
parent b14717bb48 07d32dbfd8
commit 338e0f6023
69 changed files with 3175 additions and 24885 deletions
Download Patch File Download Diff File Expand all files Collapse all files
css/base.css
+100 -87
View File
@@ -522,8 +522,6 @@ div.trusted-badge {
color: #999;
font-size: 1.8rem;
background-color: #fafafa;
right: 1rem;
bottom: 1rem;
border-radius: 50%;
width: 3.25rem;
height: 3.25rem;
@@ -1749,11 +1747,15 @@ video {
/* Badge with "You" for current user or peer's name. */
.call-party .caller-name {
max-width: 12rem;
padding: 0.15rem 0.5rem;
border-radius: 0.35rem;
z-index: 1;
text-shadow: 0 0 1px white;
background-color: rgba(255, 255, 255, 0.7);
text-overflow: ellipsis;
overflow-x: hidden;
white-space: nowrap;
}
.call-party.self .caller-name.inactive {
@@ -1820,6 +1822,10 @@ video {
font-weight: lighter;
}
#go-to-latest {
right: 1.5rem;
bottom: 1rem;
}
@keyframes active-call {
0% {
@@ -2575,7 +2581,7 @@ ul.tabbar li.active > a {
.material-icons.big {
font-size: 2.2rem;
}
.material-icons.bigger {
.material-icons.x-big {
font-size: 3rem;
}
.material-icons.huge {
@@ -2585,13 +2591,26 @@ ul.tabbar li.active > a {
display: inline-block;
position: relative;
}
.composed-material i:nth-child(2) {
.composed-material .second {
position: absolute;
font-size: 85%;
top: 7%;
left: 39%;
font-weight: bold;
}
.composed-material .second-small {
position: absolute;
font-size: 62%;
top: 14%;
left: 30%;
font-weight: bold;
}
/* White outline */
.material-icons.outline {
position: relative;
text-shadow: -1px 1px #FFF, 1px 1px #FFF, 1px -1px #FFF, -1px -1px #FFF;
}
#self-avatar .material-icons {
font-size: 2.4rem;
@@ -3183,6 +3202,80 @@ ul.phone-country-selector span.country {
overflow-x: hidden;
}
/* Video conferencing. */
.call-party-speaking {
border: 2.5px solid #2196f3;
}
.carousel-item .caller-name.inactive {
position: absolute;
bottom: 0.25rem;
right: 0.25rem;
max-width: 6.5rem;
}
.carousel-item .muted {
position: absolute;
top: 0.25rem;
right: 0.25rem;
}
.carousel-item .avatar-box {
width: 45px;
height: 45px;
position: absolute;
left: 50%;
top: 50%;
/* Center the avatar in parent view. */
transform: translate(-50%, -50%);
}
#carousel-wrapper {
width: 100%;
max-width: 54rem;
position: relative;
align-self: center;
padding-top: 0.5rem;
overflow: hidden;
flex-shrink: 0;
flex-grow: 0;
scrollbar-width: none; /* Firefox */
}
#carousel {
overflow-x: scroll;
overflow-y: hidden;
scroll-behavior: smooth;
scrollbar-width: none; /* Hide scrollbar in Firefox */
}
#carousel::-webkit-scrollbar {
display: none; /* Hide scrollbar in Safari and Chrome */
}
#carousel-content {
display: grid;
grid-gap: 1rem;
grid-auto-flow: column;
}
#carousel-prev {
top: 50%;
left: 0;
transform: translate(50%, -50%);
}
#carousel-next {
top: 50%;
right: 0;
transform: translate(-50%, -50%);
}
.carousel-item {
position: relative;
width: 8rem;
height: 8rem;
}
/*
Very wide monitor.
*/
@@ -3246,88 +3339,8 @@ ul.phone-country-selector span.country {
.pinned {
width: unset;
}
}
/* Video conferencing. */
.call-party-speaking {
border: 2px solid red;
}
.call-party.carousel-item .caller-name.inactive {
position: absolute;
bottom: 0.25rem;
right: 0.25rem;
}
.call-party.carousel-item .muted {
position: absolute;
top: 0.25rem;
right: 0.25rem;
}
.avatar-box.carousel-item {
/* Center the avatar in parent view. */
width: 45px;
height: 45px;
position: absolute;
left: 50%;
top: 50%;
transform: translate(-50%, -50%);
}
#carousel-wrapper {
width: 100%;
max-width: 800px;
position: relative;
align-self: center;
padding-top: 1rem;
}
#carousel {
overflow: auto;
scroll-behavior: smooth;
scrollbar-width: none;
}
#carousel-prev, #carousel-next {
display: flex;
justify-content: center;
align-content: center;
background: white;
border: none;
padding: 8px;
border-radius: 50%;
outline: 0;
cursor: pointer;
position: absolute;
min-width: unset;
height: unset;
}
#carousel-prev {
top: 50%;
left: 0;
transform: translate(50%, -50%);
display: none;
}
#carousel-next {
top: 50%;
right: 0;
transform: translate(-50%, -50%);
}
#carousel-content {
display: grid;
justify-content: center;
grid-gap: 16px;
grid-auto-flow: column;
margin: auto;
box-sizing: border-box;
}
.carousel-item {
width: 180px;
height: 100px;
position: relative;
.call-party.self {
bottom: 8.5rem;
}
}
css/base.min.css
Vendored
+1 -1
View File
File diff suppressed because one or more lines are too long
index-dev.html
+2
View File
@@ -34,6 +34,8 @@
<script crossorigin="anonymous" src="https://cdn.jsdelivr.net/npm/react-dom@18/umd/react-dom.development.js"></script>
<!-- React-Intl for translations -->
<script crossorigin="anonymous" src="https://cdn.jsdelivr.net/npm/react-intl@6/react-intl.iife.js"></script>
<!-- LiveKit for group video calls -->
<script crossorigin="anonymous" src="https://cdn.jsdelivr.net/npm/livekit-client@1/dist/livekit-client.umd.js"></script>
</head>
<body>
index.html
+1
View File
@@ -26,6 +26,7 @@
<script crossorigin="anonymous" src="https://cdn.jsdelivr.net/npm/react@18.2.0/umd/react.production.min.js"></script>
<script crossorigin="anonymous" src="https://cdn.jsdelivr.net/npm/react-dom@18.2.0/umd/react-dom.production.min.js"></script>
<script crossorigin="anonymous" src="https://cdn.jsdelivr.net/npm/react-intl@6.3.2/react-intl.iife.min.js"></script>
<script crossorigin="anonymous" src="https://cdn.jsdelivr.net/npm/livekit-client@1.10.0/dist/livekit-client.umd.js"></script>
</head>
<body>
<noscript><div id="noscript-message"><div id="noscript-title">Javascript support is required.</div>
package-lock.json
Generated
+2444 -1655
View File
File diff suppressed because it is too large Load Diff
package.json
+4 -5
View File
@@ -1,7 +1,7 @@
{
"name": "tinode-webapp",
"description": "Tinode messenger for the web",
"version": "0.23.0-rc1",
"version": "0.23.0-rc2",
"repository": {
"type": "git",
"url": "https://github.com/tinode/webapp.git"
@@ -67,8 +67,7 @@
"dependencies": {
"firebase": "^9.17.2",
"libphonenumber-js": "^1.10.24",
"livekit-client": "^1.9.3",
"npm-check-updates": "^16.7.12",
"livekit-client": "^1.10.0",
"react": "^18.2.0",
"react-dom": "^18.2.0",
"react-intl": "^6.3.0",
@@ -84,8 +83,8 @@
"babel-plugin-formatjs": "^10.4.0",
"browserslist": "^4.21.5",
"copy-webpack-plugin": "^11.0.0",
"cssnano": "^5.1.15",
"glob": "^9.3.0",
"cssnano": "^6.0.1",
"glob": "^10.2.7",
"postcss": "^8.4.21",
"postcss-cli": "^10.1.0",
"webpack": "^5.76.1",
scripts/i18n.js
+1 -1
View File
@@ -15,7 +15,7 @@ const OUTPUT_PATTERN = './src/i18n.min/%s.json';
const args = process.argv.slice(2);
function getLocaleFromFileName(filename) {
const parts = filename.split('/');
const parts = filename.split(path.sep);
return parts[parts.length - 1].split('.json')[0];
}
src/config.js
+1 -1
View File
@@ -96,7 +96,7 @@ export const MAX_TITLE_LENGTH = 60;
// Maximum length of topic description.
export const MAX_TOPIC_DESCRIPTION_LENGTH = 360;
// Maximum length of user name when displaying a video call.
export const MAX_PEER_TITLE_LENGTH = 20;
export const MAX_PEER_TITLE_LENGTH = 24;
// Length of message previews in chat list, in characters.
export const MESSAGE_PREVIEW_LENGTH = 80;
src/i18n.min/de.json
+1 -1
View File
File diff suppressed because one or more lines are too long
src/i18n.min/en.json
+1 -1
View File
File diff suppressed because one or more lines are too long
src/i18n.min/es.json
+1 -1
View File
File diff suppressed because one or more lines are too long
src/i18n.min/fr.json
+1 -1
View File
File diff suppressed because one or more lines are too long
src/i18n.min/ko.json
+1 -1
View File
File diff suppressed because one or more lines are too long
src/i18n.min/ro.json
+1 -1
View File
File diff suppressed because one or more lines are too long
src/i18n.min/ru.json
+1 -1
View File
File diff suppressed because one or more lines are too long
src/i18n.min/zh-TW.json
+1 -1
View File
File diff suppressed because one or more lines are too long
src/i18n.min/zh.json
+1 -1
View File
File diff suppressed because one or more lines are too long
src/i18n/de.json
+21 -7
View File
@@ -1420,7 +1420,7 @@
"cred_confirmed_successfully": {
"translation": "Erfolgreich bestätigt",
"defaultMessage": "Confirmed successfully",
"description": "Message explaining that the credential was successfully validated.",
"description": "Notification message that the credential was successfully validated.",
"missing": false,
"obsolete": false
},
@@ -1635,24 +1635,38 @@
"obsolete": false
},
"pin_message": {
"translation": "",
"translation": "Anpinnen",
"defaultMessage": "Pin",
"description": "Menu item [Pin] for pinning message to the top.",
"missing": true,
"missing": false,
"obsolete": false
},
"unpin_message": {
"translation": "",
"translation": "Lösen",
"defaultMessage": "Unpin",
"description": "Menu item [Unpin] for un-pinning the message.",
"missing": true,
"missing": false,
"obsolete": false
},
"calls_conference": {
"translation": "",
"translation": "Telefonkonferenz",
"defaultMessage": "Conference call",
"description": "Conference call label",
"missing": true,
"missing": false,
"obsolete": false
},
"password_reset_success": {
"translation": "Passwort erfolgreich zurückgesetzt",
"defaultMessage": "Password reset successfully",
"description": "Notification message that the password was successfully reset.",
"missing": false,
"obsolete": false
},
"join_conference": {
"translation": "+ Mitmachen",
"defaultMessage": "+ Join",
"description": "Call to action to join a conference call",
"missing": false,
"obsolete": false
}
}
src/i18n/en.json
+15 -1
View File
@@ -1420,7 +1420,7 @@
"cred_confirmed_successfully": {
"translation": "Confirmed successfully",
"defaultMessage": "Confirmed successfully",
"description": "Message explaining that the credential was successfully validated.",
"description": "Notification message that the credential was successfully validated.",
"missing": false,
"obsolete": false
},
@@ -1654,5 +1654,19 @@
"description": "Conference call label",
"missing": false,
"obsolete": false
},
"password_reset_success": {
"translation": "Password reset successfully",
"defaultMessage": "Password reset successfully",
"description": "Notification message that the password was successfully reset.",
"missing": false,
"obsolete": false
},
"join_conference": {
"translation": "+ Join",
"defaultMessage": "+ Join",
"description": "Call to action to join a conference call",
"missing": false,
"obsolete": false
}
}
src/i18n/es.json
+21 -7
View File
@@ -1420,7 +1420,7 @@
"cred_confirmed_successfully": {
"translation": "Confirmado con éxito",
"defaultMessage": "Confirmed successfully",
"description": "Message explaining that the credential was successfully validated.",
"description": "Notification message that the credential was successfully validated.",
"missing": false,
"obsolete": false
},
@@ -1628,17 +1628,17 @@
"obsolete": false
},
"pin_message": {
"translation": "",
"translation": "Fijar",
"defaultMessage": "Pin",
"description": "Menu item [Pin] for pinning message to the top.",
"missing": true,
"missing": false,
"obsolete": false
},
"unpin_message": {
"translation": "",
"translation": "Desanclar",
"defaultMessage": "Unpin",
"description": "Menu item [Unpin] for un-pinning the message.",
"missing": true,
"missing": false,
"obsolete": false
},
"failed_to_init_audio": {
@@ -1649,10 +1649,24 @@
"obsolete": false
},
"calls_conference": {
"translation": "",
"translation": "Conferencia",
"defaultMessage": "Conference call",
"description": "Conference call label",
"missing": true,
"missing": false,
"obsolete": false
},
"password_reset_success": {
"translation": "Restablecimiento de contraseña con éxito",
"defaultMessage": "Password reset successfully",
"description": "Notification message that the password was successfully reset.",
"missing": false,
"obsolete": false
},
"join_conference": {
"translation": "+ Unirse",
"defaultMessage": "+ Join",
"description": "Call to action to join a conference call",
"missing": false,
"obsolete": false
}
}
src/i18n/ex/base-en.json
+9 -1
View File
@@ -213,7 +213,7 @@
},
"cred_confirmed_successfully": {
"defaultMessage": "Confirmed successfully",
"description": "Message explaining that the credential was successfully validated."
"description": "Notification message that the credential was successfully validated."
},
"credential_email_prompt": {
"defaultMessage": "Your registration email",
@@ -374,6 +374,10 @@
"defaultMessage": "Invalid security token",
"description": "Error message when resetting password."
},
"join_conference": {
"defaultMessage": "+ Join",
"description": "Call to action to join a conference call"
},
"label_client": {
"defaultMessage": "Client:",
"description": "Label for a client version"
@@ -708,6 +712,10 @@
"defaultMessage": "A text message with security code has been sent.",
"description": "Notification that the SMS with password reset instructions has been sent"
},
"password_reset_success": {
"defaultMessage": "Password reset successfully",
"description": "Notification message that the password was successfully reset."
},
"password_unchanged_prompt": {
"defaultMessage": "Unchanged",
"description": "Message in editor while password is unchanged"
src/i18n/fr.json
+21 -7
View File
@@ -1420,7 +1420,7 @@
"cred_confirmed_successfully": {
"translation": "Confirmé avec succès",
"defaultMessage": "Confirmed successfully",
"description": "Message explaining that the credential was successfully validated.",
"description": "Notification message that the credential was successfully validated.",
"missing": false,
"obsolete": false
},
@@ -1628,17 +1628,17 @@
"obsolete": false
},
"pin_message": {
"translation": "",
"translation": "Épingler",
"defaultMessage": "Pin",
"description": "Menu item [Pin] for pinning message to the top.",
"missing": true,
"missing": false,
"obsolete": false
},
"unpin_message": {
"translation": "",
"translation": "Détacher",
"defaultMessage": "Unpin",
"description": "Menu item [Unpin] for un-pinning the message.",
"missing": true,
"missing": false,
"obsolete": false
},
"failed_to_init_audio": {
@@ -1649,10 +1649,24 @@
"obsolete": false
},
"calls_conference": {
"translation": "",
"translation": "Conférence téléphonique",
"defaultMessage": "Conference call",
"description": "Conference call label",
"missing": true,
"missing": false,
"obsolete": false
},
"password_reset_success": {
"translation": "Mot de passe réinitialisé avec succès",
"defaultMessage": "Password reset successfully",
"description": "Notification message that the password was successfully reset.",
"missing": false,
"obsolete": false
},
"join_conference": {
"translation": "+ Rejoindre",
"defaultMessage": "+ Join",
"description": "Call to action to join a conference call",
"missing": false,
"obsolete": false
}
}
src/i18n/ko.json
+21 -7
View File
@@ -1420,7 +1420,7 @@
"cred_confirmed_successfully": {
"translation": "성공적으로 확인됨",
"defaultMessage": "Confirmed successfully",
"description": "Message explaining that the credential was successfully validated.",
"description": "Notification message that the credential was successfully validated.",
"missing": false,
"obsolete": false
},
@@ -1628,17 +1628,17 @@
"obsolete": false
},
"pin_message": {
"translation": "",
"translation": "고정",
"defaultMessage": "Pin",
"description": "Menu item [Pin] for pinning message to the top.",
"missing": true,
"missing": false,
"obsolete": false
},
"unpin_message": {
"translation": "",
"translation": "고정 해제",
"defaultMessage": "Unpin",
"description": "Menu item [Unpin] for un-pinning the message.",
"missing": true,
"missing": false,
"obsolete": false
},
"failed_to_init_audio": {
@@ -1649,10 +1649,24 @@
"obsolete": false
},
"calls_conference": {
"translation": "",
"translation": "전화 회의",
"defaultMessage": "Conference call",
"description": "Conference call label",
"missing": true,
"missing": false,
"obsolete": false
},
"password_reset_success": {
"translation": "비밀번호 재설정 성공",
"defaultMessage": "Password reset successfully",
"description": "Notification message that the password was successfully reset.",
"missing": false,
"obsolete": false
},
"join_conference": {
"translation": "+ 통화에 참여",
"defaultMessage": "+ Join",
"description": "Call to action to join a conference call",
"missing": false,
"obsolete": false
}
}
src/i18n/ro.json
+21 -7
View File
@@ -1420,7 +1420,7 @@
"cred_confirmed_successfully": {
"translation": "Confirmat cu succes",
"defaultMessage": "Confirmed successfully",
"description": "Message explaining that the credential was successfully validated.",
"description": "Notification message that the credential was successfully validated.",
"missing": false,
"obsolete": false
},
@@ -1628,17 +1628,17 @@
"obsolete": false
},
"pin_message": {
"translation": "",
"translation": "Fixați",
"defaultMessage": "Pin",
"description": "Menu item [Pin] for pinning message to the top.",
"missing": true,
"missing": false,
"obsolete": false
},
"unpin_message": {
"translation": "",
"translation": "Anulați fixarea",
"defaultMessage": "Unpin",
"description": "Menu item [Unpin] for un-pinning the message.",
"missing": true,
"missing": false,
"obsolete": false
},
"failed_to_init_audio": {
@@ -1649,10 +1649,24 @@
"obsolete": false
},
"calls_conference": {
"translation": "",
"translation": "Apel de conferinta",
"defaultMessage": "Conference call",
"description": "Conference call label",
"missing": true,
"missing": false,
"obsolete": false
},
"password_reset_success": {
"translation": "Resetarea parolei cu succes",
"defaultMessage": "Password reset successfully",
"description": "Notification message that the password was successfully reset.",
"missing": false,
"obsolete": false
},
"join_conference": {
"translation": "+ Participa",
"defaultMessage": "+ Join",
"description": "Call to action to join a conference call",
"missing": false,
"obsolete": false
}
}
src/i18n/ru.json
+21 -7
View File
@@ -1420,7 +1420,7 @@
"cred_confirmed_successfully": {
"translation": "Подтверждено успешно",
"defaultMessage": "Confirmed successfully",
"description": "Message explaining that the credential was successfully validated.",
"description": "Notification message that the credential was successfully validated.",
"missing": false,
"obsolete": false
},
@@ -1628,17 +1628,17 @@
"obsolete": false
},
"pin_message": {
"translation": "",
"translation": "Закрепить",
"defaultMessage": "Pin",
"description": "Menu item [Pin] for pinning message to the top.",
"missing": true,
"missing": false,
"obsolete": false
},
"unpin_message": {
"translation": "",
"translation": "Открепить",
"defaultMessage": "Unpin",
"description": "Menu item [Unpin] for un-pinning the message.",
"missing": true,
"missing": false,
"obsolete": false
},
"failed_to_init_audio": {
@@ -1649,10 +1649,24 @@
"obsolete": false
},
"calls_conference": {
"translation": "",
"translation": "Групповой звонок",
"defaultMessage": "Conference call",
"description": "Conference call label",
"missing": true,
"missing": false,
"obsolete": false
},
"password_reset_success": {
"translation": "Пароль успешно изменен",
"defaultMessage": "Password reset successfully",
"description": "Notification message that the password was successfully reset.",
"missing": false,
"obsolete": false
},
"join_conference": {
"translation": "+ Присоединиться",
"defaultMessage": "+ Join",
"description": "Call to action to join a conference call",
"missing": false,
"obsolete": false
}
}
src/i18n/zh-TW.json
+21 -7
View File
@@ -1420,7 +1420,7 @@
"cred_confirmed_successfully": {
"translation": "確認成功",
"defaultMessage": "Confirmed successfully",
"description": "Message explaining that the credential was successfully validated.",
"description": "Notification message that the credential was successfully validated.",
"missing": false,
"obsolete": false
},
@@ -1628,17 +1628,17 @@
"obsolete": false
},
"pin_message": {
"translation": "",
"translation": "置頂消息",
"defaultMessage": "Pin",
"description": "Menu item [Pin] for pinning message to the top.",
"missing": true,
"missing": false,
"obsolete": false
},
"unpin_message": {
"translation": "",
"translation": "取消置頂消息",
"defaultMessage": "Unpin",
"description": "Menu item [Unpin] for un-pinning the message.",
"missing": true,
"missing": false,
"obsolete": false
},
"failed_to_init_audio": {
@@ -1649,10 +1649,24 @@
"obsolete": false
},
"calls_conference": {
"translation": "",
"translation": "電話會議",
"defaultMessage": "Conference call",
"description": "Conference call label",
"missing": true,
"missing": false,
"obsolete": false
},
"password_reset_success": {
"translation": "密碼重置成功",
"defaultMessage": "Password reset successfully",
"description": "Notification message that the password was successfully reset.",
"missing": false,
"obsolete": false
},
"join_conference": {
"translation": "+ 加入通話",
"defaultMessage": "+ Join",
"description": "Call to action to join a conference call",
"missing": false,
"obsolete": false
}
}
src/i18n/zh.json
+21 -7
View File
@@ -1420,7 +1420,7 @@
"cred_confirmed_successfully": {
"translation": "确认成功",
"defaultMessage": "Confirmed successfully",
"description": "Message explaining that the credential was successfully validated.",
"description": "Notification message that the credential was successfully validated.",
"missing": false,
"obsolete": false
},
@@ -1628,17 +1628,17 @@
"obsolete": false
},
"pin_message": {
"translation": "",
"translation": "置顶消息",
"defaultMessage": "Pin",
"description": "Menu item [Pin] for pinning message to the top.",
"missing": true,
"missing": false,
"obsolete": false
},
"unpin_message": {
"translation": "",
"translation": "取消置顶消息",
"defaultMessage": "Unpin",
"description": "Menu item [Unpin] for un-pinning the message.",
"missing": true,
"missing": false,
"obsolete": false
},
"failed_to_init_audio": {
@@ -1649,10 +1649,24 @@
"obsolete": false
},
"calls_conference": {
"translation": "",
"translation": "电话会议",
"defaultMessage": "Conference call",
"description": "Conference call label",
"missing": true,
"missing": false,
"obsolete": false
},
"password_reset_success": {
"translation": "密码重置成功",
"defaultMessage": "Password reset successfully",
"description": "Notification message that the password was successfully reset.",
"missing": false,
"obsolete": false
},
"join_conference": {
"translation": "+ 加入通话",
"defaultMessage": "+ Join",
"description": "Call to action to join a conference call",
"missing": false,
"obsolete": false
}
}
src/lib/formatters.js
+2 -2
View File
@@ -210,7 +210,7 @@ function handleImageData(el, data, attr) {
return el;
}
// Additional processing of image data.
// Additional processing of attached video data.
function handleVideoData(el, data, attr) {
if (!data) {
attr.src = 'img/broken_video.png';
@@ -241,7 +241,7 @@ function handleVideoData(el, data, attr) {
}
el = InlineVideo;
} else {
// Use custom element instead of <img>.
// Use custom element instead of <img> or <video>.
el = UploadingImage;
}
src/lib/navigation.js
+1 -1
View File
@@ -4,7 +4,7 @@ export default class HashNavigation {
// Parse hash as in http://www.example.com/path#hash as if it were
// path and arguments.
static parseUrlHash(hash) {
// Split path from args, path -> parts[0], args->path[1]
// Split 'path/?args' into 'path/' and 'args', path -> parts[0], args->path[1].
const parts = hash.split('?', 2);
const params = {};
let path = [];
src/version.js
+1 -1
View File
@@ -1,3 +1,3 @@
// This is a generated file. Don't edit.
export const PACKAGE_VERSION = "0.23.0-rc1";
export const PACKAGE_VERSION = "0.23.0-rc2";
src/views/messages-view.jsx
+17 -6
View File
@@ -186,16 +186,23 @@ class MessagesView extends React.Component {
getVisibleMessageRange(holderRect) {
let min = Number.MAX_SAFE_INTEGER, max = -1;
this.chatMessageRefs.forEach((ref, seq) => {
let visibilityStatus = false;
this.chatMessageRefs.every((ref, seq) => {
if (ref.current) {
const { top, bottom, height } = ref.current.getBoundingClientRect();
const visible = top <= holderRect.top ? holderRect.top - top <= height : bottom - holderRect.bottom <= height;
if (visible) {
visibilityStatus = true;
min = Math.min(min, seq);
max = Math.max(max, seq);
} else if (visibilityStatus) {
// The remaining elements are no longer visible, no need to iterate them.
return false;
}
}
return true;
});
return max >= min ? {min: min, max: max} : {min: 0, max: 0};
}
@@ -321,7 +328,8 @@ class MessagesView extends React.Component {
showGoToLastButton: false,
dragging: false,
pins: [],
selectedPin: 0
selectedPin: 0,
subsVersion: 0
};
} else if (nextProps.topic != prevState.topic) {
const topic = nextProps.tinode.getTopic(nextProps.topic);
@@ -578,13 +586,14 @@ class MessagesView extends React.Component {
showGoToLastButton: (pos > SHOW_GO_TO_LAST_DIST) && (pos < this.state.scrollPosition),
});
if (this.state.fetchingMessages) {
if (this.state.fetchingMessages || this.processingScrollEvent) {
return;
}
if (event.target.scrollTop <= FETCH_PAGE_TRIGGER) {
const topic = this.props.tinode.getTopic(this.state.topic);
if (topic && topic.isSubscribed()) {
this.processingScrollEvent = true;
const {min, max} = this.getVisibleMessageRange(event.target.getBoundingClientRect());
const gaps = topic.msgHasMoreMessages(min, max, false);
if (gaps.length > 0) {
@@ -596,6 +605,7 @@ class MessagesView extends React.Component {
}
}
}
this.processingScrollEvent = false;
}
/* Mount drag and drop events */
@@ -707,12 +717,12 @@ class MessagesView extends React.Component {
if (this.state.topic) {
const subs = [];
const topic = this.props.tinode.getTopic(this.state.topic);
topic.subscribers((sub) => {
topic.subscribers(sub => {
if (sub.online && sub.user != this.props.myUserId) {
subs.push(sub);
}
});
const newState = {onlineSubs: subs};
const newState = {onlineSubs: subs, subsVersion: this.state.subsVersion + 1};
const peer = topic.p2pPeerDesc();
if (peer) {
Object.assign(newState, {
@@ -1474,6 +1484,7 @@ class MessagesView extends React.Component {
title={this.state.title}
avatar={this.state.avatar || true}
myUid={this.props.myUserId}
viewportWidth={this.props.viewportWidth}
onError={this.props.onError}
onHangup={this.handleCallHangup}
@@ -1620,7 +1631,7 @@ class MessagesView extends React.Component {
let messagesComponent = (
<>
<div id="messages-container">
<button className={'action-button' + (this.state.showGoToLastButton ? '' : ' hidden')}
<button id="go-to-latest" className={'action-button' + (this.state.showGoToLastButton ? '' : ' hidden')}
onClick={this.goToLatestMessage}>
<i className="material-icons">arrow_downward</i>
</button>
src/views/password-reset-view.jsx
+20 -4
View File
@@ -48,7 +48,23 @@ class PasswordResetView extends React.PureComponent {
componentDidMount() {
const parsed = HashNavigation.parseUrlHash(window.location.hash);
this.setState({token: parsed.params.token, scheme: parsed.params.scheme});
const newState = {
token: parsed.params.token,
scheme: parsed.params.scheme,
code: parsed.params.code || ''
}
this.savedCred = parsed.params.cred;
if (this.props.reqCredMethod && parsed.params.cred) {
newState[this.props.reqCredMethod] = this.savedCred;
}
this.setState(newState);
}
componentDidUpdate(prevProps, prevState) {
if (prevProps.reqCredMethod != this.props.reqCredMethod && this.props.reqCredMethod) {
this.setState({[this.props.reqCredMethod]: this.savedCred || ''});
}
}
handleSubmit(e) {
@@ -62,7 +78,7 @@ class PasswordResetView extends React.PureComponent {
} else if (this.state.code && this.props.reqCredMethod) {
// Reset using security code.
// The secret is structured as <code>:<cred_method>:<cred_value>, "123456:email:alice@example.com".
const cred = this.state.email.trim() || this.state.tel.trim();
const cred = this.props.reqCredMethod == 'email' ? this.state.email.trim() : this.state.tel.trim();
this.props.onReset(this.state.password.trim(), {
scheme: 'code',
secret: btoa(`${this.state.code}:${this.props.reqCredMethod}:${cred}`)
@@ -102,7 +118,7 @@ class PasswordResetView extends React.PureComponent {
}
render() {
const showCredentialInput = !(this.state.token && this.state.scheme);
const showCredentialInput = !((this.state.token || (this.state.code && this.props.reqCredMethod)) && this.state.scheme);
const showPasswordInput = !showCredentialInput || this.state.haveCode || this.state.sent;
const passwordInput = (<>
@@ -193,7 +209,7 @@ class PasswordResetView extends React.PureComponent {
{this.state.haveCode || this.state.sent ? codeInput : null}
{showPasswordInput ? passwordInput : null}
<div className="dialog-buttons">
{this.state.haveCode || this.state.sent || this.state.token ? null :
{this.state.haveCode || this.state.sent || this.state.token || this.state.code ? null :
<a href="#" onClick={this.handleShowCodeField} style={{marginRight: 'auto'}}>
<FormattedMessage id="password_i_have_code" defaultMessage="I have code"
description="Call to open field to enter password reset code" />
src/views/tinode-web.jsx
+10 -3
View File
@@ -83,7 +83,12 @@ const messages = defineMessages({
cred_confirmed_successfully: {
id: 'cred_confirmed_successfully',
defaultMessage: 'Confirmed successfully',
description: 'Message explaining that the credential was successfully validated.'
description: 'Notification message that the credential was successfully validated.'
},
password_reset_success: {
id: 'password_reset_success',
defaultMessage: 'Password reset successfully',
description: 'Notification message that the password was successfully reset.'
}
});
@@ -1737,9 +1742,11 @@ class TinodeWeb extends React.Component {
} else {
this.tinode.connect()
.then(_ => this.tinode.updateAccountBasic(null, null, newPassword, {scheme: tempAuth.scheme, secret: secret}))
.then(_ => HashNavigation.navigateTo(''))
.then(_ => {
this.handleError(this.props.intl.formatMessage(messages.password_reset_success), 'info');
HashNavigation.navigateTo('');
})
.catch(err => {
// Socket error
this.handleError(err.message, 'err');
});
}
src/widgets/call-message.jsx
+10 -2
View File
@@ -7,7 +7,13 @@ import { secondsToTime } from '../lib/strformat.js';
export default class CallMessage extends React.PureComponent {
render() {
const bigIcon = this.props.vc ? 'video_call' : 'call';
const bigIcon = this.props.vc ?
<div className="composed-material">
<i className="material-icons gray second-small">group</i>
<i className="material-icons gray big outline">call</i>
</div>
:
<div><i className="material-icons big gray">call</i></div>;
const isCallDropped = ['busy', 'declined', 'disconnected', 'missed'].includes(this.props.callState);
const successClass = 'material-icons medium ' + (isCallDropped ? 'red' : 'green');
const callIcon = this.props.incoming ?
@@ -46,7 +52,9 @@ export default class CallMessage extends React.PureComponent {
<div>{title}</div>
<div className="duration"><i className={successClass}>{callIcon}</i> {duration}</div>
{allowJoin ?
<a onClick={this.props.onCallJoin}>Join</a>
<a onClick={this.props.onCallJoin}>
<FormattedMessage id="join_conference" defaultMessage="+ Join" description="Call to action to join a conference call" />
</a>
: null}
</div>
</div>;
src/widgets/call-status.jsx
+2 -1
View File
@@ -6,7 +6,8 @@ import { secondsToTime } from '../lib/strformat.js';
// Props:
// incoming: true | false.
// success: true | false.
// callState: 'busy' | 'declined' | 'disconnected' | 'missed'.
// duration: <number> (call duration in milliseconds).
export default class CallStatus extends React.PureComponent {
render() {
const isCallDropped = ['busy', 'declined', 'disconnected', 'missed'].includes(this.props.callState);
src/widgets/inline-video.jsx
+1 -1
View File
@@ -29,7 +29,7 @@ export default class InlineVideo extends React.PureComponent {
{React.createElement('img', this.props)}
<div className="play-control">
{this.props.onClick ?
<i className="material-icons white bigger">play_arrow</i>
<i className="material-icons white x-big">play_arrow</i>
:
<img src="img/broken_video.png" style={{filter: 'invert(100%)'}} width="36" height="36" />}
</div>
src/widgets/vc-carousel-item.jsx
+47 -38
View File
@@ -1,34 +1,44 @@
// Video conference carousel item.
import React from 'react';
import Track from 'livekit-client';
import LetterTile from './letter-tile.jsx';
/**
* Props:
* - cameraPub
* - micPub
* - isSpeaking
* - tinode
* - photo
* - userId
* - name
*/
export default class VCCarouselItem extends React.PureComponent {
constructor(props) {
super(props);
this.state = {
videoRef: undefined,
audioRef: undefined
};
this.handleVideoRefChange = this.handleVideoRefChange.bind(this);
this.handleAudioRefChange = this.handleAudioRefChange.bind(this);
this.videoRef = null;
this.audioRef = null;
}
componentDidUpdate(prevProps) {
if (this.state.videoRef && !this.state.videoRef.srcObject && this.props.cameraPub && this.props.cameraPub.videoTrack) {
this.props.cameraPub.videoTrack.attach(this.state.videoRef);
if (this.videoRef && !this.videoRef.srcObject && this.props.cameraPub && this.props.cameraPub.videoTrack) {
this.props.cameraPub.videoTrack.attach(this.videoRef);
}
if (this.state.audioRef && !this.state.audioRef.srcObject && this.props.micPub && this.props.micPub.audioTrack) {
this.props.micPub.audioTrack.attach(this.state.audioRef);
if (this.audioRef && !this.audioRef.srcObject && this.props.micPub && this.props.micPub.audioTrack) {
this.props.micPub.audioTrack.attach(this.audioRef);
}
}
handleVideoRefChange(node) {
if (!node) { return; }
this.setState({videoRef: node});
if (!node) {
return;
}
this.videoRef = node;
// Attach video track to video element.
const cameraPub = this.props.cameraPub;
@@ -39,14 +49,17 @@ export default class VCCarouselItem extends React.PureComponent {
}
handleAudioRefChange(node) {
if (!node) { return; }
this.setState({audioRef: node});
if (!node) {
return;
}
this.audioRef = node;
// Attach audio track to audio element.
const micPub = this.props.micPub;
const micEnabled = micPub && micPub.isSubscribed && !micPub.isMuted;
if (micEnabled && this.state.audioTrack) {
this.state.audioTrack.attach(node);
if (micEnabled && micPub.audioTrack) {
micPub.audioTrack.attach(node);
}
}
@@ -60,28 +73,24 @@ export default class VCCarouselItem extends React.PureComponent {
const cameraPub = this.props.cameraPub;
return (
<div className={classes}>
<>
<video ref={this.handleVideoRefChange}></video>
<audio ref={this.handleAudioRefChange}></audio>
{micPub && micPub.isMuted ?
<i className="material-icons muted">mic_off</i>
: null
}
{cameraPub && cameraPub.isMuted ?
<>
<div className="avatar-box carousel-item">
<LetterTile
tinode={this.props.tinode}
avatar={this.props.photo}
topic={this.props.identity}
title={this.props.name} />
</div>
</>
: null}
<div className="caller-name inactive">
{this.props.name}
<video ref={this.handleVideoRefChange}></video>
<audio ref={this.handleAudioRefChange}></audio>
{micPub && micPub.isMuted ?
<i className="material-icons muted">mic_off</i>
: null
}
{cameraPub && cameraPub.isMuted ?
<div className="avatar-box">
<LetterTile
tinode={this.props.tinode}
avatar={this.props.photo || true}
topic={this.props.userId}
title={this.props.name} />
</div>
</>
: null}
<div className="caller-name inactive">
{this.props.name}
</div>
</div>
);
}
src/widgets/vc-carousel.jsx
+58 -54
View File
@@ -2,7 +2,6 @@ import React from 'react';
import { Track } from 'livekit-client';
import LetterTile from './letter-tile.jsx';
import VCCarouselItem from './vc-carousel-item.jsx';
import { VC_CAROUSEL_ITEM_GAP } from '../constants.js';
@@ -10,39 +9,56 @@ import { VC_CAROUSEL_ITEM_GAP } from '../constants.js';
export default class VCCarousel extends React.Component {
constructor(props) {
super(props);
this.handlePrevClick = this.handlePrevClick.bind(this);
this.handleNextClick = this.handleNextClick.bind(this);
this.carouselRef = React.createRef();
this.state = {
prevVisible: false,
nextVisible: false
};
this.handleScrollReference = this.handleScrollReference.bind(this);
this.handleScrollEvent = this.handleScrollEvent.bind(this);
this.handleScrollClick = this.handleScrollClick.bind(this);
this.carouselRef = null;
this.contentRef = React.createRef();
this.prevRef = React.createRef();
this.nextRef = React.createRef();
}
handlePrevClick() {
const gap = VC_CAROUSEL_ITEM_GAP;
const width = this.carouselRef.current.offsetWidth;
this.carouselRef.current.scrollBy(-(width + gap), 0);
if (this.carouselRef.current.scrollLeft - width - gap <= 0) {
this.prevRef.current.style.display = 'none';
}
if (!this.contentRef.current.scrollWidth - width - gap <= this.carouselRef.current.scrollLeft + width) {
this.nextRef.current.style.display = 'flex';
componentDidUpdate(prevProps) {
if (this.carouselRef && this.props.viewportWidth != prevProps.viewportWidth) {
this.handleScrollEvent({target: this.carouselRef});
}
}
handleNextClick() {
const gap = VC_CAROUSEL_ITEM_GAP;
const width = this.carouselRef.current.offsetWidth;
this.carouselRef.current.scrollBy(width + gap, 0);
if (this.carouselRef.current.scrollWidth !== 0) {
this.prevRef.current.style.display = 'flex';
componentWillUnmount() {
if (this.carouselRef) {
this.carouselRef.removeEventListener('scroll', this.handleScrollEvent);
}
if (this.contentRef.current.scrollWidth - width - gap <= this.carouselRef.current.scrollLeft + width) {
this.nextRef.current.style.display = 'none';
}
// Don't use React.createRef as the ref.current is not available in componentDidMount in this component.
handleScrollReference(node) {
if (node) {
this.carouselRef = node;
this.carouselRef.addEventListener('scroll', this.handleScrollEvent);
this.handleScrollEvent({target: this.carouselRef});
}
}
// Get older messages and show/hide [go to latest message] button.
handleScrollEvent(event) {
this.setState({
// Show [prev] / [next] as appropriate.
prevVisible: event.target.scrollLeft > VC_CAROUSEL_ITEM_GAP,
nextVisible: event.target.scrollWidth - event.target.scrollLeft - event.target.offsetWidth > VC_CAROUSEL_ITEM_GAP
});
}
handleScrollClick(next) {
// this.carouselRef.offsetWidth - is the width of the visible window.
const val = this.carouselRef.offsetWidth + VC_CAROUSEL_ITEM_GAP;
this.carouselRef.scrollBy(next ? val : -val, 0);
}
render() {
let peers = [];
if (this.props.participants) {
@@ -57,44 +73,32 @@ export default class VCCarousel extends React.Component {
cameraPub={cameraPub ? cameraPub : null}
micPub={micPub ? micPub : null}
name={party.name}
identity={identity}
userId={identity}
photo={party.photo}
key={i}
/>);
});
}
return (
<>
<div id="carousel-wrapper">
<div id="carousel" ref={this.carouselRef}>
<div id="carousel-content" ref={this.contentRef}>
{peers}
</div>
<div id="carousel-wrapper">
<div id="carousel" ref={this.handleScrollReference}>
<div id="carousel-content" ref={this.contentRef}>
{peers}
</div>
<button id="carousel-prev" ref={this.prevRef} onClick={this.handlePrevClick}>
<svg
xmlns="http://www.w3.org/2000/svg"
width="24"
height="24"
viewBox="0 0 24 24"
>
<path fill="none" d="M0 0h24v24H0V0z" />
<path d="M15.61 7.41L14.2 6l-6 6 6 6 1.41-1.41L11.03 12l4.58-4.59z" />
</svg>
</button>
<button id="carousel-next" ref={this.nextRef} onClick={this.handleNextClick}>
<svg
xmlns="http://www.w3.org/2000/svg"
width="24"
height="24"
viewBox="0 0 24 24"
>
<path fill="none" d="M0 0h24v24H0V0z" />
<path d="M10.02 6L8.61 7.41 13.19 12l-4.58 4.59L10.02 18l6-6-6-6z" />
</svg>
</button>
</div>
</>
{this.state.prevVisible ?
<button id="carousel-prev" className="action-button" onClick={_ => this.handleScrollClick(false)}>
<i className="material-icons">navigate_before</i>
</button>
:
null}
{this.state.nextVisible ?
<button id="carousel-next" className="action-button" onClick={_ => this.handleScrollClick(true)}>
<i className="material-icons">navigate_next</i>
</button>
:
null}
</div>
);
}
}
src/widgets/vc-panel.jsx
+58 -69
View File
@@ -1,17 +1,12 @@
// Video conference or broadcast: local and/or peer viewports and controls.
import React from 'react';
import { FormattedMessage, defineMessages, injectIntl } from 'react-intl';
import { FormattedMessage, injectIntl } from 'react-intl';
import {
connect,
LocalParticipant,
LocalVideoTrack,
MediaDeviceFailure,
Participant,
ParticipantEvent,
RemoteParticipant,
RemoteTrack,
RemoteTrackPublication,
Room,
RoomEvent,
Track,
@@ -70,8 +65,6 @@ class VCPanel extends React.PureComponent {
this.handleData = this.handleData.bind(this);
this.handleDevicesChanged = this.handleDevicesChanged.bind(this);
this.startRoom = this.startRoom.bind(this);
this.participants = {};
}
componentDidMount() {
@@ -83,7 +76,9 @@ class VCPanel extends React.PureComponent {
componentWillUnmount() {
const topic = this.props.tinode.getTopic(this.props.topic);
topic.onInfo = this.previousOnInfo;
if (topic) {
topic.onInfo = this.previousOnInfo;
}
this.stop();
}
@@ -128,23 +123,21 @@ class VCPanel extends React.PureComponent {
const me = this.props.tinode.getMeTopic();
const c = me.getContact(participant.identity);
const name = c && c.public && c.public.fn ? c.public.fn : participant.identity;
const photo = makeImageUrl(c && c.public ? c.public.photo : null);
const p = {
name: name,
photo: photo,
const participants = Object.assign({}, this.state.participants);
participants[participant.identity] = {
name: c && c.public && c.public.fn ? c.public.fn : participant.identity,
photo: makeImageUrl(c && c.public ? c.public.photo : null),
participant: participant
};
this.participants[participant.identity] = p
console.log('participant connected', this.participants);
this.setState({participants: this.participants}, _ => { this.forceUpdate(); });
this.setState({participants: participants});
}
}
handleParticipantDisconnected(participant) {
console.log('Deleting participant ', participant.identity);
delete this.participants[participant.identity];
this.setState({participants: this.participants});
const participants = Object.assign({}, this.state.participants);
delete participants[participant.identity];
this.setState({participants: participants});
}
handleData(msg, participant) {
@@ -364,58 +357,54 @@ class VCPanel extends React.PureComponent {
const remoteActive = this.remoteRef.current && (this.remoteRef.current.src || this.remoteRef.current.srcObject)
return (
<>
<div id="video-container">
{!this.isBroadcast && Object.keys(this.state.participants).length > 0 ?
<VCCarousel
tinode={this.props.tinode}
participants={this.state.participants} /> :
null
}
<div id="video-container-panel">
{isPublishing ?
<div className="call-party self" disabled={this.state.audioOnly}>
<video ref={this.localRef} autoPlay muted playsInline />
<div className="caller-name inactive">
<FormattedMessage id="calls_you_label"
defaultMessage="You" description="Shown over the local video screen" />
<div id="video-container">
{!this.isBroadcast && Object.keys(this.state.participants).length > 0 ?
<VCCarousel
viewportWidth={this.props.viewportWidth}
tinode={this.props.tinode}
participants={this.state.participants} /> :
null
}
<div id="video-container-panel">
{isPublishing ?
<div className="call-party self" disabled={this.state.audioOnly}>
<video ref={this.localRef} autoPlay muted playsInline />
<div className="caller-name inactive">
<FormattedMessage id="calls_you_label"
defaultMessage="You" description="Shown over the local video screen" />
</div>
</div> :
null }
<div className="call-party peer" disabled={!remoteActive}>
<video ref={this.remoteRef} autoPlay playsInline />
{remoteActive ?
<div className="caller-name inactive">{peerTitle}</div>
:
<div className="caller-card">
<div className="avatar-box">
<LetterTile
tinode={this.props.tinode}
avatar={this.props.avatar}
topic={this.props.topic}
title={this.props.title} />
</div>
</div> :
null }
<div className="call-party peer" disabled={!remoteActive}>
<video ref={this.remoteRef} autoPlay playsInline />
{remoteActive ?
<>
<div className="caller-name inactive">{peerTitle}</div>
</> :
<>
<div className="caller-card">
<div className="avatar-box">
<LetterTile
tinode={this.props.tinode}
avatar={this.props.avatar}
topic={this.props.topic}
title={this.props.title} />
</div>
<div className="caller-name">{peerTitle}</div>
</div>
</>
}
</div>
</div>
<div className="controls">
<button className="danger" onClick={this.handleCloseClick}>
<i className="material-icons">call_end</i>
</button>
<button className="secondary" onClick={this.handleToggleCameraClick} disabled={disabled}>
<i className="material-icons">{videoIcon}</i>
</button>
<button className="secondary" onClick={this.handleToggleMicClick} disabled={disabled}>
<i className="material-icons">{audioIcon}</i>
</button>
<div className="caller-name">{peerTitle}</div>
</div>
}
</div>
</div>
</>
<div className="controls">
<button className="danger" onClick={this.handleCloseClick}>
<i className="material-icons">call_end</i>
</button>
<button className="secondary" onClick={this.handleToggleCameraClick} disabled={disabled}>
<i className="material-icons">{videoIcon}</i>
</button>
<button className="secondary" onClick={this.handleToggleMicClick} disabled={disabled}>
<i className="material-icons">{audioIcon}</i>
</button>
</div>
</div>
);
}
};
umd/107.prod.js
+1 -1
View File
File diff suppressed because one or more lines are too long
umd/203.prod.js
+1 -1
View File
File diff suppressed because one or more lines are too long
umd/203.prod.js.map
+1 -1
View File
File diff suppressed because one or more lines are too long
umd/226.prod.js
+1 -1
View File
File diff suppressed because one or more lines are too long
umd/311.prod.js
+1 -1
View File
File diff suppressed because one or more lines are too long
umd/311.prod.js.map
+1 -1
View File
File diff suppressed because one or more lines are too long
umd/514.prod.js
+1 -1
View File
File diff suppressed because one or more lines are too long
umd/700.prod.js
+1 -1
View File
File diff suppressed because one or more lines are too long
umd/734.prod.js
+1 -1
View File
File diff suppressed because one or more lines are too long
umd/817.prod.js
+1 -1
View File
File diff suppressed because one or more lines are too long
umd/898.prod.js
+1 -1
View File
File diff suppressed because one or more lines are too long
umd/92.prod.js
+1 -1
View File
File diff suppressed because one or more lines are too long
umd/932.prod.js
+1 -1
View File
File diff suppressed because one or more lines are too long
umd/index.dev.js
+146 -22853
View File
File diff suppressed because it is too large Load Diff
umd/index.dev.js.map
+1 -1
View File
File diff suppressed because one or more lines are too long
umd/index.prod.js
+1 -1
View File
File diff suppressed because one or more lines are too long
umd/index.prod.js.map
+1 -1
View File
File diff suppressed because one or more lines are too long
umd/src_i18n_min_de_json.dev.js
+1 -1
View File
File diff suppressed because one or more lines are too long
umd/src_i18n_min_en_json.dev.js
+1 -1
View File
File diff suppressed because one or more lines are too long
umd/src_i18n_min_es_json.dev.js
+1 -1
View File
File diff suppressed because one or more lines are too long
umd/src_i18n_min_fr_json.dev.js
+1 -1
View File
File diff suppressed because one or more lines are too long
umd/src_i18n_min_ko_json.dev.js
+1 -1
View File
File diff suppressed because one or more lines are too long
umd/src_i18n_min_ro_json.dev.js
+1 -1
View File
File diff suppressed because one or more lines are too long
umd/src_i18n_min_ru_json.dev.js
+1 -1
View File
File diff suppressed because one or more lines are too long
umd/src_i18n_min_zh-TW_json.dev.js
+1 -1
View File
File diff suppressed because one or more lines are too long
umd/src_i18n_min_zh_json.dev.js
+1 -1
View File
File diff suppressed because one or more lines are too long
umd/src_views_password-reset-view_jsx.dev.js
+19 -6
View File
@@ -61,10 +61,23 @@ class PasswordResetView extends (react__WEBPACK_IMPORTED_MODULE_0___default().Pu
}
componentDidMount() {
const parsed = _lib_navigation_js__WEBPACK_IMPORTED_MODULE_4__["default"].parseUrlHash(window.location.hash);
this.setState({
const newState = {
token: parsed.params.token,
scheme: parsed.params.scheme
});
scheme: parsed.params.scheme,
code: parsed.params.code || ''
};
this.savedCred = parsed.params.cred;
if (this.props.reqCredMethod && parsed.params.cred) {
newState[this.props.reqCredMethod] = this.savedCred;
}
this.setState(newState);
}
componentDidUpdate(prevProps, prevState) {
if (prevProps.reqCredMethod != this.props.reqCredMethod && this.props.reqCredMethod) {
this.setState({
[this.props.reqCredMethod]: this.savedCred || ''
});
}
}
handleSubmit(e) {
e.preventDefault();
@@ -74,7 +87,7 @@ class PasswordResetView extends (react__WEBPACK_IMPORTED_MODULE_0___default().Pu
secret: this.state.token
});
} else if (this.state.code && this.props.reqCredMethod) {
const cred = this.state.email.trim() || this.state.tel.trim();
const cred = this.props.reqCredMethod == 'email' ? this.state.email.trim() : this.state.tel.trim();
this.props.onReset(this.state.password.trim(), {
scheme: 'code',
secret: btoa(`${this.state.code}:${this.props.reqCredMethod}:${cred}`)
@@ -119,7 +132,7 @@ class PasswordResetView extends (react__WEBPACK_IMPORTED_MODULE_0___default().Pu
});
}
render() {
const showCredentialInput = !(this.state.token && this.state.scheme);
const showCredentialInput = !((this.state.token || this.state.code && this.props.reqCredMethod) && this.state.scheme);
const showPasswordInput = !showCredentialInput || this.state.haveCode || this.state.sent;
const passwordInput = react__WEBPACK_IMPORTED_MODULE_0___default().createElement((react__WEBPACK_IMPORTED_MODULE_0___default().Fragment), null, react__WEBPACK_IMPORTED_MODULE_0___default().createElement("label", {
className: "small gray",
@@ -222,7 +235,7 @@ class PasswordResetView extends (react__WEBPACK_IMPORTED_MODULE_0___default().Pu
onSubmit: this.handleSubmit
}, !this.state.sent && showCredentialInput ? credentialInput : null, this.state.haveCode || this.state.sent ? codeInput : null, showPasswordInput ? passwordInput : null, react__WEBPACK_IMPORTED_MODULE_0___default().createElement("div", {
className: "dialog-buttons"
}, this.state.haveCode || this.state.sent || this.state.token ? null : react__WEBPACK_IMPORTED_MODULE_0___default().createElement("a", {
}, this.state.haveCode || this.state.sent || this.state.token || this.state.code ? null : react__WEBPACK_IMPORTED_MODULE_0___default().createElement("a", {
href: "#",
onClick: this.handleShowCodeField,
style: {
umd/src_views_password-reset-view_jsx.dev.js.map
+1 -1
View File
File diff suppressed because one or more lines are too long
version.js
+1 -1
View File
@@ -1,3 +1,3 @@
// This is a generated file. Don't edit.
const PACKAGE_VERSION = "0.23.0-rc1";
const PACKAGE_VERSION = "0.23.0-rc2";
webpack.config.js
+1
View File
@@ -64,6 +64,7 @@ module.exports = (env, argv) => {
}),
],
externals: {
'livekit-client': 'LivekitClient',
'react': 'React',
'react-dom': 'ReactDOM',
'react-intl': 'ReactIntl',