Changeset 4570 in subversion

Timestamp:

Feb 25, 2011 4:16:05 AM (2 years ago)

Author:

alec

Message:

• Fix attachments uploading, broken with devel-addressbook branch merge

File:

• trunk/roundcubemail/program/js/app.js (modified) (5 diffs)

trunk/roundcubemail/program/js/app.js

@@ -3191 +3191 @@
     // create hidden iframe and post upload form
     if (send) {
-      this.async_upload_form(form, 'upload', function(e) {
+      var frame_name = this.async_upload_form(form, 'upload', function(e) {
         var d, content = '';
         try {
@@ -3200 +3200 @@
           }
           content = d.childNodes[0].innerHTML;
-        } catch (e) {}
+        } catch (err) {}
 
         if (!content.match(/add2attachment/) && (!bw.opera || (rcmail.env.uploadframe && rcmail.env.uploadframe == e.data.ts))) {
@@ -3213 +3213 @@
 
       // display upload indicator and cancel button
-      var content = this.get_label('uploading');
+      var content = this.get_label('uploading'),
+        ts = frame_name.replace(/^rcmupload/, '');
+
       if (this.env.loadingicon)
         content = '<img src="'+this.env.loadingicon+'" alt="" />'+content;
@@ -5374 +5376 @@
   this.async_upload_form = function(form, action, onload)
   {
-    var ts = new Date().getTime();
-    var frame_name = 'rcmupload'+ts;
+    var ts = new Date().getTime(),
+      frame_name = 'rcmupload'+ts;
 
     // have to do it this way for IE
@@ -5400 +5402 @@
     form.setAttribute('enctype', 'multipart/form-data');
     form.submit();
+
+    return frame_name;
   };