summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authoralecpl <alec@alec.pl>2009-10-05 07:25:03 +0000
committeralecpl <alec@alec.pl>2009-10-05 07:25:03 +0000
commit640d305d8ddab2a16aad43602669c86fbaf14678 (patch)
tree0ecd4701baa3e7be0be36a41c4f981ea1ca880f9
parent757d2bb92430a2654be0aee2c299c6ef3a3fdc2b (diff)
- fix upload errors handling in Opera
-rw-r--r--program/js/app.js5
1 files changed, 4 insertions, 1 deletions
diff --git a/program/js/app.js b/program/js/app.js
index 879c9aa15..d4161714e 100644
--- a/program/js/app.js
+++ b/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;