From d8233276746068c9e9054c3d4b8e690177e43ca9 Mon Sep 17 00:00:00 2001
From: Piotr Gawron <piotr.gawron@uni.lu>
Date: Wed, 24 May 2017 15:32:21 +0200
Subject: [PATCH] rename of openSubmap method
---
frontend-js/src/main/js/gui/leftPanel/Panel.js | 2 +-
frontend-js/src/main/js/gui/leftPanel/SubmapPanel.js | 2 +-
frontend-js/src/main/js/map/CustomMap.js | 2 +-
frontend-js/src/main/js/minerva.js | 6 +++---
frontend-js/src/test/js/map/CustomMap-test.js | 4 ++--
5 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/frontend-js/src/main/js/gui/leftPanel/Panel.js b/frontend-js/src/main/js/gui/leftPanel/Panel.js
index d115067795..6daa62c4db 100644
--- a/frontend-js/src/main/js/gui/leftPanel/Panel.js
+++ b/frontend-js/src/main/js/gui/leftPanel/Panel.js
@@ -274,7 +274,7 @@ Panel.prototype.createSubMapLink = function(label, element) {
var button = document.createElement("button");
button.text = element.getModelId();
button.onclick = function() {
- return self.getMap().openSubmodel(element.getModelId());
+ return self.getMap().openSubmap(element.getModelId());
};
result.appendChild(this.createLabel("Submodel: "));
result.appendChild(button);
diff --git a/frontend-js/src/main/js/gui/leftPanel/SubmapPanel.js b/frontend-js/src/main/js/gui/leftPanel/SubmapPanel.js
index b6d24d9271..f747196407 100644
--- a/frontend-js/src/main/js/gui/leftPanel/SubmapPanel.js
+++ b/frontend-js/src/main/js/gui/leftPanel/SubmapPanel.js
@@ -60,7 +60,7 @@ SubmapPanel.prototype.createRow = function(model) {
var img = self.createIcon("icons/search.png");
button.appendChild(img);
button.onclick = function() {
- self.getMap().openSubmodel(model.getId());
+ self.getMap().openSubmap(model.getId());
};
openTd.appendChild(button);
}
diff --git a/frontend-js/src/main/js/map/CustomMap.js b/frontend-js/src/main/js/map/CustomMap.js
index 4a71de2810..ae574d6a20 100644
--- a/frontend-js/src/main/js/map/CustomMap.js
+++ b/frontend-js/src/main/js/map/CustomMap.js
@@ -390,7 +390,7 @@ CustomMap.prototype.getSubmapDialogDiv = function(id) {
/**
* Opens a dialog with a submodel.
*/
-CustomMap.prototype.openSubmodel = function(id) {
+CustomMap.prototype.openSubmap = function(id) {
var self = this;
var submap = self.getSubmodelById(id);
if (submap === null) {
diff --git a/frontend-js/src/main/js/minerva.js b/frontend-js/src/main/js/minerva.js
index 46176ff0b0..1c45035f83 100644
--- a/frontend-js/src/main/js/minerva.js
+++ b/frontend-js/src/main/js/minerva.js
@@ -236,9 +236,9 @@ function create(params) {
}
}
- var submodelId = GuiConnector.getParams["submap"];
- if (submodelId !== undefined) {
- result.openSubmodel(submodelId);
+ var submapId = GuiConnector.getParams["submap"];
+ if (submapId !== undefined) {
+ result.openSubmap(submapId);
}
if (params.isDebug()) {
diff --git a/frontend-js/src/test/js/map/CustomMap-test.js b/frontend-js/src/test/js/map/CustomMap-test.js
index 4a3adc3b7b..1f47a40184 100644
--- a/frontend-js/src/test/js/map/CustomMap-test.js
+++ b/frontend-js/src/test/js/map/CustomMap-test.js
@@ -702,7 +702,7 @@ describe('CustomMap', function() {
});
});
- it("openSubmodel", function() {
+ it("openSubmap", function() {
var options = helper.createCustomMapOptions();
var submodel = helper.createModel();
@@ -710,7 +710,7 @@ describe('CustomMap', function() {
var map = new CustomMap(options);
- map.openSubmodel(submodel.getId());
+ map.openSubmap(submodel.getId());
});
});
--
GitLab