Skip to content

Commit 6b85957

Browse files
or-elseor-else
committed
merge devel
2 parents 07aa38e + aa45194 commit 6b85957

File tree

14 files changed

+1130
-949
lines changed

14 files changed

+1130
-949
lines changed

‎index.html‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,8 @@
2525
<script crossorigin="anonymous" src="https://cdn.jsdelivr.net/npm/[email protected]/umd/react.production.min.js"></script>
2626
<script crossorigin="anonymous" src="https://cdn.jsdelivr.net/npm/[email protected]/umd/react-dom.production.min.js"></script>
2727
<script crossorigin="anonymous" src="https://cdn.jsdelivr.net/npm/[email protected]/react-intl.iife.min.js"></script>
28-
<script crossorigin="anonymous" src="https://cdn.jsdelivr.net/npm/firebase@8.6.7/firebase-app.js"></script>
29-
<script crossorigin="anonymous" src="https://cdn.jsdelivr.net/npm/firebase@8.6.7/firebase-messaging.js"></script>
28+
<script crossorigin="anonymous" src="https://cdn.jsdelivr.net/npm/firebase@8.7.1/firebase-app.js"></script>
29+
<script crossorigin="anonymous" src="https://cdn.jsdelivr.net/npm/firebase@8.7.1/firebase-messaging.js"></script>
3030
</head>
3131
<body>
3232
<noscript><div id="noscript-message"><div id="noscript-title">Javascript support is required.</div>

‎package-lock.json‎

Lines changed: 1069 additions & 923 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎package.json‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "tinode-webapp",
33
"description": "Tinode messenger for the web",
4-
"version": "0.17.5",
4+
"version": "0.17.6",
55
"repository": {
66
"type": "git",
77
"url": "https://github.com/tinode/example-react-js.git"
@@ -63,11 +63,11 @@
6363
"author": "Tinode Authors <[email protected]>",
6464
"license": "Apache-2.0",
6565
"dependencies": {
66-
"firebase": "^8.6.7",
66+
"firebase": "^8.7.1",
6767
"react": "^17.0.1",
6868
"react-dom": "^17.0.1",
6969
"react-intl": "^5.20.2",
70-
"tinode-sdk": "^0.17.5"
70+
"tinode-sdk": "^0.17.6"
7171
},
7272
"devDependencies": {
7373
"@babel/core": "^7.14.5",

‎service-worker.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
// Must be located at the root.
2-
importScripts('https://cdn.jsdelivr.net/npm/firebase@8.6.7/firebase-app.js');
3-
importScripts('https://cdn.jsdelivr.net/npm/firebase@8.6.7/firebase-messaging.js');
2+
importScripts('https://cdn.jsdelivr.net/npm/firebase@8.7.1/firebase-app.js');
3+
importScripts('https://cdn.jsdelivr.net/npm/firebase@8.7.1/firebase-messaging.js');
44
importScripts('firebase-init.js');
55
importScripts('version.js');
66

‎src/index.js‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,10 @@ const messages =
2929
allMessages.en;
3030

3131
ReactDOM.render(
32-
<IntlProvider locale={language} messages={messages} textComponent={React.Fragment}>
33-
<TinodeWeb />
34-
</IntlProvider>,
32+
<React.StrictMode>
33+
<IntlProvider locale={language} messages={messages} textComponent={React.Fragment}>
34+
<TinodeWeb />
35+
</IntlProvider>
36+
</React.StrictMode>,
3537
document.getElementById('mountPoint')
3638
);

‎src/version.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
// This is a generated file. Don't edit.
22

3-
export const PACKAGE_VERSION = "0.17.5";
3+
export const PACKAGE_VERSION = "0.17.6";

‎src/views/tinode-web.jsx‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1253,6 +1253,8 @@ class TinodeWeb extends React.Component {
12531253
this.fbPush.deleteToken(this.state.firebaseToken)
12541254
}
12551255

1256+
clearInterval(this.reconnectCountdown);
1257+
12561258
if (this.tinode) {
12571259
this.tinode.clearStorage();
12581260
this.tinode.onDisconnect = undefined;

‎umd/index.dev.js‎

Lines changed: 5 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎umd/index.dev.js.map‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎umd/index.prod.js‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)