From 346827ead8a62db5e735676b74641571fc646a7d Mon Sep 17 00:00:00 2001
From: Piotr Gawron <piotr.gawron@uni.lu>
Date: Fri, 19 May 2017 17:00:49 +0200
Subject: [PATCH] deprecated onready parameter removed
---
frontend-js/src/main/js/map/AbstractCustomMap.js | 11 ++---------
frontend-js/src/main/js/map/CustomMap.js | 2 +-
2 files changed, 3 insertions(+), 10 deletions(-)
diff --git a/frontend-js/src/main/js/map/AbstractCustomMap.js b/frontend-js/src/main/js/map/AbstractCustomMap.js
index d7d23ed70c..6312bc1318 100644
--- a/frontend-js/src/main/js/map/AbstractCustomMap.js
+++ b/frontend-js/src/main/js/map/AbstractCustomMap.js
@@ -632,7 +632,7 @@ AbstractCustomMap.prototype._hideSelectedLayout = function(layoutId) {
* @param aliasId
* identifier of the alias
*/
-AbstractCustomMap.prototype._openInfoWindowForAlias = function(aliasId, onready) {
+AbstractCustomMap.prototype._openInfoWindowForAlias = function(aliasId) {
var self = this;
var infoWindow = this.getAliasInfoWindowById(aliasId);
@@ -642,18 +642,11 @@ AbstractCustomMap.prototype._openInfoWindowForAlias = function(aliasId, onready)
} else {
logger.warn("Info window for alias: " + aliasId + " is already opened");
}
- if (typeof onready === "function") {
- onready();
- }
return Promise.resolve();
} else {
return self.getModel().getAliasById(aliasId).then(function(alias) {
self._aliasInfoWindow[aliasId] = new AliasInfoWindow(alias, self);
- return self._aliasInfoWindow[aliasId].init().then(function(){
- if (typeof onready === "function") {
- onready();
- }
- });
+ return self._aliasInfoWindow[aliasId].init();
});
}
};
diff --git a/frontend-js/src/main/js/map/CustomMap.js b/frontend-js/src/main/js/map/CustomMap.js
index 61e54470da..3373cba537 100644
--- a/frontend-js/src/main/js/map/CustomMap.js
+++ b/frontend-js/src/main/js/map/CustomMap.js
@@ -753,7 +753,7 @@ CustomMap.prototype.openInfoWindowForAlias = function(aliasId, modelId) {
logger.debug("Opening info window for alias: " + aliasId + ", model: " + modelId);
var model = this.getSubmodelById(modelId);
return model.getModel().getAliasById(aliasId, true).then(function() {
- model._openInfoWindowForAlias(aliasId);
+ return model._openInfoWindowForAlias(aliasId);
});
};
--
GitLab