merge devel

This commit is contained in:
or-else
2021-07-10 17:26:20 -07:00
14 changed files with 1128 additions and 947 deletions
+2 -2
View File
@@ -25,8 +25,8 @@
<script crossorigin="anonymous" src="https://cdn.jsdelivr.net/npm/react@17.0.1/umd/react.production.min.js"></script>
<script crossorigin="anonymous" src="https://cdn.jsdelivr.net/npm/react-dom@17.0.1/umd/react-dom.production.min.js"></script>
<script crossorigin="anonymous" src="https://cdn.jsdelivr.net/npm/react-intl@5.18.3/react-intl.iife.min.js"></script>
<script crossorigin="anonymous" src="https://cdn.jsdelivr.net/npm/firebase@8.6.7/firebase-app.js"></script>
<script crossorigin="anonymous" src="https://cdn.jsdelivr.net/npm/firebase@8.6.7/firebase-messaging.js"></script>
<script crossorigin="anonymous" src="https://cdn.jsdelivr.net/npm/firebase@8.7.1/firebase-app.js"></script>
<script crossorigin="anonymous" src="https://cdn.jsdelivr.net/npm/firebase@8.7.1/firebase-messaging.js"></script>
</head>
<body>
<noscript><div id="noscript-message"><div id="noscript-title">Javascript support is required.</div>
+1067 -921
View File
File diff suppressed because it is too large Load Diff
+3 -3
View File
@@ -1,7 +1,7 @@
{
"name": "tinode-webapp",
"description": "Tinode messenger for the web",
"version": "0.17.5",
"version": "0.17.6",
"repository": {
"type": "git",
"url": "https://github.com/tinode/example-react-js.git"
@@ -63,11 +63,11 @@
"author": "Tinode Authors <info@tinode.co>",
"license": "Apache-2.0",
"dependencies": {
"firebase": "^8.6.7",
"firebase": "^8.7.1",
"react": "^17.0.1",
"react-dom": "^17.0.1",
"react-intl": "^5.20.2",
"tinode-sdk": "^0.17.5"
"tinode-sdk": "^0.17.6"
},
"devDependencies": {
"@babel/core": "^7.14.5",
+2 -2
View File
@@ -1,6 +1,6 @@
// Must be located at the root.
importScripts('https://cdn.jsdelivr.net/npm/firebase@8.6.7/firebase-app.js');
importScripts('https://cdn.jsdelivr.net/npm/firebase@8.6.7/firebase-messaging.js');
importScripts('https://cdn.jsdelivr.net/npm/firebase@8.7.1/firebase-app.js');
importScripts('https://cdn.jsdelivr.net/npm/firebase@8.7.1/firebase-messaging.js');
importScripts('firebase-init.js');
importScripts('version.js');
+5 -3
View File
@@ -29,8 +29,10 @@ const messages =
allMessages.en;
ReactDOM.render(
<IntlProvider locale={language} messages={messages} textComponent={React.Fragment}>
<TinodeWeb />
</IntlProvider>,
<React.StrictMode>
<IntlProvider locale={language} messages={messages} textComponent={React.Fragment}>
<TinodeWeb />
</IntlProvider>
</React.StrictMode>,
document.getElementById('mountPoint')
);
+1 -1
View File
@@ -1,3 +1,3 @@
// This is a generated file. Don't edit.
export const PACKAGE_VERSION = "0.17.5";
export const PACKAGE_VERSION = "0.17.6";
+2
View File
@@ -1253,6 +1253,8 @@ class TinodeWeb extends React.Component {
this.fbPush.deleteToken(this.state.firebaseToken)
}
clearInterval(this.reconnectCountdown);
if (this.tinode) {
this.tinode.clearStorage();
this.tinode.onDisconnect = undefined;
+5 -3
View File
@@ -721,7 +721,7 @@ __webpack_require__.r(__webpack_exports__);
/* harmony export */ __webpack_require__.d(__webpack_exports__, {
/* harmony export */ "PACKAGE_VERSION": () => (/* binding */ PACKAGE_VERSION)
/* harmony export */ });
const PACKAGE_VERSION = "0.17.5";
const PACKAGE_VERSION = "0.17.6";
/***/ }),
@@ -6125,6 +6125,8 @@ class TinodeWeb extends (react__WEBPACK_IMPORTED_MODULE_0___default().Component)
this.fbPush.deleteToken(this.state.firebaseToken);
}
clearInterval(this.reconnectCountdown);
if (this.tinode) {
this.tinode.clearStorage();
this.tinode.onDisconnect = undefined;
@@ -11336,11 +11338,11 @@ const {
const language = params && params.hl || navigator.languages && navigator.languages[0] || navigator.language || navigator.userLanguage || 'en';
const baseLanguage = language.toLowerCase().split(/[-_]/)[0];
const messages = _messages_json__WEBPACK_IMPORTED_MODULE_3__[language] || _messages_json__WEBPACK_IMPORTED_MODULE_3__[baseLanguage] || _messages_json__WEBPACK_IMPORTED_MODULE_3__.en;
react_dom__WEBPACK_IMPORTED_MODULE_1___default().render(react__WEBPACK_IMPORTED_MODULE_0___default().createElement(react_intl__WEBPACK_IMPORTED_MODULE_2__.IntlProvider, {
react_dom__WEBPACK_IMPORTED_MODULE_1___default().render(react__WEBPACK_IMPORTED_MODULE_0___default().createElement((react__WEBPACK_IMPORTED_MODULE_0___default().StrictMode), null, react__WEBPACK_IMPORTED_MODULE_0___default().createElement(react_intl__WEBPACK_IMPORTED_MODULE_2__.IntlProvider, {
locale: language,
messages: messages,
textComponent: (react__WEBPACK_IMPORTED_MODULE_0___default().Fragment)
}, react__WEBPACK_IMPORTED_MODULE_0___default().createElement(_views_tinode_web_jsx__WEBPACK_IMPORTED_MODULE_4__.default, null)), document.getElementById('mountPoint'));
}, react__WEBPACK_IMPORTED_MODULE_0___default().createElement(_views_tinode_web_jsx__WEBPACK_IMPORTED_MODULE_4__.default, null))), document.getElementById('mountPoint'));
})();
/******/ })()
+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
+36 -7
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
@@ -1,3 +1,3 @@
// This is a generated file. Don't edit.
const PACKAGE_VERSION = "0.17.5";
const PACKAGE_VERSION = "0.17.6";