Fixing conflict merge.

2021-09-22 07:09:01 +02:00 · 2021-09-22 07:09:01 +02:00 · 1101299168
commit 1101299168
parent 22be8e2e9d
2 changed files with 2 additions and 2 deletions
--- a/wled00/data/settings_leds.htm
+++ b/wled00/data/settings_leds.htm
@ -369,7 +369,7 @@ ${i+1}:
    }
    function uploadFile(name) {
      var req = new XMLHttpRequest();
-      req.addEventListener('load', function(){showToast(this.responseText)});
+      req.addEventListener('load', function(){showToast(this.responseText,this.status >= 400)});
      req.addEventListener('error', function(e){showToast(e.stack,true);});
      req.open("POST", "/upload");
      var formData = new FormData();
--- a/wled00/html_settings.h
+++ b/wled00/html_settings.h