Skip to content
Snippets Groups Projects
Commit 63e175dd authored by Benoit Lavenier's avatar Benoit Lavenier
Browse files

[fix] Settings: use relative unit must be changed by user - fix #812

parent f5ac9b15
No related branches found
No related tags found
No related merge requests found
...@@ -56,7 +56,6 @@ angular.module('cesium.settings.services', ['ngApi', 'cesium.config']) ...@@ -56,7 +56,6 @@ angular.module('cesium.settings.services', ['ngApi', 'cesium.config'])
fixedSettings = { fixedSettings = {
timeout : 4000, timeout : 4000,
cacheTimeMs: 60000, /*1 min*/ cacheTimeMs: 60000, /*1 min*/
useRelative: false,
timeWarningExpireMembership: 2592000 * 2 /*=2 mois*/, timeWarningExpireMembership: 2592000 * 2 /*=2 mois*/,
timeWarningExpire: 2592000 * 3 /*=3 mois*/, timeWarningExpire: 2592000 * 3 /*=3 mois*/,
minVersion: '1.1.0', minVersion: '1.1.0',
...@@ -67,6 +66,7 @@ angular.module('cesium.settings.services', ['ngApi', 'cesium.config']) ...@@ -67,6 +66,7 @@ angular.module('cesium.settings.services', ['ngApi', 'cesium.config'])
httpsMode: false httpsMode: false
}, },
defaultSettings = angular.merge({ defaultSettings = angular.merge({
useRelative: false,
useLocalStorage: true, // override to false if no device useLocalStorage: true, // override to false if no device
useLocalStorageEncryption: false, useLocalStorageEncryption: false,
walletHistoryTimeSecond: 30 * 24 * 60 * 60 /*30 days*/, walletHistoryTimeSecond: 30 * 24 * 60 * 60 /*30 days*/,
...@@ -146,8 +146,8 @@ angular.module('cesium.settings.services', ['ngApi', 'cesium.config']) ...@@ -146,8 +146,8 @@ angular.module('cesium.settings.services', ['ngApi', 'cesium.config'])
emitChangedEvent = function() { emitChangedEvent = function() {
var hasChanged = previousData && !angular.equals(previousData, data); var hasChanged = previousData && !angular.equals(previousData, data);
previousData = angular.copy(data);
if (hasChanged) { if (hasChanged) {
previousData = angular.copy(data);
return api.data.raise.changed(data); return api.data.raise.changed(data);
} }
}, },
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment