- fix upload errors handling in Opera

git-svn-id: https://svn.roundcube.net/trunk@3017 208e9e7b-5314-0410-a742-e7e81cd9613c

1 files changed, 4 insertions, 1 deletions

diff --git a/roundcubemail/program/js/app.js b/roundcubemail/program/js/app.js
index 879c9aa15..d4161714e 100644
--- a/roundcubemail/program/js/app.js
+++ b/roundcubemail/program/js/app.js
@@ -2474,10 +2474,13 @@ function rcube_webmail()
 	  content = d.childNodes[0].innerHTML;
         } catch (e) {}
 
-	if (!content.match(/add2attachment/)) {
+	if (!String(content).match(/add2attachment/) && (!bw.opera || (rcmail.env.uploadframe && rcmail.env.uploadframe == e.data.ts))) {
 	  rcmail.display_message(rcmail.get_label('fileuploaderror'), 'error');
 	  rcmail.remove_from_attachment_list(e.data.ts);
         }
+	// Opera hack: handle double onload
+	if (bw.opera)
+	  rcmail.env.uploadframe = e.data.ts;
       });
 
       form.target = frame_name;