From 24befd34d879b945f5d8224f6263be2304fce2e6 Mon Sep 17 00:00:00 2001
From: Piotr Gawron <piotr.gawron@uni.lu>
Date: Mon, 22 May 2017 17:42:37 +0200
Subject: [PATCH] property selectedLayouts renamed
---
frontend-js/src/main/js/map/CustomMap.js | 22 +++++++++++-----------
1 file changed, 11 insertions(+), 11 deletions(-)
diff --git a/frontend-js/src/main/js/map/CustomMap.js b/frontend-js/src/main/js/map/CustomMap.js
index 088a88a110..645ec933ae 100644
--- a/frontend-js/src/main/js/map/CustomMap.js
+++ b/frontend-js/src/main/js/map/CustomMap.js
@@ -43,7 +43,7 @@ function CustomMap(options) {
AbstractCustomMap.call(this, options.getProject().getModel(), options);
this.setProject(options.getProject());
- this.selectedLayouts = [];
+ this._selectedOverlays = [];
this.customizeGoogleMapView(options.getElement());
@@ -418,8 +418,8 @@ CustomMap.prototype.openSubmodel = function(id) {
var layouts = [];
// get list of layouts
- for ( var key in this.selectedLayouts) {
- if (this.selectedLayouts.hasOwnProperty(key) && this.selectedLayouts[key] === true) {
+ for ( var key in this._selectedOverlays) {
+ if (this._selectedOverlays.hasOwnProperty(key) && this._selectedOverlays[key] === true) {
layouts.push(key);
}
}
@@ -579,11 +579,11 @@ CustomMap.prototype.addSelectedLayout = function(identifier) {
var self = this;
logger.debug("Selecting layout: " + identifier);
- if (self.selectedLayouts[identifier] === true) {
+ if (self._selectedOverlays[identifier] === true) {
logger.warn("Layout " + identifier + " already selected");
return Promise.resolve();
} else {
- self.selectedLayouts[identifier] = true;
+ self._selectedOverlays[identifier] = true;
ServerConnector.getSessionData(self.getProject()).setVisibleOverlays(self.getSelectedLayouts());
return self.getModel().initLayoutDataByLayoutId(identifier).then(function() {
return self.refreshSelectedLayouts();
@@ -601,8 +601,8 @@ CustomMap.prototype.getSelectedLayouts = function() {
var layouts = [];
// get list of layouts
- for ( var key in this.selectedLayouts) {
- if (this.selectedLayouts.hasOwnProperty(key) && this.selectedLayouts[key] === true) {
+ for ( var key in this._selectedOverlays) {
+ if (this._selectedOverlays.hasOwnProperty(key) && this._selectedOverlays[key] === true) {
layouts.push(key);
}
}
@@ -619,10 +619,10 @@ CustomMap.prototype.getSelectedLayouts = function() {
CustomMap.prototype.removeSelectedLayout = function(identifier) {
logger.debug("Removing layout: " + identifier);
- if (this.selectedLayouts[identifier] !== true) {
- logger.warn("Layout " + identifier + " is not selected");
+ if (this._selectedOverlays[identifier] !== true) {
+ logger.warn("Overlay " + identifier + " is not selected");
} else {
- this.selectedLayouts[identifier] = false;
+ this._selectedOverlays[identifier] = false;
this.refreshSelectedLayouts();
ServerConnector.getSessionData(this.getProject()).setVisibleOverlays(this.getSelectedLayouts());
}
@@ -649,7 +649,7 @@ CustomMap.prototype.refreshSelectedLayouts = function() {
return Promise.all(promises).then(function() {
// remove layouts that were
for ( var key in self.selectedLayoutOverlays) {
- if (!self.selectedLayouts.hasOwnProperty(key) || self.selectedLayouts[key] === false) {
+ if (!self._selectedOverlays.hasOwnProperty(key) || self._selectedOverlays[key] === false) {
if (self.layoutContainsOverlays(key)) {
self.hideSelectedLayout(key);
}
--
GitLab