mirror of
https://github.com/SchildiChat/element-web.git
synced 2024-10-01 01:26:12 -04:00
Add a version update checker and NewVersionBar to show on the UI.
This commit is contained in:
parent
deb1aa468f
commit
5eed734325
@ -34,6 +34,7 @@ module.exports.components['views.elements.ImageView'] = require('./components/vi
|
||||
module.exports.components['views.elements.Spinner'] = require('./components/views/elements/Spinner');
|
||||
module.exports.components['views.globals.GuestWarningBar'] = require('./components/views/globals/GuestWarningBar');
|
||||
module.exports.components['views.globals.MatrixToolbar'] = require('./components/views/globals/MatrixToolbar');
|
||||
module.exports.components['views.globals.NewVersionBar'] = require('./components/views/globals/NewVersionBar');
|
||||
module.exports.components['views.login.VectorCustomServerDialog'] = require('./components/views/login/VectorCustomServerDialog');
|
||||
module.exports.components['views.login.VectorLoginFooter'] = require('./components/views/login/VectorLoginFooter');
|
||||
module.exports.components['views.login.VectorLoginHeader'] = require('./components/views/login/VectorLoginHeader');
|
||||
|
36
src/components/views/globals/NewVersionBar.js
Normal file
36
src/components/views/globals/NewVersionBar.js
Normal file
@ -0,0 +1,36 @@
|
||||
/*
|
||||
Copyright 2015, 2016 OpenMarket Ltd
|
||||
|
||||
Licensed under the Apache License, Version 2.0 (the "License");
|
||||
you may not use this file except in compliance with the License.
|
||||
You may obtain a copy of the License at
|
||||
|
||||
http://www.apache.org/licenses/LICENSE-2.0
|
||||
|
||||
Unless required by applicable law or agreed to in writing, software
|
||||
distributed under the License is distributed on an "AS IS" BASIS,
|
||||
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
See the License for the specific language governing permissions and
|
||||
limitations under the License.
|
||||
*/
|
||||
|
||||
'use strict';
|
||||
|
||||
var React = require('react');
|
||||
var sdk = require('matrix-react-sdk')
|
||||
|
||||
module.exports = React.createClass({
|
||||
displayName: 'NewVersionBar',
|
||||
|
||||
render: function() {
|
||||
return (
|
||||
<div className="mx_MatrixToolbar">
|
||||
<img className="mx_MatrixToolbar_warning" src="img/warning.svg" width="24" height="23" alt="/!\"/>
|
||||
<div>
|
||||
A new version of Vector is available. Refresh your browser.
|
||||
</div>
|
||||
</div>
|
||||
);
|
||||
}
|
||||
});
|
||||
|
@ -30,6 +30,7 @@ var sdk = require("matrix-react-sdk");
|
||||
sdk.loadSkin(require('../component-index'));
|
||||
var VectorConferenceHandler = require('../VectorConferenceHandler');
|
||||
var configJson = require("../../config.json");
|
||||
var UpdateChecker = require("./updater");
|
||||
|
||||
var qs = require("querystring");
|
||||
|
||||
@ -105,6 +106,10 @@ function onHashChange(ev) {
|
||||
routeUrl(window.location);
|
||||
}
|
||||
|
||||
function onNewVersion(current, latest) {
|
||||
window.matrixChat.onNewVersion(current, latest);
|
||||
}
|
||||
|
||||
var loaded = false;
|
||||
var lastLoadedScreen = null;
|
||||
|
||||
@ -138,6 +143,8 @@ window.onload = function() {
|
||||
if (!validBrowser) {
|
||||
return;
|
||||
}
|
||||
UpdateChecker.setNewVersionListener(onNewVersion);
|
||||
UpdateChecker.run();
|
||||
routeUrl(window.location);
|
||||
loaded = true;
|
||||
if (lastLoadedScreen) {
|
||||
|
57
src/vector/updater.js
Normal file
57
src/vector/updater.js
Normal file
@ -0,0 +1,57 @@
|
||||
/*
|
||||
Copyright 2016 OpenMarket Ltd
|
||||
|
||||
Licensed under the Apache License, Version 2.0 (the "License");
|
||||
you may not use this file except in compliance with the License.
|
||||
You may obtain a copy of the License at
|
||||
|
||||
http://www.apache.org/licenses/LICENSE-2.0
|
||||
|
||||
Unless required by applicable law or agreed to in writing, software
|
||||
distributed under the License is distributed on an "AS IS" BASIS,
|
||||
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
See the License for the specific language governing permissions and
|
||||
limitations under the License.
|
||||
*/
|
||||
var POKE_RATE_MS = 10 * 60 * 1000; // 10 min
|
||||
var currentVersion = null;
|
||||
var latestVersion = null;
|
||||
var listener = function(){}; // NOP
|
||||
|
||||
module.exports = {
|
||||
setNewVersionListener: function(fn) { // invoked with fn(currentVer, newVer)
|
||||
listener = fn;
|
||||
},
|
||||
|
||||
run: function() {
|
||||
var req = new XMLHttpRequest();
|
||||
req.addEventListener("load", function() {
|
||||
if (!req.responseText) {
|
||||
return;
|
||||
}
|
||||
if (!currentVersion) {
|
||||
currentVersion = req.responseText.trim();
|
||||
}
|
||||
|
||||
if (req.responseText !== latestVersion) {
|
||||
latestVersion = req.responseText.trim();
|
||||
if (module.exports.hasNewVersion()) {
|
||||
console.log("Current=%s Latest=%s", currentVersion, latestVersion);
|
||||
listener(currentVersion, latestVersion);
|
||||
}
|
||||
}
|
||||
});
|
||||
req.open("GET", "version");
|
||||
req.send(); // can't suppress 404s from being logged.
|
||||
|
||||
setTimeout(module.exports.run, POKE_RATE_MS);
|
||||
},
|
||||
|
||||
getCurrentVersion: function() {
|
||||
return currentVersion;
|
||||
},
|
||||
|
||||
hasNewVersion: function() {
|
||||
return currentVersion && latestVersion && (currentVersion !== latestVersion);
|
||||
}
|
||||
};
|
Loading…
Reference in New Issue
Block a user