diff --git a/frontend-js/src/main/js/gui/leftPanel/OverlayPanel.js b/frontend-js/src/main/js/gui/leftPanel/OverlayPanel.js index bc913c5257417b5a8202281f675acfdf05d160de..cfd2a9036c7306adaf52459a0ad25e7debdc0a3a 100644 --- 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%"; - content.style.height="100%"; - content.appendChild(self.createLabel("Name")); - var nameInput = self.createInputText(); - content.appendChild(nameInput); - content.appendChild(self.createNewLine()); - - content.appendChild(self.createLabel("Description")); - content.appendChild(self.createNewLine()); - var descriptionInput = self.createTextArea(); - content.appendChild(descriptionInput); - content.appendChild(self.createNewLine()); - - content.appendChild(self.createLabel("File")); - var fileInput = self.createFileButton(); - fileInput.addEventListener("change", function(){ - fileContent = null; - var file = fileInput.files[0]; - if (file) { - var reader = new FileReader(); - reader.readAsText(file, "UTF-8"); - reader.onload = function (evt) { - fileContent = evt.target.result; - var data = self.parseFile(fileContent); - 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"); + var content = document.createElement("div"); + content.style.width="100%"; + content.style.height="100%"; + content.appendChild(self.createLabel("Name")); + var nameInput = self.createInputText(); + content.appendChild(nameInput); + content.appendChild(self.createNewLine()); + + content.appendChild(self.createLabel("Description")); + content.appendChild(self.createNewLine()); + var descriptionInput = self.createTextArea(); + content.appendChild(descriptionInput); + content.appendChild(self.createNewLine()); + + content.appendChild(self.createLabel("File")); + var fileInput = self.createFileButton(); + fileInput.addEventListener("change", function(){ + fileContent = null; + var file = fileInput.files[0]; + if (file) { + var reader = new FileReader(); + reader.readAsText(file, "UTF-8"); + reader.onload = function (evt) { + fileContent = evt.target.result; + var data = self.parseFile(fileContent); + if (data.name!==undefined) { + nameInput.value =data.name; } 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"); - }); + 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 = { + 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() { - $(this).dialog("close"); - } - } ]; - self.openDialog(content, { - id : "addOverlay", - modal: true, - buttons : buttons, - }); - - resolve(); + } + }, { + text : "CANCEL", + click : function() { + $(this).dialog("close"); + } + } ]; + self.openDialog(content, { + id : "addOverlay", + modal: true, + buttons : buttons, }); };