Index: misc/collapse.js
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/jquery_update/misc/Attic/collapse.js,v
retrieving revision 1.1.2.1
diff -u -r1.1.2.1 collapse.js
--- misc/collapse.js	2 May 2008 21:05:06 -0000	1.1.2.1
+++ misc/collapse.js	20 May 2008 15:14:26 -0000
@@ -72,6 +72,7 @@
         }
         return false;
       })).after($('<div class="fieldset-wrapper"></div>').append(fieldset.children(':not(legend)')));
+      $('fieldset.collapsed div.fieldset-wrapper').css({height: 'auto', display: 'none'});
     });
   });
 }
Index: misc/upload.js
===================================================================
RCS file: misc/upload.js
diff -N misc/upload.js
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ misc/upload.js	20 May 2008 15:13:59 -0000
@@ -0,0 +1,116 @@
+// $Id: upload.js,v 1.11 2006/08/31 23:31:25 unconed Exp $
+
+/**
+ * Attaches the upload behaviour to the upload form.
+ */
+Drupal.uploadAutoAttach = function() {
+  $('input.upload').each(function () {
+    var uri = this.value;
+    // Extract the base name from the id (edit-attach-url -> attach).
+    var base = this.id.substring(5, this.id.length - 4);
+    var button = base + '-button';
+    var wrapper = base + '-wrapper';
+    var hide = base + '-hide';
+    var upload = new Drupal.jsUpload(uri, button, wrapper, hide);
+  });
+}
+
+/**
+ * JS upload object.
+ */
+Drupal.jsUpload = function(uri, button, wrapper, hide) {
+  // Note: these elements are replaced after an upload, so we re-select them
+  // everytime they are needed.
+  this.button = '#'+ button;
+  this.wrapper = '#'+ wrapper;
+  this.hide = '#'+ hide;
+  Drupal.redirectFormButton(uri, $(this.button).get(0), this);
+}
+
+/**
+ * Handler for the form redirection submission.
+ */
+Drupal.jsUpload.prototype.onsubmit = function () {
+  // Insert progressbar and stretch to take the same space.
+  this.progress = new Drupal.progressBar('uploadprogress');
+  this.progress.setProgress(-1, 'Uploading file');
+
+  var hide = this.hide;
+  var el = this.progress.element;
+  var offset = $(hide).get(0).offsetHeight;
+  $(el).css({
+    width: '28em',
+    height: offset +'px',
+    paddingTop: '10px',
+    display: 'none'
+  });
+  $(hide).css('position', 'absolute');
+
+  $(hide).after(el);
+  $(el).fadeIn('slow');
+  $(hide).fadeOut('slow');
+}
+
+/**
+ * Handler for the form redirection completion.
+ */
+Drupal.jsUpload.prototype.oncomplete = function (data) {
+  // Remove old form
+  Drupal.freezeHeight(); // Avoid unnecessary scrolling
+  $(this.wrapper).html('');
+
+  // Place HTML into temporary div
+  var div = document.createElement('div');
+  $(div).html(data);
+
+  // If uploading the first attachment fade in everything
+  if ($('tr', div).size() == 2) {
+    // Replace form and re-attach behaviour
+    $(div).hide();
+    $(this.wrapper).append(div);
+    $(div).fadeIn('slow');
+    Drupal.uploadAutoAttach();
+  }
+  // Else fade in only the last table row
+  else {
+    // Hide form and last table row
+    $('table tr:last-child td', div).hide();
+
+    // Note: workaround because jQuery's #id selector does not work outside of 'document'
+    // Should be: $(this.hide, div).hide();
+    var hide = this.hide;
+    $('div', div).each(function() {
+      if (('#'+ this.id) == hide) {
+        this.style.display = 'none';
+      }
+    });
+
+    // Replace form, fade in items and re-attach behaviour
+    $(this.wrapper).append(div);
+    $('table tr:last-child td', div).fadeIn('slow');
+    $(this.hide, div).fadeIn('slow');
+    Drupal.uploadAutoAttach();
+  }
+  Drupal.unfreezeHeight();
+}
+
+/**
+ * Handler for the form redirection error.
+ */
+Drupal.jsUpload.prototype.onerror = function (error) {
+  alert('An error occurred:\n\n'+ error);
+  // Remove progressbar
+  $(this.progress.element).remove();
+  this.progress = null;
+  // Undo hide
+  $(this.hide).css({
+    position: 'static',
+    left: '0px'
+  });
+}
+
+
+// Global killswitch
+if (Drupal.jsEnabled) {
+  $(document).ready(Drupal.uploadAutoAttach);
+}