Skip to content

Commit b730973

Browse files
committed
Refs #28956 -- Removed usage of jQuery's deprecated .selector property in admin JavaScript.
1 parent 8dbaeb6 commit b730973

File tree

3 files changed

+24
-21
lines changed

3 files changed

+24
-21
lines changed

django/contrib/admin/static/admin/js/inlines.js

+10-7
Original file line numberDiff line numberDiff line change
@@ -145,10 +145,10 @@
145145

146146

147147
// Tabular inlines ---------------------------------------------------------
148-
$.fn.tabularFormset = function(options) {
148+
$.fn.tabularFormset = function(selector, options) {
149149
var $rows = $(this);
150150
var alternatingRows = function(row) {
151-
$($rows.selector).not(".add-row").removeClass("row1 row2")
151+
$(selector).not(".add-row").removeClass("row1 row2")
152152
.filter(":even").addClass("row1").end()
153153
.filter(":odd").addClass("row2");
154154
};
@@ -212,10 +212,10 @@
212212
};
213213

214214
// Stacked inlines ---------------------------------------------------------
215-
$.fn.stackedFormset = function(options) {
215+
$.fn.stackedFormset = function(selector, options) {
216216
var $rows = $(this);
217217
var updateInlineLabel = function(row) {
218-
$($rows.selector).find(".inline_label").each(function(i) {
218+
$(selector).find(".inline_label").each(function(i) {
219219
var count = i + 1;
220220
$(this).html($(this).html().replace(/(#\d+)/g, "#" + count));
221221
});
@@ -281,13 +281,16 @@
281281
$(document).ready(function() {
282282
$(".js-inline-admin-formset").each(function() {
283283
var data = $(this).data(),
284-
inlineOptions = data.inlineFormset;
284+
inlineOptions = data.inlineFormset,
285+
selector;
285286
switch(data.inlineType) {
286287
case "stacked":
287-
$(inlineOptions.name + "-group .inline-related").stackedFormset(inlineOptions.options);
288+
selector = inlineOptions.name + "-group .inline-related";
289+
$(selector).stackedFormset(selector, inlineOptions.options);
288290
break;
289291
case "tabular":
290-
$(inlineOptions.name + "-group .tabular.inline-related tbody:first > tr").tabularFormset(inlineOptions.options);
292+
selector = inlineOptions.name + "-group .tabular.inline-related tbody:first > tr";
293+
$(selector).tabularFormset(selector, inlineOptions.options);
291294
break;
292295
}
293296
});

django/contrib/admin/static/admin/js/inlines.min.js

+12-12
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

js_tests/admin/inlines.test.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ QUnit.module('admin.inlines: tabular formsets', {
1111
$('#qunit-fixture').append($('#tabular-formset').text());
1212
this.table = $('table.inline');
1313
this.inlineRow = this.table.find('tr');
14-
that.inlineRow.tabularFormset({
14+
that.inlineRow.tabularFormset('table.inline tr', {
1515
prefix: 'first',
1616
addText: that.addText,
1717
deleteText: 'Remove'
@@ -60,7 +60,7 @@ QUnit.test('existing add button', function(assert) {
6060
this.inlineRow = this.table.find('tr');
6161
this.table.append('<i class="add-button"></i>');
6262
var addButton = this.table.find('.add-button');
63-
this.inlineRow.tabularFormset({
63+
this.inlineRow.tabularFormset('table.inline tr', {
6464
prefix: 'first',
6565
deleteText: 'Remove',
6666
addButton: addButton

0 commit comments

Comments
 (0)