Refactor settings

Thibaut committed 11 years ago

Commit b898ac11 parent 5c1a9ed5 files · +52 −21Browse files

Unified · Split

5 files

@@ -13,7 +13,7 @@ · 12 unmodified lines
13	13
14	14	@store = new Store
15	15	@appCache = new app.AppCache if app.AppCache.isEnabled()
16		− @settings = new app.Settings
	16	+ @settings = new app.Settings @store
17	17
18	18	@docs = new app.collections.Docs
19	19	@disabledDocs = new app.collections.Docs
@@ -91,10 +91,10 @@ · 71 unmodified lines
91	91	return
92	92
93	93	welcomeBack: ->
94		− @visitCount = @store.get('count') or 0
95		− @store.set 'count', ++@visitCount
96		− new app.views.Notif 'Share', autoHide: null if @visitCount is 5
97		− new app.views.Notif 'Thanks', autoHide: null if @visitCount is 10 or ((n = app.store.get('news')) and n <= 1417305600000)
	94	+ visitCount = @settings.get('count')
	95	+ @settings.set 'count', ++visitCount
	96	+ new app.views.Notif 'Share', autoHide: null if visitCount is 5
	97	+ new app.views.Notif 'Thanks', autoHide: null if visitCount is 10 or ((n = @settings.get('news')) and n <= 1417305600000)
98	98	new app.views.News()
99	99
100	100	reload: ->

@@ -1,25 +1,56 @@
1	1	class app.Settings
	2	+ SETTINGS_KEY = 'settings'
	3	+ DOCS_KEY = 'docs'
	4	+
	5	+ @defaults: ->
	6	+ count: 0
	7	+ hideDisabled: false
	8	+ hideIntro: false
	9	+ news: 0
	10	+
	11	+ constructor: (@store) ->
	12	+ @create() unless @settings = @store.get(SETTINGS_KEY)
	13	+
	14	+ create: ->
	15	+ @settings = @constructor.defaults()
	16	+ @applyLegacyValues @settings
	17	+ @save()
	18	+ return
	19	+
	20	+ applyLegacyValues: (settings) ->
	21	+ for key, v of settings when value = @store.get(key)
	22	+ settings[key] = value
	23	+ @store.del(key)
	24	+ return
	25	+
	26	+ save: ->
	27	+ @store.set SETTINGS_KEY, @settings
	28	+
	29	+ set: (key, value) ->
	30	+ @settings[key] = value
	31	+ @save()
	32	+
	33	+ get: (key) ->
	34	+ @settings[key]
	35	+
2	36	hasDocs: ->
3		− try
4		− !!Cookies.get 'docs'
5		− catch
	37	+ try !!Cookies.get DOCS_KEY
6	38
7	39	getDocs: ->
8	40	try
9		− Cookies.get('docs')?.split('/') or app.config.default_docs
	41	+ Cookies.get(DOCS_KEY)?.split('/') or app.config.default_docs
10	42	catch
11	43	app.config.default_docs
12	44
13	45	setDocs: (docs) ->
14	46	try
15		− Cookies.set 'docs', docs.join('/'),
	47	+ Cookies.set DOCS_KEY, docs.join('/'),
16	48	path: '/'
17	49	expires: 1e8
18	50	catch
19	51	return
20	52
21	53	reset: ->
22		− try
23		− Cookies.expire 'docs'
24		− catch
	54	+ try Cookies.expire DOCS_KEY
	55	+ try @store.del(SETTINGS_KEY)
25	56	return

@@ -19,11 +19,11 @@ class app.views.RootPage extends app.View · 18 unmodified lines
19	19	return
20	20
21	21	setHidden: (value) ->
22		− app.store.set 'hideIntro', value
	22	+ app.settings.set 'hideIntro', value
23	23	return
24	24
25	25	isHidden: ->
26		− app.isSingleDoc() or app.store.get 'hideIntro'
	26	+ app.isSingleDoc() or app.settings.get 'hideIntro'
27	27
28	28	onRoute: ->
29	29

@@ -27,8 +27,8 @@ class app.views.News extends app.views.Notif · 26 unmodified lines
27	27	new Date(app.news[0][0]).getTime()
28	28
29	29	getLastReadTime: ->
30		− app.store.get 'news'
	30	+ app.settings.get 'news'
31	31
32	32	markAllAsRead: ->
33		− app.store.set 'news', @getLastNewsTime() + 1
	33	+ app.settings.set 'news', @getLastNewsTime() + 1
34	34	return

@@ -46,10 +46,10 @@ class app.views.DocList extends app.View · 45 unmodified lines
46	46	return
47	47
48	48	renderDisabledList: ->
49		− if (hidden = app.store.get 'hideDisabled') is true
	49	+ if (hidden = app.settings.get 'hideDisabled') is true
50	50	@removeDisabledList()
51	51	else
52		− app.store.set 'hideDisabled', false unless hidden is false
	52	+ app.settings.set 'hideDisabled', false unless hidden is false
53	53	@appendDisabledList()
54	54	return
55	55
@@ -129,10 +129,10 @@ class app.views.DocList extends app.View · 73 unmodified lines
129	129
130	130	if @disabledTitle.classList.contains('open-title')
131	131	@removeDisabledList()
132		− app.store.set 'hideDisabled', true
	132	+ app.settings.set 'hideDisabled', true
133	133	else
134	134	@appendDisabledList()
135		− app.store.set 'hideDisabled', false
	135	+ app.settings.set 'hideDisabled', false
136	136
137	137
138	138	afterRoute: (route, context) =>