p15693087
/
django
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Replaced some usage of django.jQuery with $.

This commit is contained in:
Tim Graham 2015-12-21 08:38:24 -05:00
parent f18b08748a
commit 541000773a
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
django/contrib/admin/static/admin/js/admin/RelatedObjectLookups.js
View File

@ -67,7 +67,7 @@
} }
function updateRelatedObjectLinks(triggeringLink) { function updateRelatedObjectLinks(triggeringLink) {
var $this = django.jQuery(triggeringLink); var $this = $(triggeringLink);
var siblings = $this.nextAll('.change-related, .delete-related'); var siblings = $this.nextAll('.change-related, .delete-related');
if (!siblings.length) { if (!siblings.length) {
return; return;
@ -75,7 +75,7 @@
var value = $this.val(); var value = $this.val();
if (value) { if (value) {
siblings.each(function() { siblings.each(function() {
var elm = django.jQuery(this); var elm = $(this);
elm.attr('href', elm.attr('data-href-template').replace('__fk__', value)); elm.attr('href', elm.attr('data-href-template').replace('__fk__', value));
}); });
} else { } else {
@ -102,7 +102,7 @@
} }
} }
// Trigger a change event to update related links if required. // Trigger a change event to update related links if required.
django.jQuery(elem).trigger('change'); $(elem).trigger('change');
} else { } else {
var toId = name + "_to"; var toId = name + "_to";
var o = new Option(newRepr, newId); var o = new Option(newRepr, newId);
@ -117,7 +117,7 @@
newRepr = html_unescape(newRepr); newRepr = html_unescape(newRepr);
var id = windowname_to_id(win.name).replace(/^edit_/, ''); var id = windowname_to_id(win.name).replace(/^edit_/, '');
var selectsSelector = interpolate('#%s, #%s_from, #%s_to', [id, id, id]); var selectsSelector = interpolate('#%s, #%s_from, #%s_to', [id, id, id]);
var selects = django.jQuery(selectsSelector); var selects = $(selectsSelector);
selects.find('option').each(function() { selects.find('option').each(function() {
if (this.value === objId) { if (this.value === objId) {
this.innerHTML = newRepr; this.innerHTML = newRepr;
@ -131,10 +131,10 @@
objId = html_unescape(objId); objId = html_unescape(objId);
var id = windowname_to_id(win.name).replace(/^delete_/, ''); var id = windowname_to_id(win.name).replace(/^delete_/, '');
var selectsSelector = interpolate('#%s, #%s_from, #%s_to', [id, id, id]); var selectsSelector = interpolate('#%s, #%s_from, #%s_to', [id, id, id]);
var selects = django.jQuery(selectsSelector); var selects = $(selectsSelector);
selects.find('option').each(function() { selects.find('option').each(function() {
if (this.value === objId) { if (this.value === objId) {
django.jQuery(this).remove(); $(this).remove();
} }
}).trigger('change'); }).trigger('change');
win.close(); win.close();