Kai/habitica
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'release' into develop

Browse Source
This commit is contained in:
Sabe Jones
2017-10-26 22:47:18 +00:00
parent feb7ab8345 b31268fbc2
commit bea813b318
3 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
package-lock.json
Generated
+1 -1
View File
@@ -1,6 +1,6 @@
{
"name": "habitica",
"version": "4.6.2",
"version": "4.6.3",
"lockfileVersion": 1,
"requires": true,
"dependencies": {
package.json
+1 -1
View File
@@ -1,7 +1,7 @@
{
"name": "habitica",
"description": "A habit tracker app which treats your goals like a Role Playing Game.",
"version": "4.6.2",
"version": "4.6.3",
"main": "./website/server/index.js",
"dependencies": {
"@slack/client": "^3.8.1",
website/client/app.vue
+9 -9
View File
@@ -214,15 +214,15 @@ export default {
}
// Verify the client is updated
const serverAppVersion = response.data.appVersion;
let serverAppVersionState = this.$store.state.serverAppVersion;
if (isApiCall && !serverAppVersionState) {
this.$store.state.serverAppVersion = serverAppVersion;
} else if (isApiCall && serverAppVersionState !== serverAppVersion) {
if (document.activeElement.tagName !== 'INPUT' || confirm(this.$t('habiticaHasUpdated'))) {
location.reload(true);
}
}
// const serverAppVersion = response.data.appVersion;
// let serverAppVersionState = this.$store.state.serverAppVersion;
// if (isApiCall && !serverAppVersionState) {
// this.$store.state.serverAppVersion = serverAppVersion;
// } else if (isApiCall && serverAppVersionState !== serverAppVersion) {
// if (document.activeElement.tagName !== 'INPUT' || confirm(this.$t('habiticaHasUpdated'))) {
// location.reload(true);
// }
// }
return response;
});