diff options
| author | alec <alec@208e9e7b-5314-0410-a742-e7e81cd9613c> | 2010-05-22 18:24:33 +0000 |
|---|---|---|
| committer | alec <alec@208e9e7b-5314-0410-a742-e7e81cd9613c> | 2010-05-22 18:24:33 +0000 |
| commit | 0d006cedc33f54c83927dbc07ee4074b12240614 (patch) | |
| tree | 789536ded97c76206645d8daf72a16ea9ee2c02b | |
| parent | eface8e728174d64906a13e04ae4e867e6675b71 (diff) | |
- Fix wrong message on file upload error (#1486725)
git-svn-id: https://svn.roundcube.net/trunk@3652 208e9e7b-5314-0410-a742-e7e81cd9613c
| -rw-r--r-- | roundcubemail/CHANGELOG | 1 | ||||
| -rw-r--r-- | roundcubemail/program/js/app.js | 14 |
2 files changed, 8 insertions, 7 deletions
diff --git a/roundcubemail/CHANGELOG b/roundcubemail/CHANGELOG index e4556682f..3a4f27ab1 100644 --- a/roundcubemail/CHANGELOG +++ b/roundcubemail/CHANGELOG @@ -1,6 +1,7 @@ CHANGELOG RoundCube Webmail =========================== +- Fix wrong message on file upload error (#1486725) - Add support for data URI scheme [RFC2397] (#1486740) - Added 'actionbefore', 'actionafter', 'responsebefore', 'responseafter' events - Removed response.callbacks feature diff --git a/roundcubemail/program/js/app.js b/roundcubemail/program/js/app.js index 991ba0385..dac6e6f4a 100644 --- a/roundcubemail/program/js/app.js +++ b/roundcubemail/program/js/app.js @@ -3103,20 +3103,20 @@ function rcube_webmail() } // 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); } // Opera hack: handle double onload |