diff options
| author | Aleksander Machniak <alec@alec.pl> | 2014-04-18 11:26:07 +0200 |
|---|---|---|
| committer | Aleksander Machniak <alec@alec.pl> | 2014-04-18 11:26:07 +0200 |
| commit | fb162e744551b7b9d719ec719c2daf0050bcead3 (patch) | |
| tree | e51f6dcf412349b4bced00e233c9e2c3b627cf76 | |
| parent | 5515dbb9707571209515643464fb6267199fb523 (diff) | |
Fix redundant alert message on over-size uploads (#1489817)
| -rw-r--r-- | CHANGELOG | 1 | ||||
| -rw-r--r-- | program/js/app.js | 20 |
2 files changed, 12 insertions, 9 deletions
@@ -19,6 +19,7 @@ CHANGELOG Roundcube Webmail - Fix lack of translation of special folders in some configurations (#1489799) - Fix XSS issue in plain text spellchecker (#1489806) - Fix invalid page title for some folders (1489804) +- Fix redundant alert message on over-size uploads (#1489817) RELEASE 1.0.0 ------------- diff --git a/program/js/app.js b/program/js/app.js index d6403f7ac..4a5200028 100644 --- a/program/js/app.js +++ b/program/js/app.js @@ -1074,8 +1074,9 @@ function rcube_webmail() // Reset the auto-save timer clearTimeout(this.save_timer); - if (!this.upload_file(props || this.gui_objects.uploadform, 'upload')) { - alert(this.get_label('selectimportfile')); + if (!(flag = this.upload_file(props || this.gui_objects.uploadform, 'upload'))) { + if (flag !== false) + alert(this.get_label('selectimportfile')); aborted = true; } break; @@ -1200,12 +1201,15 @@ function rcube_webmail() break; case 'import-messages': - var form = props || this.gui_objects.importform; - var importlock = this.set_busy(true, 'importwait'); + var form = props || this.gui_objects.importform, + importlock = this.set_busy(true, 'importwait'); + $('input[name="_unlock"]', form).val(importlock); - if (!this.upload_file(form, 'import')) { + + if (!(flag = this.upload_file(form, 'import'))) { this.set_busy(false, null, importlock); - alert(this.get_label('selectimportfile')); + if (flag !== false) + alert(this.get_label('selectimportfile')); aborted = true; } break; @@ -4016,7 +4020,7 @@ function rcube_webmail() this.upload_file = function(form, action) { if (!form) - return false; + return; // count files and size on capable browser var size = 0, numfiles = 0; @@ -4076,8 +4080,6 @@ function rcube_webmail() this.gui_objects.attachmentform = form; return true; } - - return false; }; // add file name to attachment list |