summaryrefslogtreecommitdiff
path: root/django
diff options
context:
space:
mode:
authorThomas Grainger <tom.grainger@procensus.com>2016-01-08 19:58:03 +0000
committerTim Graham <timograham@gmail.com>2016-01-08 18:24:04 -0500
commitcbaa3ee3ee45d453ab6aa36d57847515dd130b9f (patch)
tree5509f5035ac6207848ab99e8edea51e5c8452460 /django
parent780bddf75b93784470a2e352ed44ee35a751d667 (diff)
Refs #25165 -- Removed unnecessary HTML unescaping in admin add/edit popups.
Because we now load data into the page via JSON, we don't need to unescape it anymore.
Diffstat (limited to 'django')
-rw-r--r--django/contrib/admin/static/admin/js/admin/RelatedObjectLookups.js18
1 files changed, 0 insertions, 18 deletions
diff --git a/django/contrib/admin/static/admin/js/admin/RelatedObjectLookups.js b/django/contrib/admin/static/admin/js/admin/RelatedObjectLookups.js
index b265fdff38..282dfaed34 100644
--- a/django/contrib/admin/static/admin/js/admin/RelatedObjectLookups.js
+++ b/django/contrib/admin/static/admin/js/admin/RelatedObjectLookups.js
@@ -5,16 +5,6 @@
(function($) {
'use strict';
- function html_unescape(text) {
- // Unescape a string that was escaped using django.utils.html.escape.
- text = text.replace(/&lt;/g, '<');
- text = text.replace(/&gt;/g, '>');
- text = text.replace(/&quot;/g, '"');
- text = text.replace(/&#39;/g, "'");
- text = text.replace(/&amp;/g, '&');
- return text;
- }
-
// IE doesn't accept periods or dashes in the window name, but the element IDs
// we use to generate popup window names may contain them, therefore we map them
// to allowed characters in a reversible way so that we can locate the correct
@@ -84,10 +74,6 @@
}
function dismissAddRelatedObjectPopup(win, newId, newRepr) {
- // newId and newRepr are expected to have previously been escaped by
- // django.utils.html.escape.
- newId = html_unescape(newId);
- newRepr = html_unescape(newRepr);
var name = windowname_to_id(win.name);
var elem = document.getElementById(name);
if (elem) {
@@ -113,8 +99,6 @@
}
function dismissChangeRelatedObjectPopup(win, objId, newRepr, newId) {
- objId = html_unescape(objId);
- newRepr = html_unescape(newRepr);
var id = windowname_to_id(win.name).replace(/^edit_/, '');
var selectsSelector = interpolate('#%s, #%s_from, #%s_to', [id, id, id]);
var selects = $(selectsSelector);
@@ -128,7 +112,6 @@
}
function dismissDeleteRelatedObjectPopup(win, objId) {
- objId = html_unescape(objId);
var id = windowname_to_id(win.name).replace(/^delete_/, '');
var selectsSelector = interpolate('#%s, #%s_from, #%s_to', [id, id, id]);
var selects = $(selectsSelector);
@@ -141,7 +124,6 @@
}
// Global for testing purposes
- window.html_unescape = html_unescape;
window.id_to_windowname = id_to_windowname;
window.windowname_to_id = windowname_to_id;