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

save UI state

Browse source
This commit is contained in:
rlx 2011-01-15 14:22:29 +00:00
parent 5e7f95c9e5
commit c8aa818fed
7 changed files with 259 additions and 169 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
pandora/app/models.py
View file

@ -29,4 +29,7 @@ def site_config():
site_config['keys'] = {} site_config['keys'] = {}
for key in site_config['sortKeys']: for key in site_config['sortKeys']:
site_config['keys'][key['id']] = key site_config['keys'][key['id']] = key
site_config['_findKeys'] = {}
for key in site_config['findKeys']:
site_config['_findKeys'][key['id']] = key
return site_config return site_config

4
pandora/item/models.py
View file

@ -343,7 +343,7 @@ class Item(models.Model):
def save(key, value): def save(key, value):
f, created = ItemFind.objects.get_or_create(item=self, key=key) f, created = ItemFind.objects.get_or_create(item=self, key=key)
if value not in ('', '||'): if value not in ('', '||'):
f.value = value f.value = value.strip()
f.save() f.save()
else: else:
f.delete() f.delete()
@ -785,6 +785,8 @@ class ItemFind(models.Model):
key = models.CharField(max_length=200, db_index=True) key = models.CharField(max_length=200, db_index=True)
value = models.TextField(blank=True) value = models.TextField(blank=True)
def __unicode__(self):
return u"%s=%s" % (self.key, self.value)
''' '''
ItemSort ItemSort
table constructed based on info in site_config['sortKeys'] table constructed based on info in site_config['sortKeys']

12
pandora/item/views.py
View file

@ -239,8 +239,13 @@ def autocomplete(request):
op = data.get('operator', '') op = data.get('operator', '')
site_config = models.site_config() site_config = models.site_config()
order_by = site_config['_findKeys'].get(data['key'], {}).get('autocompleteSortKey', False)
if order_by:
order_by = '-sort__%s_desc' % order_by
else:
order_by = '-items'
if site_config['keys'][data['key']]['type'] == 'title': if site_config['keys'][data['key']]['type'] == 'title':
qs = models.Item.objects.filter(available=True) #does this need more limiting? user etc qs = _parse_query({'query': data.get('query', {})}, request.user)['qs']
if data['value']: if data['value']:
if op == '': if op == '':
qs = qs.filter(find__key=data['key'], find__value__icontains=data['value']) qs = qs.filter(find__key=data['key'], find__value__icontains=data['value'])
@ -248,7 +253,7 @@ def autocomplete(request):
qs = qs.filter(find__key=data['key'], find__value__istartswith=data['value']) qs = qs.filter(find__key=data['key'], find__value__istartswith=data['value'])
elif op == '$': elif op == '$':
qs = qs.filter(find__key=data['key'], find__value__iendswith=data['value']) qs = qs.filter(find__key=data['key'], find__value__iendswith=data['value'])
qs = qs.order_by('-sort__%s'%site_config['keys'][data['key']]['autocompleteSortKey']) qs = qs.order_by(order_by)
qs = qs[data['range'][0]:data['range'][1]] qs = qs[data['range'][0]:data['range'][1]]
response = json_response({}) response = json_response({})
response['data']['items'] = [i.get(data['key']) for i in qs] response['data']['items'] = [i.get(data['key']) for i in qs]
@ -261,7 +266,8 @@ def autocomplete(request):
qs = qs.filter(value__istartswith=data['value']) qs = qs.filter(value__istartswith=data['value'])
elif op == '$': elif op == '$':
qs = qs.filter(value__iendswith=data['value']) qs = qs.filter(value__iendswith=data['value'])
qs = qs.values('value').annotate(items=Count('id')).order_by('-items') qs = qs.values('value').annotate(items=Count('id'))
qs = qs.order_by(order_by)
qs = qs[data['range'][0]:data['range'][1]] qs = qs[data['range'][0]:data['range'][1]]
response = json_response({}) response = json_response({})
response['data']['items'] = [i['value'] for i in qs] response['data']['items'] = [i['value'] for i in qs]

4
pandora/templates/site.json
View file

@ -1,7 +1,7 @@
{ {
"findKeys": [ "findKeys": [
{"id": "all", "title": "All"}, {"id": "all", "title": "All"},
{"id": "title", "title": "Title", "autocomplete": true}, {"id": "title", "title": "Title", "autocomplete": true, "autocompleteSortKey": "votes"},
{"id": "director", "title": "Director", "autocomplete": true}, {"id": "director", "title": "Director", "autocomplete": true},
{"id": "country", "title": "Country", "autocomplete": true}, {"id": "country", "title": "Country", "autocomplete": true},
{"id": "year", "title": "Year", "autocomplete": true}, {"id": "year", "title": "Year", "autocomplete": true},
@ -73,7 +73,7 @@
{"id": "featured", "title": "Featured Lists"} {"id": "featured", "title": "Featured Lists"}
], ],
"sortKeys": [ "sortKeys": [
{"id": "title", "title": "Title", "width": 180, "removable": false, "type": "title", "autocompleteSortKey": "votes"}, {"id": "title", "title": "Title", "width": 180, "removable": false, "type": "title"},
{"id": "director", "title": "Director", "width": 180, "removable": false, "type": "person"}, {"id": "director", "title": "Director", "width": 180, "removable": false, "type": "person"},
{"id": "country", "title": "Country", "width": 120, "type": "string"}, {"id": "country", "title": "Country", "width": 120, "type": "string"},
{"id": "year", "title": "Year", "width": 60, "type": "year"}, {"id": "year", "title": "Year", "width": 60, "type": "year"},

12
pandora/user/models.py
View file

@ -33,7 +33,17 @@ class UserProfile(models.Model):
ui = {} ui = {}
config = site_config() config = site_config()
ui.update(config['user']['ui']) ui.update(config['user']['ui'])
ui.update(self.ui) def updateUI(ui, new):
'''
only update set keys in dicts
'''
for key in new:
if isinstance(new[key], dict) and key in ui:
ui[key] = updateUI(ui[key], new[key])
else:
ui[key] = new[key]
return ui
ui = updateUI(ui, self.ui)
if not 'lists' in ui: if not 'lists' in ui:
ui['lists'] = {} ui['lists'] = {}
ui['lists'][''] = config['uiDefaults']['list'] ui['lists'][''] = config['uiDefaults']['list']

6
pandora/user/views.py
View file

@ -409,14 +409,14 @@ def setUI(request):
key.subkey: value key.subkey: value
} }
you can set nested keys you can set nested keys
api.setUI({"lists.my.listView": "icons"}) api.setUI({"lists|my|ListView": "icons"})
return { return {
'status': {'code': int, 'text': string} 'status': {'code': int, 'text': string}
} }
''' '''
data = json.loads(request.POST['data']) data = json.loads(request.POST['data'])
keys = data.keys()[0].split('.') keys = data.keys()[0].split('|')
value = data.values()[0] value = data.values()[0]
profile = request.user.get_profile() profile = request.user.get_profile()
p = profile.ui p = profile.ui
@ -425,6 +425,8 @@ def setUI(request):
if isinstance(p, list): if isinstance(p, list):
p = p[getPositionById(p, key)] p = p[getPositionById(p, key)]
else: else:
if key not in p:
p[key] = {}
p = p[key] p = p[key]
p[keys[0]] = value p[keys[0]] = value
profile.save() profile.save()

387
static/js/pandora.js
View file

@ -30,6 +30,8 @@ var pandora = new Ox.App({
user: data.user user: data.user
}; };
pandora.app = app; // remove later
if (app.user.group == 'guest') { if (app.user.group == 'guest') {
app.user = data.config.user; app.user = data.config.user;
$.browser.safari && Ox.theme('modern'); $.browser.safari && Ox.theme('modern');
@ -43,11 +45,11 @@ var pandora = new Ox.App({
Ox.Request.requests() && app.$ui.loadingIcon.start(); Ox.Request.requests() && app.$ui.loadingIcon.start();
$body.bind('requestStart', function() { $body.bind('requestStart', function() {
//Ox.print('requestStart') //Ox.print('requestStart')
app.$ui.loadingIcon.start(); app.$ui.loadingIcon && app.$ui.loadingIcon.start();
}); });
$body.bind('requestStop', function() { $body.bind('requestStop', function() {
//Ox.print('requestStop') //Ox.print('requestStop')
app.$ui.loadingIcon.stop(); app.$ui.loadingIcon && app.$ui.loadingIcon.stop();
}); });
}); });
@ -83,8 +85,6 @@ var pandora = new Ox.App({
} }
}); });
pandora.app = app; // remove later
} }
function login(data) { function login(data) {
@ -458,8 +458,11 @@ var pandora = new Ox.App({
resize: function(event, data) { resize: function(event, data) {
app.user.ui.annotationsSize = data; app.user.ui.annotationsSize = data;
}, },
resizeend: function(event, data) {
UI.set({annotationsSize: data});
},
toggle: function(event, data) { toggle: function(event, data) {
app.user.ui.showAnnotations = !data.collapsed; UI.set({showAnnotations: !data.collapsed});
} }
}), }),
$bins = []; $bins = [];
@ -556,8 +559,11 @@ var pandora = new Ox.App({
list.size(); list.size();
}); });
}, },
resizeend: function(event, data){
UI.set({groupsSize: data});
},
toggle: function(event, data) { toggle: function(event, data) {
app.user.ui.showGroups = !data.collapsed; UI.set({showGroups: !data.collapsed});
data.collapsed && app.$ui.list.gainFocus(); data.collapsed && app.$ui.list.gainFocus();
} }
}); });
@ -600,7 +606,7 @@ var pandora = new Ox.App({
URL.set(data.ids[0]); URL.set(data.ids[0]);
}, },
toggle: function(event, data) { toggle: function(event, data) {
app.user.ui.showMovies = !data.collapsed; UI.set({showMovies: !data.collapsed});
if (data.collapsed) { if (data.collapsed) {
if (app.user.ui.itemView == 'timeline') { if (app.user.ui.itemView == 'timeline') {
app.$ui.editor.gainFocus(); app.$ui.editor.gainFocus();
@ -620,12 +626,7 @@ var pandora = new Ox.App({
{ {
collapsed: !app.user.ui.showGroups, collapsed: !app.user.ui.showGroups,
collapsible: true, collapsible: true,
element: app.$ui.browser = ui.browser() element: app.$ui.browser = ui.browser(),
.bindEvent('resize', function(event, data) {
$.each(app.$ui.groups, function(i, list) {
list.size();
});
}),
resizable: true, resizable: true,
resize: [96, 112, 128, 144, 160, 176, 192, 208, 224, 240, 256], resize: [96, 112, 128, 144, 160, 176, 192, 208, 224, 240, 256],
size: app.user.ui.groupsSize size: app.user.ui.groupsSize
@ -650,74 +651,92 @@ var pandora = new Ox.App({
}, },
findElement: function() { findElement: function() {
var that = new Ox.FormElementGroup({ var that = new Ox.FormElementGroup({
elements: [ elements: $.merge(app.user.ui.list ? [
app.$ui.findSelect = new Ox.Select({ app.$ui.findListSelect = new Ox.Select({
id: 'select', items: [
items: $.map(app.config.findKeys, function(key, i) { {id: 'all', title: 'Find: All Movies'},
return { {id: 'list', title: 'Find: This List'}
id: key.id, ],
title: 'Find: ' + key.title overlap: 'right',
}; type: 'image'
})
.bindEvent({
change: function(event, data) {
var key = data.selected[0].id;
app.$ui.findInput.options({
autocomplete: autocompleteFunction()
}).focus();
}
}), }),
overlap: 'right', ] : [], [
width: 112 app.$ui.findSelect = new Ox.Select({
id: 'select',
items: $.map(app.config.findKeys, function(key, i) {
return {
id: key.id,
title: 'Find: ' + key.title
};
}),
overlap: 'right',
width: 112
})
.bindEvent({
change: function(event, data) {
var key = data.selected[0].id;
if (!app.user.ui.findQuery.conditions.length) {
app.user.ui.findQuery.conditions = [{key: key, value: '', operator: ''}];
} else {
app.user.ui.findQuery.conditions[0].key = key;
}
app.$ui.mainMenu.checkItem('findMenu_find_' + key);
app.$ui.findInput.options({
autocomplete: autocompleteFunction()
}).focus();
//Ox.print(app.$ui.findInput.options('autocomplete').toString())
}
}),
app.$ui.findInput = new Ox.Input({
autocomplete: autocompleteFunction(),
autocompleteSelect: true,
autocompleteSelectHighlight: true,
autocompleteSelectSubmit: true,
clear: true,
id: 'input',
width: 192
}) })
.bindEvent('change', function(event, data) { .bindEvent('submit', function(event, data) {
var key = data.selected[0].id; var key = app.user.ui.findQuery.conditions.length ?
if (!app.user.ui.findQuery.conditions.length) { app.user.ui.findQuery.conditions[0].key : '',
app.user.ui.findQuery.conditions = [{key: key, value: '', operator: ''}]; query;
} else { app.user.ui.findQuery.conditions = [
app.user.ui.findQuery.conditions[0].key = key; {
} key: key == 'all' ? '' : key,
app.$ui.mainMenu.checkItem('findMenu_find_' + key); value: data.value,
app.$ui.findInput.options({ operator: ''
autocomplete: autocompleteFunction() }
}).focus(); ];
//Ox.print(app.$ui.findInput.options('autocomplete').toString()) $.each(app.ui.groups, function(i, group) {
}), group.query.conditions = [];
app.$ui.findInput = new Ox.Input({ app.$ui.groups[i].options({
autocomplete: autocompleteFunction(), request: function(data, callback) {
autocompleteSelect: true, delete data.keys;
autocompleteSelectHighlight: true, return pandora.api.find($.extend(data, {
autocompleteSelectSubmit: true, group: group.id,
clear: true, query: Query.toObject(group.id)
id: 'input', }), callback);
width: 192 }
}) });
.bindEvent('submit', function(event, data) { });
var key = app.user.ui.findQuery.conditions.length ? app.$ui.list.options({
app.user.ui.findQuery.conditions[0].key : '',
query;
//Ox.print('key', key);
app.user.ui.findQuery.conditions = [
{
key: key == 'all' ? '' : key,
value: data.value,
operator: ''
}
];
$.each(app.ui.groups, function(i, group) {
group.query.conditions = [];
app.$ui.groups[i].options({
request: function(data, callback) { request: function(data, callback) {
delete data.keys;
return pandora.api.find($.extend(data, { return pandora.api.find($.extend(data, {
group: group.id, query: query = Query.toObject()
query: Query.toObject(group.id)
}), callback); }), callback);
} }
}); });
}); history.pushState({}, '', '/' + Query.toString(query));
app.$ui.list.options({ })
request: function(data, callback) { ]),
return pandora.api.find($.extend(data, {
query: query = Query.toObject()
}), callback);
}
});
history.pushState({}, '', '/#' + Query.toString(query));
})
],
id: 'findElement' id: 'findElement'
}) })
.css({ .css({
@ -726,47 +745,29 @@ var pandora = new Ox.App({
}); });
function autocompleteFunction() { function autocompleteFunction() {
return app.user.ui.findQuery.conditions.length ? function(value, callback) { return app.user.ui.findQuery.conditions.length ? function(value, callback) {
var key = app.user.ui.findQuery.conditions[0].key, var key = that.value()[app.user.ui.list ? 1 : 0].id,
findKey = Ox.getObjectById(app.config.findKeys, key); findKey = Ox.getObjectById(app.config.findKeys, key);
//Ox.print('autocomplete', key, value); Ox.print('!!!!', key, findKey, 'autocomplete' in findKey && findKey.autocomplete)
value === '' && Ox.print('Warning: autocomplete function should never be called with empty value'); value === '' && Ox.print('Warning: autocomplete function should never be called with empty value');
if ('autocomplete' in findKey && findKey.autocomplete) { if ('autocomplete' in findKey && findKey.autocomplete) {
pandora.api.autocomplete({ pandora.api.autocomplete({
key: key, key: key,
query: that.value()[0].id == 'list' ? {
conditions: $.merge($.merge([], app.user.ui.listQuery.conditions), app.user.ui.findQuery.conditions),
operator: '&'
} : app.user.ui.findQuery,
range: [0, 20], range: [0, 20],
sort: [{
key: 'votes',
operator: '-'
}],
value: value value: value
}, function(result) { }, function(result) {
//alert(JSON.stringify(result)) //alert(JSON.stringify(result))
callback(result.data.items); callback(result.data.items);
}); });
/*
pandora.api.find({
keys: [key],
query: {
conditions: [
{
key: key,
value: value,
operator: ''
}
],
operator: ''
},
sort: [
{
key: key,
operator: ''
}
],
range: [0, 10]
}, function(result) {
callback($.map(result.data.items, function(v) {
return v[key];
}));
});
*/
} else { } else {
callback(); callback([]);
} }
} : null; } : null;
} }
@ -867,6 +868,7 @@ var pandora = new Ox.App({
} }
app.ui.groups[i] = getGroupObject(id_); app.ui.groups[i] = getGroupObject(id_);
app.user.ui.groups[i] = id_; app.user.ui.groups[i] = id_;
setUI({groups: app.user.ui.groups});
replaceGroup(i, id_); replaceGroup(i, id_);
} else { } else {
// swap two existing groups // swap two existing groups
@ -875,18 +877,17 @@ var pandora = new Ox.App({
app.ui.groups[i_] = group; app.ui.groups[i_] = group;
app.user.ui.groups[i] = id_; app.user.ui.groups[i] = id_;
app.user.ui.groups[i_] = id; app.user.ui.groups[i_] = id;
setUI({groups: app.user.ui.groups});
replaceGroup(i, id_, app.ui.groups[i].query); replaceGroup(i, id_, app.ui.groups[i].query);
replaceGroup(i_, id, app.ui.groups[i_].query); replaceGroup(i_, id, app.ui.groups[i_].query);
} }
function replaceGroup(i, id, query) { function replaceGroup(i, id, query) {
// if query is passed, selected items will be derived from it // if query is passed, selected items will be derived from it
var isOuter = i % 4 == 0; var isOuter = i % 4 == 0;
//foo = app.$ui.groups[i];
app.$ui[isOuter ? 'browser' : 'groupsInnerPanel'].replace( app.$ui[isOuter ? 'browser' : 'groupsInnerPanel'].replace(
isOuter ? i / 2 : i - 1, isOuter ? i / 2 : i - 1,
app.$ui.groups[i] = ui.group(id, query) app.$ui.groups[i] = ui.group(id, query)
); );
//foo.remove();
} }
}) })
.appendTo(that.$bar.$element); .appendTo(that.$bar.$element);
@ -960,7 +961,7 @@ var pandora = new Ox.App({
) )
.bindEvent({ .bindEvent({
toggle: function(event, data) { toggle: function(event, data) {
app.user.ui.showInfo = !data.collapsed; UI.set({showInfo: !data.collapsed});
resizeSections(); resizeSections();
} }
}); });
@ -1113,8 +1114,11 @@ var pandora = new Ox.App({
app.$ui.leftPanel.size('infoPanel', infoSize); app.$ui.leftPanel.size('infoPanel', infoSize);
resizeSections(); resizeSections();
}, },
resizeend: function(event, data) {
UI.set({sidebarSize: data});
},
toggle: function(event, data) { toggle: function(event, data) {
app.user.ui.showSidebar = !data.collapsed; UI.set({showSidebar: !data.collapsed});
if (data.collapsed) { if (data.collapsed) {
app.$ui.sectionList.forEach(function($list) { app.$ui.sectionList.forEach(function($list) {
$list.loseFocus(); $list.loseFocus();
@ -1729,7 +1733,7 @@ var pandora = new Ox.App({
app.$ui.sectionList.forEach(function($list, i_) { app.$ui.sectionList.forEach(function($list, i_) {
i != i_ && $list.options('selected', []); i != i_ && $list.options('selected', []);
}); });
app.user.ui.list = data.ids[0]; UI.set({list: data.ids[0]});
URL.set('?find=list:' + data.ids[0]); URL.set('?find=list:' + data.ids[0]);
} else { } else {
URL.set(''); URL.set('');
@ -2252,6 +2256,7 @@ var pandora = new Ox.App({
elements: [ elements: [
{ {
collapsible: true, collapsible: true,
collapsed: !app.user.ui.showSidebar,
element: app.$ui.leftPanel = ui.leftPanel(), element: app.$ui.leftPanel = ui.leftPanel(),
resizable: true, resizable: true,
resize: [192, 256, 320, 384], resize: [192, 256, 320, 384],
@ -2517,7 +2522,9 @@ var pandora = new Ox.App({
pandora.api.removeList({ pandora.api.removeList({
id: data.ids[0] id: data.ids[0]
}, function(result) { }, function(result) {
delete app.user.ui.lists[data.ids[0]]; // fixme: how to delete a ui preference? // fixme: is this the best way to delete a ui preference?
delete app.user.ui.lists[data.ids[0]];
UI.set({lists: app.user.ui.lists});
Ox.Request.emptyCache(); // fixme: remove Ox.Request.emptyCache(); // fixme: remove
$list.reloadList(); $list.reloadList();
}); });
@ -2575,10 +2582,10 @@ var pandora = new Ox.App({
app.$ui.sectionList.forEach(function($list, i_) { app.$ui.sectionList.forEach(function($list, i_) {
i != i_ && $list.options('selected', []); i != i_ && $list.options('selected', []);
}); });
app.user.ui.list = listId; UI.set({list: listId});
URL.set('?find=list:' + listId); URL.set('?find=list:' + listId);
} else { } else {
app.user.ui.list = ''; UI.set({list: ''});
URL.set(''); URL.set('');
} }
}, },
@ -2636,7 +2643,7 @@ var pandora = new Ox.App({
type: data.id == 'new' ? 'static' : 'smart' type: data.id == 'new' ? 'static' : 'smart'
}, function(result) { }, function(result) {
id = result.data.id; id = result.data.id;
app.user.ui.lists[id] = app.config.uiDefaults.list; UI.set(['lists', id].join('|'), app.config.uiDefaults.list);
URL.set('?find=list:' + id) URL.set('?find=list:' + id)
Ox.Request.emptyCache(); // fixme: remove Ox.Request.emptyCache(); // fixme: remove
$list.reloadList().bindEvent({load: load}); $list.reloadList().bindEvent({load: load});
@ -2693,6 +2700,7 @@ var pandora = new Ox.App({
} }
app.$ui.section[i] = new Ox.CollapsePanel({ app.$ui.section[i] = new Ox.CollapsePanel({
id: id, id: id,
collapsed: !app.user.ui.showSection[id],
extras: extras, extras: extras,
size: 16, size: 16,
title: Ox.getObjectById(app.config.sections, id).title title: Ox.getObjectById(app.config.sections, id).title
@ -2725,7 +2733,7 @@ var pandora = new Ox.App({
}, },
toggle: function(event, data) { toggle: function(event, data) {
data.collapsed && app.$ui.sectionList[i].loseFocus(); data.collapsed && app.$ui.sectionList[i].loseFocus();
app.user.ui.showSection[id] = !data.collapsed; UI.set(['showSection', id].join('|'), !data.collapsed);
resizeSections(); resizeSections();
} }
}); });
@ -2781,20 +2789,22 @@ var pandora = new Ox.App({
float: 'left', float: 'left',
margin: '4px 0 0 4px' margin: '4px 0 0 4px'
}) })
.bindEvent('change', function(event, data) { .bindEvent({
var id = data.selected[0].id, change: function(event, data) {
operator = getSortOperator(id); var id = data.selected[0].id,
/* operator = getSortOperator(id);
app.user.ui.lists[app.user.ui.list].sort[0] = { /*
key: id, app.user.ui.lists[app.user.ui.list].sort[0] = {
operator: operator key: id,
}; operator: operator
*/ };
app.$ui.mainMenu.checkItem('sortMenu_sortmovies_' + id); */
app.$ui.mainMenu.checkItem('sortMenu_ordermovies_' + (operator === '' ? 'ascending' : 'descending')); app.$ui.mainMenu.checkItem('sortMenu_sortmovies_' + id);
//alert(id + ' ' + operator) app.$ui.mainMenu.checkItem('sortMenu_ordermovies_' + (operator === '' ? 'ascending' : 'descending'));
app.$ui.list.sortList(id, operator); //alert(id + ' ' + operator)
URL.set(Query.toString()); app.$ui.list.sortList(id, operator);
URL.set(Query.toString());
}
}); });
return that; return that;
}, },
@ -2877,16 +2887,19 @@ var pandora = new Ox.App({
float: 'left', float: 'left',
margin: '4px 0 0 4px' margin: '4px 0 0 4px'
}) })
.bindEvent('change', !app.user.ui.item ? function(event, data) { .bindEvent({
var id = data.selected[0].id; change: !app.user.ui.item ? function(event, data) {
app.user.ui.lists[app.user.ui.list].listView = id; var id = data.selected[0].id;
app.$ui.mainMenu.checkItem('viewMenu_movies_' + id); app.$ui.mainMenu.checkItem('viewMenu_movies_' + id);
app.$ui.contentPanel.replace(1, app.$ui.list = ui.list(id)); //app.$ui.contentPanel.replace(1, app.$ui.list = ui.list(id));
URL.set(Query.toString()); UI.set(['lists', app.user.ui.list, 'listView'].join('|'), id);
} : function(event, data) { URL.set(Query.toString());
var id = data.selected[0].id; } : function(event, data) {
app.user.ui.itemView = id; var id = data.selected[0].id;
app.$ui.contentPanel.replace(1, app.$ui.item = ui.item()); UI.set({itemView: id});
// fixme: URL.set() here
app.$ui.contentPanel.replace(1, app.$ui.item = ui.item());
}
}); });
return that; return that;
} }
@ -2980,6 +2993,7 @@ var pandora = new Ox.App({
function getSectionsWidth() { function getSectionsWidth() {
var width = app.user.ui.sidebarSize; var width = app.user.ui.sidebarSize;
// fixme: don't use height(), look up in splitpanels // fixme: don't use height(), look up in splitpanels
Ox.print(getSectionsHeight(), '>', app.$ui.leftPanel.height() - 24 - 1 - app.$ui.info.height())
if (getSectionsHeight() > app.$ui.leftPanel.height() - 24 - 1 - app.$ui.info.height()) { if (getSectionsHeight() > app.$ui.leftPanel.height() - 24 - 1 - app.$ui.info.height()) {
width -= app.ui.scrollbarSize; width -= app.ui.scrollbarSize;
} }
@ -3153,9 +3167,15 @@ var pandora = new Ox.App({
ret = parseFind(subconditions[parseInt(v.substr(1, v.length - 2))]); ret = parseFind(subconditions[parseInt(v.substr(1, v.length - 2))]);
} else { } else {
kv = ((v.indexOf(':') > - 1 ? '' : ':') + v).split(':'); kv = ((v.indexOf(':') > - 1 ? '' : ':') + v).split(':');
ret = $.extend({ if (kv[0] == 'list') { // fixme: this is just a hack
key: kv[0] app.user.ui.listQuery = {conditions: [$.extend({
}, parseValue(kv[1])); key: kv[0]
}, parseValue(kv[1]))], operator: ''};
} else {
ret = $.extend({
key: kv[0]
}, parseValue(kv[1]));
}
} }
return ret; return ret;
}); });
@ -3194,7 +3214,7 @@ var pandora = new Ox.App({
} }
if ('sort' in query) { if ('sort' in query) {
sort = query.sort.split(',') sort = query.sort.split(',')
app.user.ui.lists[app.user.ui.list].sort = $.map(query.sort.split(','), function(v, i) { UI.set(['lists', app.user.ui.list, 'sort'].join('|'), $.map(query.sort.split(','), function(v, i) {
var hasOperator = '+-'.indexOf(v[0]) > -1, var hasOperator = '+-'.indexOf(v[0]) > -1,
key = hasOperator ? query.sort.substr(1) : query.sort, key = hasOperator ? query.sort.substr(1) : query.sort,
operator = hasOperator ? v[0].replace('+', '') : getSortOperator(key); operator = hasOperator ? v[0].replace('+', '') : getSortOperator(key);
@ -3202,10 +3222,10 @@ var pandora = new Ox.App({
key: key, key: key,
operator: operator operator: operator
}; };
}); }));
} }
if ('view' in query) { if ('view' in query) {
app.user.ui.lists[app.user.ui.list].listView = query.view; UI.set(['lists', app.user.ui.list, 'listView'].join('|'), query.view);
} }
}, },
@ -3245,6 +3265,36 @@ var pandora = new Ox.App({
})(); })();
var UI = (function() {
return {
set: function(obj) {
if (arguments.length == 2) {
var obj_ = {};
obj_[arguments[0]] = arguments[1];
obj = obj_;
}
$.each(obj, function(key, val) {
Ox.print('key', key, 'val', val)
keys = key.split('|');
if (keys.length == 1) {
app.user.ui[keys[0]] = val;
} else if (keys.length == 2) {
app.user.ui[keys[0]][keys[1]] = val;
} else if (keys.length == 3) {
app.user.ui[keys[0]][keys[1]][keys[2]] = val;
} else if (keys.length == 4) {
app.user.ui[keys[0]][keys[1]][keys[2]][keys[3]] = val;
} else if (keys.length == 5) {
app.user.ui[keys[0]][keys[1]][keys[2]][keys[3]][keys[4]] = val;
} else if (keys.length == 6) {
app.user.ui[keys[0]][keys[1]][keys[2]][keys[3]][keys[4]][keys[5]] = val;
}
});
pandora.api.setUI(obj);
}
}
}());
var URL = (function() { var URL = (function() {
var old = { var old = {
@ -3255,21 +3305,31 @@ var pandora = new Ox.App({
regexps = { regexps = {
'^\\?': function(url) { '^\\?': function(url) {
Query.fromString(url); Query.fromString(url);
app.user.ui.section = 'items'; UI.set({
app.user.ui.item = ''; section: 'items',
item: ''
});
}, },
'^(|about|faq|home|news|software|terms|tour)$': function(url) { '^(about|faq|home|news|software|terms|tour)$': function(url) {
app.user.ui.section = 'site'; UI.set({
app.user.ui.sitePage = url; section: 'site',
sitePage: url
});
}, },
'^(|find)$': function() { '^(|find)$': function() {
app.user.ui.section = 'items'; Query.fromString('?find='); // fixme: silly hack
app.user.ui.item = ''; UI.set({
section: 'items',
list: '',
item: ''
});
}, },
'^(calendar|calendars|clips|icons|flow|map|maps|timelines)$': function() { '^(calendar|calendars|clips|icons|flow|map|maps|timelines)$': function() {
app.user.ui.section = 'items'; UI.set({
app.user.ui.item = ''; section: 'items',
app.user.ui.lists[app.user.ui.list].listView = url; item: ''
});
UI.set(['lists', app.user.ui.list, 'listView'].join('|'), url);
}, },
'^[0-9A-Z]': function() { '^[0-9A-Z]': function() {
var split = url.split('/'), var split = url.split('/'),
@ -3277,15 +3337,21 @@ var pandora = new Ox.App({
view = new RegExp( view = new RegExp(
'^(calendar|clips|files|info|map|player|statistics|timeline)$' '^(calendar|clips|files|info|map|player|statistics|timeline)$'
)(split[1]) || app.user.ui.itemView; )(split[1]) || app.user.ui.itemView;
app.user.ui.section = 'items'; UI.set({
app.user.ui.item = item; section: 'items',
app.user.ui.itemView = view; item: item,
itemView: view
});
}, },
'^texts$': function() { '^texts$': function() {
app.user.ui.section = 'texts'; UI.set({
section: 'texts'
});
}, },
'^admin$': function() { '^admin$': function() {
app.user.ui.section = 'admin'; UI.set({
section: 'admin'
});
} }
}; };
@ -3298,8 +3364,9 @@ var pandora = new Ox.App({
}, },
parse: function() { parse: function() {
url = document.location.pathname.substr(1) + var url = document.location.pathname.substr(1) +
document.location.search + document.location.hash; document.location.search +
document.location.hash;
$.each(regexps, function(re, fn) { $.each(regexps, function(re, fn) {
//Ox.print(url, 're', re) //Ox.print(url, 're', re)
re = new RegExp(re); re = new RegExp(re);