Ticket #17218: select-filter-waits-for-collapsed-fieldset.diff

django/contrib/admin/static/admin/js/SelectFilter2.js

@@ -99 +99 @@
 
         if (!is_stacked) {
             // In horizontal mode, give the same height to the two boxes.
-            $(to_box).height($(filter_p).outerHeight() + $(from_box).outerHeight());
+            if ($(from_box).outerHeight() > 0) {
+                // this fieldset is already open, resize now
+                $(to_box).height($(filter_p).outerHeight() + $(from_box).outerHeight());
+            } else {
+                // this fieldset is probably collapsed (not safe to resize); wait for its 'show' event
+                $(to_box).closest('fieldset').bind('show.fieldset', function( event, fieldsetID ) {
+                    $(to_box).height($(filter_p).outerHeight() + $(from_box).outerHeight());
+                    $(this).unbind(event);   // unbinds ONLY this handler (no need to resize repeatedly)
+                });
+            }
         }
 
         // Initial icon refresh

django/contrib/admin/static/admin/js/collapse.js

@@ -15 +15 @@
                         function() { // Show
                                 $(this).text(gettext("Hide"));
                                 $(this).closest("fieldset").removeClass("collapsed");
+                                $(this).closest("fieldset").trigger("show.fieldset",[$(this).attr("id")]);
                                 return false;
                         },
                         function() { // Hide
                                 $(this).text(gettext("Show"));
                                 $(this).closest("fieldset").addClass("collapsed");
+                                $(this).closest("fieldset").trigger("hide.fieldset",[$(this).attr("id")]);
                                 return false;
                         }
                 );

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

@@ -1 @@
-(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");
-return false})})})(django.jQuery);
+(function(a){a(document).ready(function(){a("fieldset.collapse").each(function(c,b){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");a(this).closest("fieldset").trigger("show.fieldset",[a(this).attr("id")]);return false},
+function(){a(this).text(gettext("Show"));a(this).closest("fieldset").addClass("collapsed");a(this).closest("fieldset").trigger("hide.fieldset",[a(this).attr("id")]);return false})})})(django.jQuery);