0x2620/pandora
2
1
Fork 1
Code Issues 1.3k Pull requests Releases Wiki Activity

fix UI controller

Browse source
This commit is contained in:
rolux 2014-02-06 09:28:36 +00:00
parent 7475caee10
commit 0069fa3f74
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
static/js/UI.js
View file

@ -164,11 +164,11 @@ pandora.UI = (function() {
} }
if (args.edit) { if (args.edit) {
add['edits.' + that.encode(args.edit)] = Ox.map(editSettings, function(value, key) { Ox.forEach(editSettings, function(value, key) {
var editsKey = 'edits.' + that.encode(args.edit) + '.' + key; var editsKey = 'edits.' + that.encode(args.edit) + '.' + key;
return editsKey in args ? args[editsKey] add[editsKey] = editsKey in args ? args[editsKey]
: pandora.user.ui.edits[args.edit] ? pandora.user.ui.edits[args.edit][key] : pandora.user.ui.edits[args.edit] ? pandora.user.ui.edits[args.edit][key]
: value; : valuel
}); });
} }
if (args.text) { if (args.text) {
@ -187,7 +187,7 @@ pandora.UI = (function() {
editSort: 'sort', editSort: 'sort',
editView: 'view' editView: 'view'
}, function(editSetting, setting) { }, function(editSetting, setting) {
var key = 'edits.' + that.encode(pandora.user.ui.edit) + '.' + editSetting; var key = 'edits.' + that.encode(args.edit || pandora.user.ui.edit) + '.' + editSetting;
if (setting in args) { if (setting in args) {
add[key] = args[setting]; add[key] = args[setting];
} else if (setting in add) { } else if (setting in add) {