Author: adrian Date: 2011-12-09 13:41:20 -0800 (Fri, 09 Dec 2011) New Revision: 17181
Modified: django/trunk/django/contrib/admin/static/admin/js/SelectFilter2.js django/trunk/django/contrib/admin/static/admin/js/collapse.js django/trunk/django/contrib/admin/static/admin/js/collapse.min.js Log: Fixed #17218 -- Fixed bug with SelectFilter where the 'to' box had a height=0 when it was within a collapsed fieldset. Thanks jimallman Modified: django/trunk/django/contrib/admin/static/admin/js/SelectFilter2.js =================================================================== --- django/trunk/django/contrib/admin/static/admin/js/SelectFilter2.js 2011-12-09 21:30:53 UTC (rev 17180) +++ django/trunk/django/contrib/admin/static/admin/js/SelectFilter2.js 2011-12-09 21:41:20 UTC (rev 17181) @@ -97,7 +97,15 @@ if (!is_stacked) { // In horizontal mode, give the same height to the two boxes. - $(to_box).height($(filter_p).outerHeight() + $(from_box).outerHeight()); + var j_from_box = $(from_box); + var j_to_box = $(to_box); + var resize_filters = function() { j_to_box.height($(filter_p).outerHeight() + j_from_box.outerHeight()); } + if (j_from_box.outerHeight() > 0) { + resize_filters(); // This fieldset is already open. Resize now. + } else { + // This fieldset is probably collapsed. Wait for its 'show' event. + j_to_box.closest('fieldset').one('show.fieldset', resize_filters); + } } // Initial icon refresh 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:30:53 UTC (rev 17180) +++ django/trunk/django/contrib/admin/static/admin/js/collapse.js 2011-12-09 21:41:20 UTC (rev 17181) @@ -12,11 +12,11 @@ // Add toggle to anchor tag $("fieldset.collapse a.collapse-toggle").toggle( function() { // Show - $(this).text(gettext("Hide")).closest("fieldset").removeClass("collapsed"); + $(this).text(gettext("Hide")).closest("fieldset").removeClass("collapsed").trigger("show.fieldset", [$(this).attr("id")]); return false; }, function() { // Hide - $(this).text(gettext("Show")).closest("fieldset").addClass("collapsed"); + $(this).text(gettext("Show")).closest("fieldset").addClass("collapsed").trigger("hide.fieldset", [$(this).attr("id")]); 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:30:53 UTC (rev 17180) +++ django/trunk/django/contrib/admin/static/admin/js/collapse.min.js 2011-12-09 21:41:20 UTC (rev 17181) @@ -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").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); +(function(a){a(document).ready(function(){a("fieldset.collapse").each(function(c,b){0==a(b).find("div.errors").length&&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").trigger("show.fieldset",[a(this).attr("id")]);return!1},function(){a(this).text(gettext("Show")).closest("fieldset").addClass("collapsed").trigger("hide.fieldset", +[a(this).attr("id")]);return!1})})})(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.