Updating error display of max folder size

3190e068 · Nicolas Widart · ab057194 · 3190e068 · 3190e068
Unverified Commit 3190e068 authored Sep 10, 2017 by Nicolas Widart
Hide whitespace changes
Inline Side-by-side

Showing with 12 additions and 2 deletions

init-dropzone.js Modules/Media/Assets/js/init-dropzone.js +6 -1

init-dropzone.js public/modules/media/js/init-dropzone.js +6 -1

No files found.
--- a/Modules/Media/Assets/js/init-dropzone.js
+++ b/Modules/Media/Assets/js/init-dropzone.js
@@ -18,7 +18,12 @@ $( document ).ready(function() {
        }
    });
    myDropzone.on("error", function(file, errorMessage) {
-        var html = '<div class="alert alert-danger" role="alert">' + errorMessage + '</div>';
+        let html;
+        if (typeof(errorMessage) === 'object') {
+            html = '<div class="alert alert-danger" role="alert">' + errorMessage.errors.file.join(', ') + '</div>';
+        } else {
+            html = '<div class="alert alert-danger" role="alert">' + errorMessage + '</div>';
+        }
        $('.col-md-12').first().prepend(html);
        setTimeout(function() {
            myDropzone.removeFile(file);

--- a/public/modules/media/js/init-dropzone.js
+++ b/public/modules/media/js/init-dropzone.js
@@ -18,7 +18,12 @@ $( document ).ready(function() {
        }
    });
    myDropzone.on("error", function(file, errorMessage) {
-        var html = '<div class="alert alert-danger" role="alert">' + errorMessage + '</div>';
+        let html;
+        if (typeof(errorMessage) === 'object') {
+            html = '<div class="alert alert-danger" role="alert">' + errorMessage.errors.file.join(', ') + '</div>';
+        } else {
+            html = '<div class="alert alert-danger" role="alert">' + errorMessage + '</div>';
+        }
        $('.col-md-12').first().prepend(html);
        setTimeout(function() {
            myDropzone.removeFile(file);