+ now correctly working error messages

Signed-off-by: Johannes Theiner <j.theiner@live.de>

src/main/webapp/js/upload.js

@@ -23,21 +23,17 @@ form.onsubmit = function (event) {
         loading.modal('open');
     };
 
-    xhr.onreadystatechange = function() {
+    xhr.onloadend = function (e) {
-        if (xhr.readyState == XMLHttpRequest.DONE) {
+        clearSelected();
-            if(xhr.responseText != null) {
+        if (/[a-z]/.test(xhr.responseText)) {
-                loading.modal('close');
             console.log(xhr.responseText);
+            loading.modal('close');
             $('#error-message').text(xhr.responseText);
             error.modal('open');
         }
-        }
-    }
-
-    xhr.onloadend = function (e) {
-        clearSelected();
         updateDatasets();
         form.reset();
+
     };
 
     xhr.open('POST', form.getAttribute('action'), true);

src/main/webapp/menu.jsp

@@ -144,17 +144,18 @@
     <div class="modal-footer">
 
     </div>
+</div>
 
 <div id="error" class="modal">
     <div class="modal-content">
-            <h4>Es ist ein Fehler aufgetreten</h4>
+        <i class="material-icons">error_outline</i>
-            <p id="error-message">A bunch of text</p>
+        <h2 class="center">Fehler</h2>
+        <h4 id="error-message" class="center">Hallo Welt, das sollte nie zu sehen sein.</h4>
     </div>
     <div class="modal-footer">
         <a href="#!" class="modal-close waves-effect waves-green btn-flat">Ok</a>
     </div>
 </div>
-</div>