Skip to content

Commit a592363

Browse files
authored
Merge pull request jrief#199 from DingGGu/jquery-deprecated
Support Django2.1
2 parents b1f9e08 + fc4b173 commit a592363

File tree

4 files changed

+881
-6
lines changed

4 files changed

+881
-6
lines changed

.travis.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ env:
1111
- DJANGO="django<1.11"
1212
- DJANGO="django<2.0"
1313
- DJANGO="django<2.1"
14+
- DJANGO="django<2.2"
1415
- DJANGO='https://github.com/django/django/archive/master.tar.gz'
1516

1617
install:

adminsortable2/static/adminsortable2/js/list-sortable.js

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -37,13 +37,13 @@ django.jQuery(function($) {
3737
tolerance: 'pointer',
3838
start: function (event, dragged_rows) {
3939
$(this).find('thead tr th').each(function (index) {
40-
$(dragged_rows.item.context.childNodes[index]).width($(this).width() - 10);
40+
$(dragged_rows.item[0].childNodes[index]).width($(this).width() - 10);
4141
});
4242
startindex = dragged_rows.item.index();
4343
},
4444
stop: function (event, dragged_rows) {
4545
$(this).find('thead tr th').each(function (index) {
46-
$(dragged_rows.item.context.childNodes[index]).width('auto');
46+
$(dragged_rows.item[0].childNodes[index]).width('auto');
4747
});
4848

4949
var $result_list = $(this);
@@ -55,11 +55,11 @@ django.jQuery(function($) {
5555
if (startindex == endindex) return;
5656
else if (endindex == 0) {
5757
if (ordering.split('.')[0] === '-1')
58-
endorder = parseInt($(dragged_rows.item.context.nextElementSibling).find('div.drag').attr('order')) + 1;
58+
endorder = parseInt($(dragged_rows.item[0].nextElementSibling).find('div.drag').attr('order')) + 1;
5959
else
60-
endorder = parseInt($(dragged_rows.item.context.nextElementSibling).find('div.drag').attr('order')) - 1;
60+
endorder = parseInt($(dragged_rows.item[0].nextElementSibling).find('div.drag').attr('order')) - 1;
6161
} else {
62-
endorder = $(dragged_rows.item.context.previousElementSibling).find('div.drag').attr('order');
62+
endorder = $(dragged_rows.item[0].previousElementSibling).find('div.drag').attr('order');
6363
}
6464
startorder = $(dragged_rows.item.context).find('div.drag').attr('order');
6565

0 commit comments

Comments
 (0)