diff --git a/frontend-js/src/main/js/gui/export/AbstractExportPanel.js b/frontend-js/src/main/js/gui/export/AbstractExportPanel.js index 4eea71a0f3c6a85239986d22f62dd41a50252baa..2f16acc9ab0bb39f710da2871ee832c1e5ace72d 100644 --- a/frontend-js/src/main/js/gui/export/AbstractExportPanel.js +++ b/frontend-js/src/main/js/gui/export/AbstractExportPanel.js @@ -4,13 +4,13 @@ var Panel = require('../Panel'); +var GuiConnector = require('../../GuiConnector'); var logger = require('../../logger'); var Functions = require('../../Functions'); var DualListbox = require('dual-listbox').DualListbox; var Promise = require("bluebird"); function AbstractExportPanel(params) { - params.panelName = "elementExport"; params.scrollable = true; Panel.call(this, params); @@ -276,13 +276,19 @@ AbstractExportPanel.prototype._createDownloadButton = function() { name : "downloadButton", content : " Download", onclick : function() { + GuiConnector.showProcessing(); return self.createResponseString().then(function(result) { var blob = new Blob([ result ], { type : "text/plain;charset=utf-8" }); var FileSaver = require("file-saver"); - return FileSaver.saveAs(blob, self.getProject().getProjectId() + "-elements.txt"); - }).then(null, GuiConnector.alert); + return FileSaver.saveAs(blob, self.getProject().getProjectId() + "-" + self.getPanelName() + ".txt"); + }).then(function() { + GuiConnector.hideProcessing(); + }, function(error) { + GuiConnector.hideProcessing(); + GuiConnector.alert(error); + }); }, }); downloadDiv.appendChild(button); diff --git a/frontend-js/src/main/js/gui/export/ElementExportPanel.js b/frontend-js/src/main/js/gui/export/ElementExportPanel.js index f56db727ae46742a698abe43c798f54c36ae0533..59868a6b1ba66ad71ef3c8ae2247ff815f027c4b 100644 --- a/frontend-js/src/main/js/gui/export/ElementExportPanel.js +++ b/frontend-js/src/main/js/gui/export/ElementExportPanel.js @@ -11,7 +11,6 @@ var Promise = require("bluebird"); function ElementExportPanel(params) { params.panelName = "elementExport"; - params.scrollable = true; AbstractExportPanel.call(this, params); } diff --git a/frontend-js/src/main/js/gui/export/GraphicsExportPanel.js b/frontend-js/src/main/js/gui/export/GraphicsExportPanel.js index 6bf41a4246b1695a8bedde1007e23741acf6ad4c..0506c3af966931ae4ec5885c2fddd9998ea52f66 100644 --- a/frontend-js/src/main/js/gui/export/GraphicsExportPanel.js +++ b/frontend-js/src/main/js/gui/export/GraphicsExportPanel.js @@ -7,8 +7,7 @@ var Panel = require('../Panel'); var logger = require('../../logger'); function GraphicsExportPanel(params) { - params.panelName = "elementExport"; - params.scrollable = true; + params.panelName = "graphicsExport"; Panel.call(this, params); } diff --git a/frontend-js/src/main/js/gui/export/NetworkExportPanel.js b/frontend-js/src/main/js/gui/export/NetworkExportPanel.js index 097d0caf0a17713a90ab7c67b45ab9521012cf00..d93fdebae2f51ca83c232a5cd181b5d0f5b342ad 100644 --- a/frontend-js/src/main/js/gui/export/NetworkExportPanel.js +++ b/frontend-js/src/main/js/gui/export/NetworkExportPanel.js @@ -10,10 +10,8 @@ var GuiMessageError = require('../GuiMessageError'); function NetworkExportPanel(params) { - params.panelName = "elementExport"; - params.scrollable = true; + params.panelName = "networkExport"; AbstractExportPanel.call(this, params); - } NetworkExportPanel.prototype = Object.create(AbstractExportPanel.prototype);