From b95ad701afcf4cada8c209de505eb53e19bc1e5f Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Sat, 3 Jun 2017 15:17:58 +0100
Subject: [PATCH] match ENUM style to others in project
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
(cherry picked from commit a871815)
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
src/components/views/globals/UpdateCheckBar.js | 8 ++++----
src/vector/platform/ElectronPlatform.js | 6 +++---
src/vector/platform/VectorBasePlatform.js | 8 ++++----
src/vector/platform/WebPlatform.js | 6 +++---
4 files changed, 14 insertions(+), 14 deletions(-)
diff --git a/src/components/views/globals/UpdateCheckBar.js b/src/components/views/globals/UpdateCheckBar.js
index 65fe84c9..95c78cf6 100644
--- a/src/components/views/globals/UpdateCheckBar.js
+++ b/src/components/views/globals/UpdateCheckBar.js
@@ -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;
diff --git a/src/vector/platform/ElectronPlatform.js b/src/vector/platform/ElectronPlatform.js
index 1ed1c0d8..b4f17d6e 100644
--- a/src/vector/platform/ElectronPlatform.js
+++ b/src/vector/platform/ElectronPlatform.js
@@ -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;
});
}
diff --git a/src/vector/platform/VectorBasePlatform.js b/src/vector/platform/VectorBasePlatform.js
index 5ae620cb..0bbcb8f3 100644
--- a/src/vector/platform/VectorBasePlatform.js
+++ b/src/vector/platform/VectorBasePlatform.js
@@ -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',
};
/**
diff --git a/src/vector/platform/WebPlatform.js b/src/vector/platform/WebPlatform.js
index 318a3fe9..dd6b91de 100644
--- a/src/vector/platform/WebPlatform.js
+++ b/src/vector/platform/WebPlatform.js
@@ -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;
});
}