0x2620/openmedialibrary
1
0
Fork 0
Code Issues 131 Pull requests Releases Wiki Activity

import/export

Browse source
This commit is contained in:
j 2014-05-17 10:17:34 +02:00
commit bceb5e6d4a
14 changed files with 450 additions and 148 deletions
Download patch file Download diff file Expand all files Collapse all files

22
static/js/oml.js
View file

@ -37,16 +37,18 @@
config: data.config,
user: data.user
});
// make sure all valid ui settings are present
oml.user.ui = Ox.extend(
Ox.clone(data.config.user.ui, true),
oml.user.ui
);
// make sure no invalid ui settings are present
Object.keys(oml.user.ui).forEach(function(key) {
if (Ox.isUndefined(oml.config.user.ui[key])) {
delete oml.user.ui[key];
}
['preferences', 'ui'].forEach(function(key) {
// make sure all valid settings are present
oml.user[key] = Ox.extend(
Ox.clone(data.config.user[key], true),
oml.user[key]
);
// make sure no invalid settings are present
Object.keys(oml.user[key]).forEach(function(key_) {
if (Ox.isUndefined(oml.config.user[key][key_])) {
delete oml.user[key][key_];
}
});
});
// TODO: make sure listView, listSort and itemView are valid
Ox.extend(oml.config, {