Changeset 87a8685 in github

Timestamp:

May 22, 2010 2:24:33 PM (3 years ago)

Author:

alecpl <alec@…>

Branches:

master, HEAD, courier-fix, dev-browser-capabilities, pdo, release-0.6, release-0.7, release-0.8

Children:

6f4e7db

Parents:

0b7f3a8

Message:

• Fix wrong message on file upload error (#1486725)

Files:

• CHANGELOG (modified) (1 diff)
• program/js/app.js (modified) (1 diff)

CHANGELOG

@@ -2 +2 @@
 ===========================
 
+- Fix wrong message on file upload error (#1486725)
 - Add support for data URI scheme [RFC2397] (#1486740)
 - Added 'actionbefore', 'actionafter', 'responsebefore', 'responseafter' events

program/js/app.js

@@ -3104 +3104 @@
 
       // handle upload errors, parsing iframe content in onload
-      var fr = document.getElementsByName(frame_name)[0];
-      $(fr).bind('load', {ts:ts}, function(e) {
-        var content = '';
+      $(frame_name).bind('load', {ts:ts}, function(e) {
+        var d, content = '';
         try {
           if (this.contentDocument) {
-            var d = this.contentDocument;
+            d = this.contentDocument;
           } else if (this.contentWindow) {
-            var d = this.contentWindow.document;
+            d = this.contentWindow.document;
           }
           content = d.childNodes[0].innerHTML;
         } catch (e) {}
 
-        if (!String(content).match(/add2attachment/) && (!bw.opera || (rcmail.env.uploadframe && rcmail.env.uploadframe == e.data.ts))) {
-          rcmail.display_message(rcmail.get_label('fileuploaderror'), 'error');
+        if (!content.match(/add2attachment/) && (!bw.opera || (rcmail.env.uploadframe && rcmail.env.uploadframe == e.data.ts))) {
+          if (!content.match(/display_message/))
+            rcmail.display_message(rcmail.get_label('fileuploaderror'), 'error');
           rcmail.remove_from_attachment_list(e.data.ts);
         }