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

resize is triggered once when crating admin panel

parent da5b3fdc
No related branches found
No related tags found
2 merge requests!115Resolve "admin panel should use API",!114Resolve "admin panel should use API"
This diff is collapsed.
...@@ -146,7 +146,9 @@ Admin.prototype.init = function () { ...@@ -146,7 +146,9 @@ Admin.prototype.init = function () {
promises.push(this._panels[i].init()); promises.push(this._panels[i].init());
} }
promises.push(this.getHeader().init()); promises.push(this.getHeader().init());
return Promise.all(promises); return Promise.all(promises).then(function(){
$(window).trigger('resize');
});
}; };
Admin.prototype.setConfiguration = function (configuration) { Admin.prototype.setConfiguration = function (configuration) {
......
...@@ -118,8 +118,6 @@ CommentsAdminPanel.prototype.refreshProjects = function() { ...@@ -118,8 +118,6 @@ CommentsAdminPanel.prototype.refreshProjects = function() {
}).then(function(projectId) { }).then(function(projectId) {
projectSelect.value = projectId; projectSelect.value = projectId;
return self.onProjectChange(); return self.onProjectChange();
}).then(function() {
$(window).trigger('resize');
}); });
}; };
......
...@@ -124,8 +124,6 @@ MapsAdminPanel.prototype.init = function () { ...@@ -124,8 +124,6 @@ MapsAdminPanel.prototype.init = function () {
var self = this; var self = this;
return ServerConnector.getProjects().then(function (projects) { return ServerConnector.getProjects().then(function (projects) {
return self.setProjects(projects); return self.setProjects(projects);
}).then(function () {
$(window).trigger('resize');
}); });
}; };
......
...@@ -16,11 +16,14 @@ var logger = require('./logger'); ...@@ -16,11 +16,14 @@ var logger = require('./logger');
describe('minerva global', function () { describe('minerva global', function () {
beforeEach(function () { beforeEach(function () {
global.scriptDiv = document.createElement("script");
global.GuiConnector = undefined; global.GuiConnector = undefined;
global.ServerConnector = undefined; global.ServerConnector = undefined;
document.body.appendChild(global.scriptDiv);
}); });
afterEach(function () { afterEach(function () {
document.body.removeChild(global.scriptDiv);
global.GuiConnector = GuiConnectorMock; global.GuiConnector = GuiConnectorMock;
global.ServerConnector = ServerConnectorMock; global.ServerConnector = ServerConnectorMock;
}); });
...@@ -71,18 +74,15 @@ describe('minerva global', function () { ...@@ -71,18 +74,15 @@ describe('minerva global', function () {
it("showComments", function () { it("showComments", function () {
var options = null; var options = null;
var customMap;
return ServerConnectorMock.getProject().then(function (project) { return ServerConnectorMock.getProject().then(function (project) {
options = helper.createCustomMapOptions(project); options = helper.createCustomMapOptions(project);
return minerva.create(options); return minerva.create(options);
}).then(function (result) { }).then(function () {
customMap = result;
var commentCheckbox = document.getElementsByName("commentCheckbox")[0]; var commentCheckbox = document.getElementsByName("commentCheckbox")[0];
commentCheckbox.checked = true; commentCheckbox.checked = true;
return commentCheckbox.onclick(); return commentCheckbox.onclick();
}).then(function () { }).then(function () {
assert.ok(ServerConnectorMock.getSessionData(options.getProject()).getShowComments()); assert.ok(ServerConnectorMock.getSessionData(options.getProject()).getShowComments());
return customMap.destroy();
}); });
}); });
...@@ -92,10 +92,9 @@ describe('minerva global', function () { ...@@ -92,10 +92,9 @@ describe('minerva global', function () {
return ServerConnectorMock.getProject().then(function (project) { return ServerConnectorMock.getProject().then(function (project) {
options = helper.createCustomMapOptions(project); options = helper.createCustomMapOptions(project);
return minerva.create(options); return minerva.create(options);
}).then(function (result) { }).then(function () {
var sessionData = ServerConnectorMock.getSessionData(options.getProject()); var sessionData = ServerConnectorMock.getSessionData(options.getProject());
assert.equal(sessionData.getZoomLevel(options.getProject().getModel()), 5); assert.equal(sessionData.getZoomLevel(options.getProject().getModel()), 5);
return result.destroy();
}); });
}); });
...@@ -105,12 +104,11 @@ describe('minerva global', function () { ...@@ -105,12 +104,11 @@ describe('minerva global', function () {
return ServerConnectorMock.getProject().then(function (project) { return ServerConnectorMock.getProject().then(function (project) {
options = helper.createCustomMapOptions(project); options = helper.createCustomMapOptions(project);
return minerva.create(options); return minerva.create(options);
}).then(function (result) { }).then(function () {
var center = ServerConnectorMock.getSessionData(options.getProject()).getCenter(options.getProject().getModel()); var center = ServerConnectorMock.getSessionData(options.getProject()).getCenter(options.getProject().getModel());
assert.ok(center instanceof google.maps.Point); assert.ok(center instanceof google.maps.Point);
assert.equal(center.x, 5); assert.equal(center.x, 5);
assert.equal(center.y, 6); assert.equal(center.y, 6);
return result.destroy();
}); });
}); });
...@@ -128,7 +126,6 @@ describe('minerva global', function () { ...@@ -128,7 +126,6 @@ describe('minerva global', function () {
return minerva.create(options); return minerva.create(options);
}).then(function (result) { }).then(function (result) {
customMap = result;
assert.ok(result); assert.ok(result);
// input file is not available so it's the background // input file is not available so it's the background
return result.getVisibleDataOverlays(); return result.getVisibleDataOverlays();
...@@ -137,7 +134,6 @@ describe('minerva global', function () { ...@@ -137,7 +134,6 @@ describe('minerva global', function () {
assert.equal(visibleDataOverlays.length, 0); assert.equal(visibleDataOverlays.length, 0);
assert.equal(ServerConnectorMock.getSessionData(project).getSelectedBackgroundOverlay(), layout.getId()); assert.equal(ServerConnectorMock.getSessionData(project).getSelectedBackgroundOverlay(), layout.getId());
assert.equal(logger.getWarnings().length, 0); assert.equal(logger.getWarnings().length, 0);
return customMap.destroy();
}); });
}); });
...@@ -514,7 +510,7 @@ describe('minerva global', function () { ...@@ -514,7 +510,7 @@ describe('minerva global', function () {
}).then(function (result) { }).then(function (result) {
assert.ok(result); assert.ok(result);
assert.equal(logger.getWarnings().length, 0); assert.equal(logger.getWarnings().length, 0);
return result.destroy(); result.destroy();
}); });
}); });
it("getAllBioEntities", function () { it("getAllBioEntities", function () {
......
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