diff options
-rw-r--r-- | package-lock.json | 44 | ||||
-rw-r--r-- | package.json | 10 | ||||
-rw-r--r-- | src/stores/SettingsStore.js | 8 |
3 files changed, 44 insertions, 18 deletions
diff --git a/package-lock.json b/package-lock.json index 16a91c031..67ca6c463 100644 --- a/package-lock.json +++ b/package-lock.json | |||
@@ -8721,21 +8721,35 @@ | |||
8721 | } | 8721 | } |
8722 | }, | 8722 | }, |
8723 | "mobx": { | 8723 | "mobx": { |
8724 | "version": "3.6.2", | 8724 | "version": "5.7.0", |
8725 | "resolved": "http://registry.npmjs.org/mobx/-/mobx-3.6.2.tgz", | 8725 | "resolved": "https://registry.npmjs.org/mobx/-/mobx-5.7.0.tgz", |
8726 | "integrity": "sha512-Dq3boJFLpZEvuh5a/MbHLUIyN9XobKWIb0dBfkNOJffNkE3vtuY0C9kSDVpfH8BB0BPkVw8g22qCv7d05LEhKg==" | 8726 | "integrity": "sha512-i+EwjPLq/QSvOFtAuhcd5FFWDxWK3gCJCFbW5dhgc4wsaHB/cL6DEVms3vZDgc2txWcfzjYWfknjggE/c0c4fw==" |
8727 | }, | 8727 | }, |
8728 | "mobx-localstorage": { | 8728 | "mobx-localstorage": { |
8729 | "version": "0.1.7", | 8729 | "version": "1.1.0", |
8730 | "resolved": "https://registry.npmjs.org/mobx-localstorage/-/mobx-localstorage-0.1.7.tgz", | 8730 | "resolved": "https://registry.npmjs.org/mobx-localstorage/-/mobx-localstorage-1.1.0.tgz", |
8731 | "integrity": "sha1-wMZDZnafOQykozP0GRLq4AzUqd4=" | 8731 | "integrity": "sha512-R/7hN34XC6kCzXFIYM3E+GKJT+2lUIrqK+7tdqjUFoh5asOFd0trJt4TYxdLy+7UG2UlFzTKpYCyUgZNrsTl2g==", |
8732 | "requires": { | ||
8733 | "reactive-localstorage": "^0.0.2" | ||
8734 | } | ||
8732 | }, | 8735 | }, |
8733 | "mobx-react": { | 8736 | "mobx-react": { |
8734 | "version": "4.4.3", | 8737 | "version": "5.4.2", |
8735 | "resolved": "http://registry.npmjs.org/mobx-react/-/mobx-react-4.4.3.tgz", | 8738 | "resolved": "https://registry.npmjs.org/mobx-react/-/mobx-react-5.4.2.tgz", |
8736 | "integrity": "sha1-uqnsQRZe41rnud8ZvKEBkPNvEX4=", | 8739 | "integrity": "sha512-alSN0KDAAOb1OkYujfoJjjk0JWxWRKO4sLGB4hN2CuvaJMrlj7bhGQe7CBMJvEFNjtJRbhJcquYVjQ3rrH2zQQ==", |
8737 | "requires": { | 8740 | "requires": { |
8738 | "hoist-non-react-statics": "^2.3.1" | 8741 | "hoist-non-react-statics": "^3.0.0", |
8742 | "react-lifecycles-compat": "^3.0.2" | ||
8743 | }, | ||
8744 | "dependencies": { | ||
8745 | "hoist-non-react-statics": { | ||
8746 | "version": "3.2.1", | ||
8747 | "resolved": "https://registry.npmjs.org/hoist-non-react-statics/-/hoist-non-react-statics-3.2.1.tgz", | ||
8748 | "integrity": "sha512-TFsu3TV3YLY+zFTZDrN8L2DTFanObwmBLpWvJs1qfUuEQ5bTAdFcwfx2T/bsCXfM9QHSLvjfP+nihEl0yvozxw==", | ||
8749 | "requires": { | ||
8750 | "react-is": "^16.3.2" | ||
8751 | } | ||
8752 | } | ||
8739 | } | 8753 | } |
8740 | }, | 8754 | }, |
8741 | "mobx-react-form": { | 8755 | "mobx-react-form": { |
@@ -9966,6 +9980,11 @@ | |||
9966 | "invariant": "^2.1.1" | 9980 | "invariant": "^2.1.1" |
9967 | } | 9981 | } |
9968 | }, | 9982 | }, |
9983 | "react-is": { | ||
9984 | "version": "16.6.3", | ||
9985 | "resolved": "https://registry.npmjs.org/react-is/-/react-is-16.6.3.tgz", | ||
9986 | "integrity": "sha512-u7FDWtthB4rWibG/+mFbVd5FvdI20yde86qKGx4lVUTWmPlSWQ4QxbBIrrs+HnXGbxOUlUzTAP/VDmvCwaP2yA==" | ||
9987 | }, | ||
9969 | "react-jss": { | 9988 | "react-jss": { |
9970 | "version": "8.6.1", | 9989 | "version": "8.6.1", |
9971 | "resolved": "https://registry.npmjs.org/react-jss/-/react-jss-8.6.1.tgz", | 9990 | "resolved": "https://registry.npmjs.org/react-jss/-/react-jss-8.6.1.tgz", |
@@ -10052,6 +10071,11 @@ | |||
10052 | "react-lifecycles-compat": "^3.0.4" | 10071 | "react-lifecycles-compat": "^3.0.4" |
10053 | } | 10072 | } |
10054 | }, | 10073 | }, |
10074 | "reactive-localstorage": { | ||
10075 | "version": "0.0.2", | ||
10076 | "resolved": "https://registry.npmjs.org/reactive-localstorage/-/reactive-localstorage-0.0.2.tgz", | ||
10077 | "integrity": "sha512-+3oKBiiNxBbLH9mWw6eiBOAbwQSg3xpRIg7ys+E5Zc98DKQ1zyoUcQygWDDwZAn6mka2kWTaZD+ZUSgmV2VzLA==" | ||
10078 | }, | ||
10055 | "read-config-file": { | 10079 | "read-config-file": { |
10056 | "version": "3.2.0", | 10080 | "version": "3.2.0", |
10057 | "resolved": "https://registry.npmjs.org/read-config-file/-/read-config-file-3.2.0.tgz", | 10081 | "resolved": "https://registry.npmjs.org/read-config-file/-/read-config-file-3.2.0.tgz", |
diff --git a/package.json b/package.json index 601ea3d4c..03a584267 100644 --- a/package.json +++ b/package.json | |||
@@ -55,11 +55,11 @@ | |||
55 | "mime-types": "2.1.21", | 55 | "mime-types": "2.1.21", |
56 | "minimist": "^1.2.0", | 56 | "minimist": "^1.2.0", |
57 | "mkdirp": "^0.5.1", | 57 | "mkdirp": "^0.5.1", |
58 | "mobx": "^3.1.0", | 58 | "mobx": "5.7.0", |
59 | "mobx-localstorage": "^0.1.7", | 59 | "mobx-localstorage": "1.1.0", |
60 | "mobx-react": "^4.1.0", | 60 | "mobx-react": "5.4.2", |
61 | "mobx-react-form": "^1.32.2", | 61 | "mobx-react-form": "1.35.1", |
62 | "mobx-react-router": "^3.1.2", | 62 | "mobx-react-router": "3.1.2", |
63 | "moment": "^2.17.1", | 63 | "moment": "^2.17.1", |
64 | "normalize-url": "^1.9.1", | 64 | "normalize-url": "^1.9.1", |
65 | "pretty-bytes": "^4.0.2", | 65 | "pretty-bytes": "^4.0.2", |
diff --git a/src/stores/SettingsStore.js b/src/stores/SettingsStore.js index ee391f5d3..a456195bf 100644 --- a/src/stores/SettingsStore.js +++ b/src/stores/SettingsStore.js | |||
@@ -1,5 +1,7 @@ | |||
1 | import { ipcRenderer } from 'electron'; | 1 | import { ipcRenderer } from 'electron'; |
2 | import { action, computed, observable } from 'mobx'; | 2 | import { |
3 | action, computed, observable, set, | ||
4 | } from 'mobx'; | ||
3 | import localStorage from 'mobx-localstorage'; | 5 | import localStorage from 'mobx-localstorage'; |
4 | 6 | ||
5 | import Store from './lib/Store'; | 7 | import Store from './lib/Store'; |
@@ -17,7 +19,7 @@ export default class SettingsStore extends Store { | |||
17 | 19 | ||
18 | @observable updateAppSettingsRequest = new Request(this.api.local, 'updateAppSettings'); | 20 | @observable updateAppSettingsRequest = new Request(this.api.local, 'updateAppSettings'); |
19 | 21 | ||
20 | @observable fileSystemSettingsRequests = []; | 22 | fileSystemSettingsRequests = []; |
21 | 23 | ||
22 | fileSystemSettingsTypes = FILE_SYSTEM_SETTINGS_TYPES; | 24 | fileSystemSettingsTypes = FILE_SYSTEM_SETTINGS_TYPES; |
23 | 25 | ||
@@ -115,7 +117,7 @@ export default class SettingsStore extends Store { | |||
115 | data, | 117 | data, |
116 | }); | 118 | }); |
117 | 119 | ||
118 | Object.assign(this._fileSystemSettingsCache[type], data); | 120 | set(this._fileSystemSettingsCache[type], data); |
119 | } | 121 | } |
120 | } | 122 | } |
121 | 123 | ||