Skip to content

Commit 36ba509

Browse files
committed
Added desktop iconview toggle
Ref: os-js/osjs-client#51
1 parent 9603921 commit 36ba509

File tree

1 file changed

+21
-5
lines changed

1 file changed

+21
-5
lines changed

index.js

Lines changed: 21 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -91,6 +91,10 @@ const resolve = (tree, key, defaultValue) => {
9191
const resolveSetting = (settings, defaults) => key =>
9292
resolve(settings, key, resolve(defaults, key));
9393

94+
const resolveValue = (key, value) => key === 'desktop.iconview.enabled' // FIXME
95+
? value === 'true'
96+
: value;
97+
9498
// Resolves a new value in our tree
9599
// FIXME: There must be a better way
96100
const resolveNewSetting = state => (key, value) => {
@@ -99,11 +103,11 @@ const resolveNewSetting = state => (key, value) => {
99103

100104
let previous = object;
101105
for (let i = 0; i < keys.length; i++) {
102-
const key = keys[i];
106+
const j = keys[i];
103107
const last = i >= keys.length - 1;
104108

105-
previous[key] = last ? value : {};
106-
previous = previous[key];
109+
previous[j] = last ? resolveValue(key, value) : {};
110+
previous = previous[j];
107111
}
108112

109113
const settings = merge(state.settings, object);
@@ -177,6 +181,20 @@ const tabSections = [{
177181
type: 'select',
178182
choices: state => state.themes.sounds
179183
}]
184+
}, {
185+
title: 'Desktop',
186+
items: [{
187+
label: 'Enable desktop icons',
188+
path: 'desktop.iconview.enabled',
189+
type: 'select',
190+
choices: () => ([{
191+
label: 'Yes',
192+
value: 'true'
193+
}, {
194+
label: 'No',
195+
value: 'false'
196+
}])
197+
}]
180198
}, {
181199
title: 'Locales',
182200
items: [{
@@ -325,8 +343,6 @@ const renderWindow = (core, proc) => ($content, win) => {
325343
const refresh = () => instance.refresh();
326344

327345
win.on('settings/refresh', refresh);
328-
329-
console.warn(initialState);
330346
};
331347

332348
// Creates our application

0 commit comments

Comments
 (0)