decentral1se/pandora
1
0
Fork 0
forked from 0x2620/pandora
Code Issues Pull requests Projects Releases Wiki Activity

clean up ui settings on load; make show/hide video timeline work via menu and keyboard

Browse source
This commit is contained in:
rolux 2011-11-05 22:14:10 +00:00
commit 8caa57d33e
4 changed files with 28 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

7
static/js/pandora.js
View file

@ -204,9 +204,16 @@ appPanel
user: data.user
});
// make sure all valid ui settings are present
pandora.user.ui = Ox.extend(
Ox.clone(pandora.site.user.ui), pandora.user.ui
);
// make sure no invalid ui settings are present
Object.keys(pandora.user.ui).forEach(function(key) {
if (Ox.isUndefined(pandora.site.user.ui[key])) {
delete pandora.user.ui[key];
}
});
Ox.extend(pandora.site, {
clipKeys: Ox.map(data.site.clipKeys, function(key) {