IDE: use the popup's overlay (and not the svg) to display file size e…

…rrors
BelaPlatform · Jun 17, 2022 · 2f69554 · 2f69554
1 parent fedc2ae
commit 2f69554
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 18 deletions.
diff --git a/IDE/frontend-dev/scss/base.scss b/IDE/frontend-dev/scss/base.scss
@@ -136,9 +136,6 @@ body {
   [data-drag-func=folder] {
     fill: rgb(0, 255, 0);
   }
-  &.no>polygon {
-    fill: rgb(255, 0, 0);
-  }
 }
 
 ul {

diff --git a/IDE/frontend-dev/src/Views/FileView.js b/IDE/frontend-dev/src/Views/FileView.js
@@ -217,8 +217,8 @@ class FileView extends View {
 	}
 
 	hideOverlay(){
-		this.svg.removeClassSVG(overlayActiveClass).removeClassSVG('no');
-		$('polygon', this.svg).removeClassSVG(overlayActiveClass).removeClassSVG('no');
+		this.svg.removeClassSVG(overlayActiveClass);
+		$('polygon', this.svg).removeClassSVG(overlayActiveClass);
 	}
 
 	// UI events
@@ -272,14 +272,15 @@ class FileView extends View {
   uploadSizeError(name){
 		let strings = Object.assign({}, json.popups.upload_size_error);
 		strings.title = utils.formatString(strings.title, utils.breakable(name));
+		this.hideOverlay();
 		popup.twoButtons(strings,
 			() =>{
-				this.hideOverlay();
 				this.uploadFile();
 			},
-			() => this.hideOverlay(),
+			undefined,
 			{
 				titleClass: 'error',
+				error: true,
 			}
 		);
   }
@@ -672,7 +673,6 @@ class FileView extends View {
 		{
 			// once we finished uploading the small files, print a
 			// single error message for all of the large ones
-			this.svg.addClassSVG('no');
 			this.uploadSizeError(largeFileQueue.join('`, `'));
 			largeFileQueue = [];
 		}

diff --git a/IDE/public/css/style.css b/IDE/public/css/style.css
@@ -137,8 +137,6 @@ body.uploading {
     fill: #00ff7a; }
   [data-drag-svg] [data-drag-func=folder] {
     fill: lime; }
-  [data-drag-svg].no > polygon {
-    fill: red; }
 
 ul {
   font-family: inconsolata; }

diff --git a/IDE/public/js/bundle.js b/IDE/public/js/bundle.js