Author: adrian Date: 2011-12-09 13:30:53 -0800 (Fri, 09 Dec 2011) New Revision: 17180
Modified: django/trunk/django/contrib/admin/static/admin/js/collapse.js django/trunk/django/contrib/admin/static/admin/js/collapse.min.js Log: Changed admin/js/collapse.js to take advantage of jQuery chaining in three places. Should make for a slight performance boost. Modified: django/trunk/django/contrib/admin/static/admin/js/collapse.js =================================================================== --- django/trunk/django/contrib/admin/static/admin/js/collapse.js 2011-12-09 21:09:59 UTC (rev 17179) +++ django/trunk/django/contrib/admin/static/admin/js/collapse.js 2011-12-09 21:30:53 UTC (rev 17180) @@ -3,9 +3,8 @@ // Add anchor tag for Show/Hide link $("fieldset.collapse").each(function(i, elem) { // Don't hide if fields in this fieldset have errors - if ( $(elem).find("div.errors").length == 0 ) { - $(elem).addClass("collapsed"); - $(elem).find("h2").first().append(' (<a id="fieldsetcollapser' + + if ($(elem).find("div.errors").length == 0) { + $(elem).addClass("collapsed").find("h2").first().append(' (<a id="fieldsetcollapser' + i +'" class="collapse-toggle" href="#">' + gettext("Show") + '</a>)'); } @@ -13,13 +12,11 @@ // Add toggle to anchor tag $("fieldset.collapse a.collapse-toggle").toggle( function() { // Show - $(this).text(gettext("Hide")); - $(this).closest("fieldset").removeClass("collapsed"); + $(this).text(gettext("Hide")).closest("fieldset").removeClass("collapsed"); return false; }, function() { // Hide - $(this).text(gettext("Show")); - $(this).closest("fieldset").addClass("collapsed"); + $(this).text(gettext("Show")).closest("fieldset").addClass("collapsed"); return false; } ); Modified: django/trunk/django/contrib/admin/static/admin/js/collapse.min.js =================================================================== --- django/trunk/django/contrib/admin/static/admin/js/collapse.min.js 2011-12-09 21:09:59 UTC (rev 17179) +++ django/trunk/django/contrib/admin/static/admin/js/collapse.min.js 2011-12-09 21:30:53 UTC (rev 17180) @@ -1,2 +1,2 @@ -(function(a){a(document).ready(function(){a("fieldset.collapse").each(function(c,b){if(a(b).find("div.errors").length==0){a(b).addClass("collapsed");a(b).find("h2").first().append(' (<a id="fieldsetcollapser'+c+'" class="collapse-toggle" href="#">'+gettext("Show")+"</a>)")}});a("fieldset.collapse a.collapse-toggle").toggle(function(){a(this).text(gettext("Hide"));a(this).closest("fieldset").removeClass("collapsed");return false},function(){a(this).text(gettext("Show"));a(this).closest("fieldset").addClass("collapsed"); +(function(a){a(document).ready(function(){a("fieldset.collapse").each(function(c,b){if(a(b).find("div.errors").length==0){a(b).addClass("collapsed").find("h2").first().append(' (<a id="fieldsetcollapser'+c+'" class="collapse-toggle" href="#">'+gettext("Show")+"</a>)")}});a("fieldset.collapse a.collapse-toggle").toggle(function(){a(this).text(gettext("Hide")).closest("fieldset").removeClass("collapsed");return false},function(){a(this).text(gettext("Show")).closest("fieldset").addClass("collapsed"); return false})})})(django.jQuery); -- 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 django-updates+unsubscr...@googlegroups.com. For more options, visit this group at http://groups.google.com/group/django-updates?hl=en.