Skip to content
Snippets Groups Projects
Commit 8d5ea9e0 authored by Piotr Gawron's avatar Piotr Gawron
Browse files

destroy method is passed to minerva object

parent 2959e025
No related branches found
No related tags found
1 merge request!7Resolve "info about loading data from server"
...@@ -185,4 +185,10 @@ LeftPanel.prototype.getFooter = function() { ...@@ -185,4 +185,10 @@ LeftPanel.prototype.getFooter = function() {
return this._footer; return this._footer;
}; };
LeftPanel.prototype.destroy = function() {
var promises = [];
promises.push(this.getFooter().destroy());
return Promise.all(promises);
};
module.exports = LeftPanel; module.exports = LeftPanel;
...@@ -22,6 +22,9 @@ var Promise = require("bluebird"); ...@@ -22,6 +22,9 @@ var Promise = require("bluebird");
var logger = require('./logger'); var logger = require('./logger');
var customMap, leftPanel, topMenu, legend, mapContextMenu, selectionContextMenu;
function processUrlGetParams(params) { function processUrlGetParams(params) {
var project = params.getProject(); var project = params.getProject();
var sessionData = ServerConnector.getSessionData(project); var sessionData = ServerConnector.getSessionData(project);
...@@ -184,6 +187,11 @@ function createResult(customMap) { ...@@ -184,6 +187,11 @@ function createResult(customMap) {
getProject : function() { getProject : function() {
return customMap.getProject(); return customMap.getProject();
}, },
destroy : function() {
return leftPanel.destroy().then(function() {
customMap.destroy();
});
},
}; };
} }
...@@ -244,10 +252,6 @@ function modifyParamsForTouchInterface(params) { ...@@ -244,10 +252,6 @@ function modifyParamsForTouchInterface(params) {
function create(params) { function create(params) {
params = modifyParamsForTouchInterface(params); params = modifyParamsForTouchInterface(params);
var customMap;
var leftPanel;
var topMenu;
var legend, mapContextMenu, selectionContextMenu;
if (!(params instanceof CustomMapOptions)) { if (!(params instanceof CustomMapOptions)) {
params = new CustomMapOptions(params); params = new CustomMapOptions(params);
} }
......
...@@ -230,9 +230,14 @@ describe('minerva global', function() { ...@@ -230,9 +230,14 @@ describe('minerva global', function() {
projectId : "sample", projectId : "sample",
element : testDiv element : testDiv
}; };
logger.debug(options); var globalResult;
return minerva.create(options).then(function(result) { return minerva.create(options).then(function(result) {
globalResult = result;
assert.ok(result); assert.ok(result);
}).then(function() {
globalResult.destroy()
}, function() {
globalResult.destroy()
}); });
}); });
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment