From 5aac6ebe22ad616dbf907dd0daef1ff676efc7ff Mon Sep 17 00:00:00 2001
From: rolux <rolux@rolux.org>
Date: Sun, 27 May 2012 12:51:08 +0200
Subject: [PATCH] Ox.parseHTML -> Ox.sanitizeHTML, Ox.encodeHTML ->
 Ox.encodeHTMLEntities, Ox.decodeHTML -> Ox.decodeHTMLEntities

---
 static/js/pandora/importAnnotations.js |  2 +-
 static/js/pandora/info.js              | 14 +++++++++-----
 2 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/static/js/pandora/importAnnotations.js b/static/js/pandora/importAnnotations.js
index a15639019..2c2f6be8d 100644
--- a/static/js/pandora/importAnnotations.js
+++ b/static/js/pandora/importAnnotations.js
@@ -60,7 +60,7 @@ pandora.ui.importAnnotations = function(data) {
     function addAnnotation() {
         if(srt.length>0) {
             var data = srt.shift();
-            data.text = Ox.parseHTML(data.text)
+            data.text = Ox.sanitizeHTML(data.text)
                 .replace(/<br[ /]*?>\n/g, '\n')
                 .replace(/\n\n/g, '<br>\n')
                 .replace(/\n/g, '<br>\n');
diff --git a/static/js/pandora/info.js b/static/js/pandora/info.js
index 13fec6b1b..90132738d 100644
--- a/static/js/pandora/info.js
+++ b/static/js/pandora/info.js
@@ -172,10 +172,14 @@ pandora.ui.listInfo = function() {
                     $title = Ox.Editable({
                             editable: editable,
                             format: function(value) {
-                                return Ox.encodeHTML(Ox.decodeHTML(
-                                    item.status == 'featured' || editable
-                                    ? value
-                                    : item.user + ': ' + value))
+                                // FIXME: document what we're trying to do here!
+                                return Ox.encodeHTMLEntities(
+                                    Ox.decodeHTMLEntities(
+                                        item.status == 'featured' || editable
+                                            ? value
+                                            : item.user + ': ' + value
+                                    )
+                                )
                             },
                             tooltip: editable ? 'Doubleclick to edit title' : '',
                             value: item.name,
@@ -189,7 +193,7 @@ pandora.ui.listInfo = function() {
                                 });
                             },
                             submit: function(data) {
-                                data.value = Ox.decodeHTML(data.value);
+                                data.value = Ox.decodeHTMLEntities(data.value);
                                 if (data.value != item.name) {
                                     pandora.api.editList({
                                         id: list,