Ticket #7009: collapsedFieldsets_by_id.diff

CollapsedFieldsets.js

@@ -25 +25 @@
                 collapsed_seen = true;
                 // Give it an additional class, used by CSS to hide it.
                 fs.className += ' ' + CollapsedFieldsets.collapsed_class;
+                if(! fs.id) {
+                    fs.id = 'django-collapsing-fieldset-'+i;   
+                }
                 // (<a id="fieldsetcollapser3" class="collapse-toggle" href="#">Show</a>)
                 var collapse_link = document.createElement('a');
                 collapse_link.className = 'collapse-toggle';
-                collapse_link.id = 'fieldsetcollapser' + i;
-                collapse_link.onclick = new Function('CollapsedFieldsets.show('+i+'); return false;');
+                collapse_link.id = 'fieldsetcollapser' + fs.id;
+                
+                collapse_link.onclick = new Function('CollapsedFieldsets.show("'+fs.id+'"); return false;');
                 collapse_link.href = '#';
                 collapse_link.innerHTML = gettext('Show');
                 var h2 = fs.getElementsByTagName('h2')[0];
@@ -53 +57 @@
         }
         return false;
     },
-    show: function(fieldset_index) {
-        var fs = document.getElementsByTagName('fieldset')[fieldset_index];
+    show: function(fieldset_id) {
+        var fs = document.getElementById(fieldset_id);
         // Remove the class name that causes the "display: none".
-        fs.className = fs.className.replace(CollapsedFieldsets.collapsed_re, '');
+        if (fs.className) {
+            fs.className = fs.className.replace(CollapsedFieldsets.collapsed_re, '');
+        }
         // Toggle the "Show" link to a "Hide" link
-        var collapse_link = document.getElementById('fieldsetcollapser' + fieldset_index);
-        collapse_link.onclick = new Function('CollapsedFieldsets.hide('+fieldset_index+'); return false;');
+        var collapse_link = document.getElementById('fieldsetcollapser' + fieldset_id);
+        collapse_link.onclick = new Function('CollapsedFieldsets.hide("'+fs.id+'"); return false;');
         collapse_link.innerHTML = gettext('Hide');
     },
-    hide: function(fieldset_index) {
-        var fs = document.getElementsByTagName('fieldset')[fieldset_index];
+    hide: function(fieldset_id) {
+        var fs = document.getElementById(fieldset_id);
         // Add the class name that causes the "display: none".
         fs.className += ' ' + CollapsedFieldsets.collapsed_class;
         // Toggle the "Hide" link to a "Show" link
-        var collapse_link = document.getElementById('fieldsetcollapser' + fieldset_index);
-        collapse_link.onclick = new Function('CollapsedFieldsets.show('+fieldset_index+'); return false;');
+        var collapse_link = document.getElementById('fieldsetcollapser' + fieldset_id);
+        collapse_link.onclick = new Function('CollapsedFieldsets.show("'+fs.id+'"); return false;');
         collapse_link.innerHTML = gettext('Show');
     },
 
@@ -76 +82 @@
         var fieldsets = document.getElementsByTagName('fieldset');
         for (var i=0; i<fieldsets.length; i++) {
             if (fieldsets[i].className.match(CollapsedFieldsets.collapsed_re)) {
-                CollapsedFieldsets.show(i);
+                CollapsedFieldsets.show(fieldsets[i].id);
             }
         }
     }
-}
+};
 
-addEvent(window, 'load', CollapsedFieldsets.init);
+addEvent(window, 'load', CollapsedFieldsets.init);
+ No newline at end of file