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

ServerConnector references changed into local getter

parent 5b90c810
No related branches found
No related tags found
2 merge requests!630WIP: Resolve "The privileges of a new user are not saved in some cases",!553Resolve "allow to open multiple data overlays using url GET param"
......@@ -55,7 +55,8 @@ Export.prototype._createGui = function () {
element: headerDiv,
customMap: null,
project: self.getProject(),
configuration: self.getConfiguration()
configuration: self.getConfiguration(),
serverConnector: self.getServerConnector()
});
self.getElement().appendChild(headerDiv);
......
......@@ -17,7 +17,7 @@ var xss = require('xss');
* @param {Object} params
* @param {HTMLElement} params.element
* @param {CustomMap} params.customMap
* @param {boolean} params.optionsMenu
* @param {boolean} [params.optionsMenu=false]
* @param {Configuration} params.configuration
* @param {Project} [params.project]
* @param {ServerConnector} [params.serverConnector]
......@@ -71,7 +71,7 @@ Header.prototype._createHeaderGui = function (guiParams) {
content: '<i class="fa fa-lock" style="font-size:17px"></i>&nbsp;',
xss: false
});
link.href = ServerConnector.getServerBaseUrl() + "admin.xhtml?id=" + projectId;
link.href = self.getServerConnector().getServerBaseUrl() + "admin.xhtml?id=" + projectId;
self.getElement().appendChild(link);
if (guiParams.optionsMenu) {
......@@ -111,7 +111,7 @@ Header.prototype._createHeaderGui = function (guiParams) {
content: '<i class="fa fa-home" style="font-size:17px"></i> ' + projectName,
xss: false
});
homeLink.href = ServerConnector.getServerBaseUrl() + "?id=" + projectId;
homeLink.href = self.getServerConnector().getServerBaseUrl() + "?id=" + projectId;
self.getElement().appendChild(homeLink);
};
......@@ -161,8 +161,8 @@ Header.prototype.init = function () {
$(div).hide();
}
};
ServerConnector.addListener("onDataLoadStart", self._onDataLoadStart);
ServerConnector.addListener("onDataLoadStop", self._onDataLoadStop);
self.getServerConnector().addListener("onDataLoadStart", self._onDataLoadStart);
self.getServerConnector().addListener("onDataLoadStop", self._onDataLoadStop);
resolve();
});
};
......@@ -173,8 +173,8 @@ Header.prototype.init = function () {
Header.prototype.destroy = function () {
var self = this;
if (self._onDataLoadStart) {
ServerConnector.removeListener("onDataLoadStart", self._onDataLoadStart);
ServerConnector.removeListener("onDataLoadStop", self._onDataLoadStop);
self.getServerConnector().removeListener("onDataLoadStart", self._onDataLoadStart);
self.getServerConnector().removeListener("onDataLoadStop", self._onDataLoadStop);
}
if (self._optionsMenu !== undefined) {
document.body.removeChild(self._optionsMenu.getElement());
......
......@@ -18,6 +18,7 @@ var SearchPanel = require('./SearchPanel');
var SubmapPanel = require('./SubmapPanel');
var Functions = require('../../Functions');
// noinspection JSUnusedLocalSymbols
var logger = require('../../logger');
/**
......
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