in menu, encode underscores in list names (fixes #1816)

This commit is contained in:
rolux 2013-08-14 20:21:12 +00:00
parent e8d2280466
commit 34ffd6a29a

View file

@ -602,8 +602,8 @@ pandora.ui.mainMenu = function() {
list = ui._list, list = ui._list,
previousList = pandora.UI.getPrevious()._list; previousList = pandora.UI.getPrevious()._list;
if (list != previousList) { if (list != previousList) {
that.uncheckItem(previousList == '' ? 'allitems' : 'viewlist' + previousList); that.uncheckItem(previousList == '' ? 'allitems' : 'viewlist' + previousList.replace(/_/g, Ox.char(9)));
that.checkItem(list == '' ? 'allitems' : 'viewlist' + list); that.checkItem(list == '' ? 'allitems' : 'viewlist' + list.replace(/_/g, Ox.char(9)));
} }
that[action]('editlist'); that[action]('editlist');
that[action]('duplicatelist'); that[action]('duplicatelist');
@ -906,7 +906,7 @@ pandora.ui.mainMenu = function() {
? [{id: 'nolists', title: Ox._('No ' + Ox.toTitleCase(folder) + ' ' + itemNamePlural), disabled: true}] ? [{id: 'nolists', title: Ox._('No ' + Ox.toTitleCase(folder) + ' ' + itemNamePlural), disabled: true}]
: lists[folder].map(function(list) { : lists[folder].map(function(list) {
return { return {
id: 'viewlist' + list.id, id: 'viewlist' + list.id.replace(/_/g, Ox.char(9)),
title: Ox.encodeHTMLEntities(( title: Ox.encodeHTMLEntities((
folder == 'favorite' ? list.user + ': ' : '' folder == 'favorite' ? list.user + ': ' : ''
) + list.name), ) + list.name),