From e5d4a753586bf6f5ff360ebfca45437b98421d4d Mon Sep 17 00:00:00 2001 From: j Date: Tue, 5 Jan 2016 20:43:42 +0530 Subject: [PATCH] encode user and list in ui set calls --- static/js/folders.js | 6 +++--- static/js/utils.js | 8 ++++---- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/static/js/folders.js b/static/js/folders.js index cd5b47f..e8845bf 100644 --- a/static/js/folders.js +++ b/static/js/folders.js @@ -149,7 +149,7 @@ oml.ui.folders = function() { }) .bindEvent({ toggle: function(data) { - oml.UI.set('showFolder.' + user.name, !data.collapsed); + oml.UI.set('showFolder.' + oml.UI.encode(user.name), !data.collapsed); } }) .bindEvent( @@ -196,7 +196,7 @@ oml.ui.folders = function() { !userLists.length ? user + ':' : Ox.last(userLists).id )}; - Ox.extend(set, 'showFolder.' + user, true); + Ox.extend(set, 'showFolder.' + oml.UI.encode(user), true); } oml.UI.set(set); } @@ -241,7 +241,7 @@ oml.ui.folders = function() { if (index < users.length - 1) { oml.UI.set(Ox.extend( {find: getFind(users[index + 1].name + ':')}, - 'showFolder.' + users[index + 1].name, + 'showFolder.' + oml.UI.encode(users[index + 1].name), true )); } diff --git a/static/js/utils.js b/static/js/utils.js index dd4a4d1..232b5ad 100644 --- a/static/js/utils.js +++ b/static/js/utils.js @@ -903,15 +903,15 @@ oml.renameUser = function(data) { newFind = Ox.clone(ui.find, true); ui._users[index].name = data.name; ui._users[index].nickname = data.nickname; - set['showFolder.' + name] = null; - set['showFolder.' + data.name] = ui.showFolder[name]; + set['showFolder.' + oml.UI.encode(name)] = null; + set['showFolder.' + oml.UI.encode(data.name)] = ui.showFolder[name]; Ox.forEach(ui.lists, function(value, key) { var split = key.split(':'), username = split[0], listname = split.slice(1).join(':'); if (username == name) { - set['lists.' + key] = null; - set['lists.' + data.name + ':' + listname] = value; + set['lists.' + oml.UI.encode(key)] = null; + set['lists.' + oml.UI.encode(data.name + ':' + listname)] = value; } });