From 7f3bbbed4cae9a5e955d8209e5f1d98000ecc36e Mon Sep 17 00:00:00 2001 From: Brandon Taylor Date: Sat, 4 May 2013 15:00:23 -0400 Subject: [PATCH] Updated jQuery to 1.9.1 and jQueryUI to 1.10.2. Added create function handler to unbind events from sortable that were being applied to checkboxes within a sortable item. This was preventing the delete checkbox for inline models from being checked. Updated JavaScript inlcudes to not include unnecessary files. --- .../static/adminsortable/js/admin.sortable.js | 6 +++++- .../js/admin.sortable.stacked.inlines.js | 4 ++++ .../js/admin.sortable.tabular.inlines.js | 4 ++++ .../templates/adminsortable/change_form.html | 5 ++++- .../templates/adminsortable/change_list.html | 1 + .../shared/javascript_includes.html | 6 ++---- sample_project/database/test_project.sqlite | Bin 68608 -> 68608 bytes 7 files changed, 20 insertions(+), 6 deletions(-) diff --git a/adminsortable/static/adminsortable/js/admin.sortable.js b/adminsortable/static/adminsortable/js/admin.sortable.js index 3f1a449..bd9c024 100644 --- a/adminsortable/static/adminsortable/js/admin.sortable.js +++ b/adminsortable/static/adminsortable/js/admin.sortable.js @@ -14,7 +14,11 @@ jQuery(function($){ $.ajax({ url: ui.item.find('a.admin_sorting_url').attr('href'), type: 'POST', - data: { indexes: indexes.join(',') } + data: { indexes: indexes.join(',') }, + success: function() + { + ui.item.effect('highlight', {}, 1000); + } }); } }).click(function(e){ diff --git a/adminsortable/static/adminsortable/js/admin.sortable.stacked.inlines.js b/adminsortable/static/adminsortable/js/admin.sortable.stacked.inlines.js index 539100e..2fb3a5b 100644 --- a/adminsortable/static/adminsortable/js/admin.sortable.stacked.inlines.js +++ b/adminsortable/static/adminsortable/js/admin.sortable.stacked.inlines.js @@ -3,9 +3,13 @@ jQuery(function($){ { var sortable_inline_rows = $('.inline-group .inline-related'); sortable_inline_rows.addClass('sortable'); + $('.inline-group').sortable({ axis : 'y', containment : 'parent', + create: function(event, ui) { + $('.inline-related :checkbox').unbind(); + }, tolerance : 'pointer', items : '.inline-related', stop : function(event, ui) diff --git a/adminsortable/static/adminsortable/js/admin.sortable.tabular.inlines.js b/adminsortable/static/adminsortable/js/admin.sortable.tabular.inlines.js index ae032df..1b4dfdf 100644 --- a/adminsortable/static/adminsortable/js/admin.sortable.tabular.inlines.js +++ b/adminsortable/static/adminsortable/js/admin.sortable.tabular.inlines.js @@ -6,6 +6,10 @@ jQuery(function($){ $('.tabular.inline-related').sortable({ axis : 'y', containment : 'parent', + create: function(event, ui) + { + $('td.delete :checkbox').unbind(); + }, tolerance : 'pointer', items : 'tr:not(.add-row)', stop : function(event, ui) diff --git a/adminsortable/templates/adminsortable/change_form.html b/adminsortable/templates/adminsortable/change_form.html index e54840a..36d074c 100644 --- a/adminsortable/templates/adminsortable/change_form.html +++ b/adminsortable/templates/adminsortable/change_form.html @@ -7,11 +7,14 @@ {% url 'admin:jsi18n' as jsi18nurl %} {% if has_sortable_tabular_inlines or has_sortable_stacked_inlines %} - {% include sortable_javascript_includes_template %} + {% include sortable_javascript_includes_template with inlines=True %} {% endif %} {% if has_sortable_tabular_inlines %} {% endif %} + {% if has_sortable_stacked_inlines %} + + {% endif %} {% if has_sortable_stacked_inlines %} {% endif %} diff --git a/adminsortable/templates/adminsortable/change_list.html b/adminsortable/templates/adminsortable/change_list.html index 6af21fd..6cb3e7e 100644 --- a/adminsortable/templates/adminsortable/change_list.html +++ b/adminsortable/templates/adminsortable/change_list.html @@ -9,6 +9,7 @@ {% block extrahead %} {{ block.super }} {% include sortable_javascript_includes_template %} + {% endblock %} {% block breadcrumbs %} diff --git a/adminsortable/templates/adminsortable/shared/javascript_includes.html b/adminsortable/templates/adminsortable/shared/javascript_includes.html index b88fd64..fdfec34 100644 --- a/adminsortable/templates/adminsortable/shared/javascript_includes.html +++ b/adminsortable/templates/adminsortable/shared/javascript_includes.html @@ -1,4 +1,2 @@ - - - - + + diff --git a/sample_project/database/test_project.sqlite b/sample_project/database/test_project.sqlite index 5c6bc273d7b21d8631f0c540ddea14fae5dd862e..b2c830901955c3162f61ab854beff2676a01effd 100644 GIT binary patch delta 795 zcmZuu&1(}u6rY*jY|WNxjLFtoD=Y;GQWNs2l9O7Ypdw=X2e>q2sm7$NIix3BQt%6^ zvWMm(?ZHd&WcJ`er3a}OFN%Ryh!sB~eiXD&TWAkDyH#nT`{1$fz2C>oypa+gDe+so zY3+7LH?7@2d$$M;C2PyrK8BL*V-7Fy3`M)+ zsz8$hN>$CecB9}Wgm6p~Ok)OLP?1VwIE)$6DhKsnfO0~+Sf99**Sn3p7|5B!deqN2 zQM>A!F}rdz%mb5Bxd1HU6|T!4H>Cbaw4(eUePR_Rf<4kRRqsnMOZ*KjSq2+hKHfxB zb?2@#BAYerj}v>jy!2OTIEh|hj%bYpKUD}-gRIxMIFu3ksa#&@(H%^YD#6XYm>(_> zo15|S6!m!VUEZ-q<;&Huj5TRi!FF&^l{wpBjwQF3?``#H_#mP4L@s3w^H|sjNq7wF zcf^ctP|DYZgV+Kf~*u$e#Cgo z3Xv-ylDO!eZvpd@kH{F8vXr3r_J1X(Vy3&?3l=iyh!W)rbrLw_0AK* nGzaxQV>pvDJHvY8__%RF{5x&?!#-*n*>o=Z7h#VtneD#-9GkhL delta 632 zcmZva&1(}u7{=$FXST`sK~1u;jaAu;1gQv(|A5$oq9S5@^x%q15!+4K=8)bB7PJb{ zvX%By+Jh%OnJIWs@gVl%MKRC{QSbw?sZuKyp$hu$=F)(}%rHDWzj@yI7@JXJGwOC1 zEllq1rG*Cwp4<;WxqF4a(dm8H&6^lokE6`(A}+Kj}RiuqqUjZt;5P* z6bW1e_bR?(4sUP+W#0cZcH7h@NO$F|V}a{mD*FBI=wLAj%hUPeDb*&l?#P|;l$=Wr0Xa0cdSD?(a-S zmz2P=;KyJi+dp9$?-+Q3@b$w~L4kA(DN8|s&*F_#ZT2-1B#&anuRQHp>HVZ1D+5$B_B^%sP}#P(|P+ V<}obaOJDAz3MZAxRMvw%{{SXtl+pkI