PrivateCoffee/element-web
4
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 3

match ENUM style to others in project

Browse source 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>

(cherry picked from commit a871815)
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
This commit is contained in:
Michael Telatynski 2017-06-03 15:17:58 +01:00
parent efc68c078e
commit b95ad701af
4 changed files with 14 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/components/views/globals/UpdateCheckBar.js
View file

@ -39,18 +39,18 @@ export default React.createClass({
console.log('checkForUpdate done, ', state);
// We will be replaced by NewVersionBar
if (state === updateStateEnum.Ready) return;
if (state === updateStateEnum.READY) return;
let done = true;
let message;
switch (state) {
case updateStateEnum.Error:
case updateStateEnum.ERROR:
message = 'Error encountered when checking for an update';
break;
case updateStateEnum.NotAvailable:
case updateStateEnum.NOTAVAILABLE:
message = 'No update found';
break;
case updateStateEnum.Downloading:
case updateStateEnum.DOWNLOADING:
message = 'Update is being downloaded';
done = false;
break;

6
src/vector/platform/ElectronPlatform.js
View file

@ -143,12 +143,12 @@ export default class ElectronPlatform extends VectorBasePlatform {
const _onUpdateAvailable = function() {
electron.autoUpdater.removeListener('update-not-available', _onUpdateNotAvailable);
deferred.resolve(updateStateEnum.Downloading);
deferred.resolve(updateStateEnum.DOWNLOADING);
}
const _onUpdateNotAvailable = function() {
electron.autoUpdater.removeListener('update-available', _onUpdateAvailable);
deferred.resolve(updateStateEnum.NotAvailable);
deferred.resolve(updateStateEnum.NOTAVAILABLE);
}
electron.autoUpdater.once('update-available', _onUpdateAvailable);
@ -158,7 +158,7 @@ export default class ElectronPlatform extends VectorBasePlatform {
return deferred.promise.timeout(10000).catch(() => {
electron.autoUpdater.removeListener('update-not-available', _onUpdateNotAvailable);
electron.autoUpdater.removeListener('update-available', _onUpdateAvailable);
return updateStateEnum.Error;
return updateStateEnum.ERROR;
});
}

8
src/vector/platform/VectorBasePlatform.js
View file

@ -23,10 +23,10 @@ import { _t } from 'matrix-react-sdk/lib/languageHandler';
import Favico from 'favico.js';
export const updateStateEnum = {
Error: -1,
NotAvailable: 0,
Downloading: 1,
Ready: 2,
ERROR: 'ERROR',
NOTAVAILABLE: 'NOTAVAILABLE',
DOWNLOADING: 'DOWNLOADING',
READY: 'READY',
};
/**

6
src/vector/platform/WebPlatform.js
View file

@ -149,12 +149,12 @@ export default class WebPlatform extends VectorBasePlatform {
currentVersion: this.runningVersion,
newVersion: ver,
});
return updateStateEnum.Ready;
return updateStateEnum.READY;
}
return updateStateEnum.NotAvailable;
return updateStateEnum.NOTAVAILABLE;
}, (err) => {
console.error("Failed to poll for update", err);
return updateStateEnum.Error;
return updateStateEnum.ERROR;
});
}