Author: kmtracey
Date: 2008-11-12 10:23:04 -0600 (Wed, 12 Nov 2008)
New Revision: 9403
Modified:
django/trunk/django/contrib/admin/media/js/admin/RelatedObjectLookups.js
Log:
Fixed #106 -- Refrain from generating popup window names that IE refuses to pop
up. Thanks for the reports and initial patches nbstrite and jsmullyan.
Modified:
django/trunk/django/contrib/admin/media/js/admin/RelatedObjectLookups.js
===================================================================
--- django/trunk/django/contrib/admin/media/js/admin/RelatedObjectLookups.js
2008-11-12 11:53:16 UTC (rev 9402)
+++ django/trunk/django/contrib/admin/media/js/admin/RelatedObjectLookups.js
2008-11-12 16:23:04 UTC (rev 9403)
@@ -11,10 +11,25 @@
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
+// element when the popup window is dismissed.
+function id_to_windowname(text) {
+ text = text.replace(/\./g, '__dot__');
+ text = text.replace(/\-/g, '__dash__');
+ return text;
+}
+
+function windowname_to_id(text) {
+ text = text.replace(/__dot__/g, '.');
+ text = text.replace(/__dash__/g, '-');
+ return text;
+}
+
function showRelatedObjectLookupPopup(triggeringLink) {
var name = triggeringLink.id.replace(/^lookup_/, '');
- // IE doesn't like periods in the window name, so convert temporarily.
- name = name.replace(/\./g, '___');
+ name = id_to_windowname(name);
var href;
if (triggeringLink.href.search(/\?/) >= 0) {
href = triggeringLink.href + '&pop=1';
@@ -27,7 +42,7 @@
}
function dismissRelatedLookupPopup(win, chosenId) {
- var name = win.name.replace(/___/g, '.');
+ var name = windowname_to_id(win.name);
var elem = document.getElementById(name);
if (elem.className.indexOf('vManyToManyRawIdAdminField') != -1 &&
elem.value) {
elem.value += ',' + chosenId;
@@ -39,7 +54,7 @@
function showAddAnotherPopup(triggeringLink) {
var name = triggeringLink.id.replace(/^add_/, '');
- name = name.replace(/\./g, '___');
+ name = id_to_windowname(name);
href = triggeringLink.href
if (href.indexOf('?') == -1) {
href += '?_popup=1';
@@ -56,7 +71,7 @@
// django.utils.html.escape.
newId = html_unescape(newId);
newRepr = html_unescape(newRepr);
- var name = win.name.replace(/___/g, '.');
+ var name = windowname_to_id(win.name);
var elem = document.getElementById(name);
if (elem) {
if (elem.nodeName == 'SELECT') {
--~--~---------~--~----~------------~-------~--~----~
You received this message because you are subscribed to the Google Groups
"Django updates" group.
To post to this group, send email to django-updates@googlegroups.com
To unsubscribe from this group, send email to [EMAIL PROTECTED]
For more options, visit this group at
http://groups.google.com/group/django-updates?hl=en
-~----------~----~----~----~------~----~------~--~---
