unnecessary promise removed

8ec90158 · Piotr Gawron · 507a6ed8 · 8ec90158
Commit 8ec90158 authored 7 years ago by Piotr Gawron
--- a/frontend-js/src/main/js/gui/leftPanel/OverlayPanel.js
+++ b/frontend-js/src/main/js/gui/leftPanel/OverlayPanel.js
@@ -343,87 +343,82 @@ OverlayPanel.prototype.parseFile = function(fileContent) {
 OverlayPanel.prototype.openAddOverlayDialog = function() {
  var self = this;
  var fileContent = null;
-  return new Promise(function(resolve){
+  var content = document.createElement("div");
+  content.style.width="100%";
-    var content = document.createElement("div");
+  content.style.height="100%";
-    content.style.width="100%";
+  content.appendChild(self.createLabel("Name"));
-    content.style.height="100%";
+  var nameInput = self.createInputText();
-    content.appendChild(self.createLabel("Name"));
+  content.appendChild(nameInput);
-    var nameInput = self.createInputText();
+  content.appendChild(self.createNewLine());
-    content.appendChild(nameInput);
-    content.appendChild(self.createNewLine());
+  content.appendChild(self.createLabel("Description"));
+  content.appendChild(self.createNewLine());
-    content.appendChild(self.createLabel("Description"));
+  var descriptionInput = self.createTextArea();
-    content.appendChild(self.createNewLine());
+  content.appendChild(descriptionInput);
-    var descriptionInput = self.createTextArea();
+  content.appendChild(self.createNewLine());
-    content.appendChild(descriptionInput);
-    content.appendChild(self.createNewLine());
+  content.appendChild(self.createLabel("File"));
+  var fileInput = self.createFileButton();
-    content.appendChild(self.createLabel("File"));
+  fileInput.addEventListener("change", function(){
-    var fileInput = self.createFileButton();
+    fileContent = null;
-    fileInput.addEventListener("change", function(){
+    var file = fileInput.files[0];
-      fileContent = null;
+    if (file) {
-      var file = fileInput.files[0];
+      var reader = new FileReader();
-      if (file) {
+      reader.readAsText(file, "UTF-8");
-        var reader = new FileReader();
+      reader.onload = function (evt) {
-        reader.readAsText(file, "UTF-8");
+        fileContent = evt.target.result;
-        reader.onload = function (evt) {
+        var data = self.parseFile(fileContent);
-          fileContent = evt.target.result;
+        if (data.name!==undefined) {
-          var data = self.parseFile(fileContent);
+          nameInput.value =data.name; 
-          if (data.name!==undefined) {
-            nameInput.value =data.name; 
-          } else {
-            var filename = fileInput.value;
-            if (filename.indexOf(".")>0) {
-              filename.substr(0,filename.indexOf(".")-1);
-            }
-            nameInput.value =filename; 
-          }
-          if (data.description!==undefined) {
-            descriptionInput.value =data.description; 
-          }
-        };
-        reader.onerror = function () {
-          GuiConnector.alert("Problem reading file");
-        };
-      }
-    }, false);
-    content.appendChild(fileInput);
-    content.appendChild(self.createNewLine());
-    var buttons = [ {
-      text : "UPLOAD",
-      click : function() {
-        var dialog = this;
-        if (fileContent===null) {
-          GuiConnector.alert("No file was selected");
        } else {
-          var data = {
+          var filename = fileInput.value;
-              name : nameInput.value,
+          if (filename.indexOf(".")>0) {
-              description : descriptionInput.value,
+            filename.substr(0,filename.indexOf(".")-1);
-              content : fileContent,
+          }
-              filename : fileInput.value
+          nameInput.value =filename; 
-          };          
-          return ServerConnector.addOverlay(data).then(function(){
-            return self.refresh();
-          }).then(function(){
-            $(dialog).dialog("close");
-          });
        }
+        if (data.description!==undefined) {
+          descriptionInput.value =data.description; 
+        }
+      };
+      reader.onerror = function () {
+        GuiConnector.alert("Problem reading file");
+      };
+    }
+  }, false);
+  content.appendChild(fileInput);
+  content.appendChild(self.createNewLine());
+  var buttons = [ {
+    text : "UPLOAD",
+    click : function() {
+      var dialog = this;
+      if (fileContent===null) {
+        GuiConnector.alert("No file was selected");
+      } else {
+        var data = {
+            name : nameInput.value,
+            description : descriptionInput.value,
+            content : fileContent,
+            filename : fileInput.value
+        };          
+        return ServerConnector.addOverlay(data).then(function(){
+          return self.refresh();
+        }).then(function(){
+          $(dialog).dialog("close");
+        });
      }
-    }, {
+    }
-      text : "CANCEL",
+  }, {
-      click : function() {
+    text : "CANCEL",
-        $(this).dialog("close");
+    click : function() {
-      }
+      $(this).dialog("close");
-    } ];
+    }
-    self.openDialog(content, {
+  } ];
-      id : "addOverlay",
+  self.openDialog(content, {
-      modal: true,
+    id : "addOverlay",
-      buttons : buttons,
+    modal: true,
-    });
+    buttons : buttons,
-    resolve();
  });
 };