diff --git a/frontend-js/src/main/js/gui/leftPanel/Panel.js b/frontend-js/src/main/js/gui/leftPanel/Panel.js index d115067795dbb9cf1782d88e38370c69b74518ec..6daa62c4db0f1887b57e8eac23c1ba30f93624b3 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 b6d24d92713be38f5aa0b8653e8160a97e105e25..f74719640718556a3efe273d9118f27582468852 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 4a71de28104f9149467c54dc8e52a05cdc7f98b8..ae574d6a209cab1ea04ba54a66d9bb1137a25ed3 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 46176ff0b0199fd5a3dffec7de9a7e642d01dd8d..1c45035f8354388c3911afc5b05c0d252e16e573 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 4a3adc3b7bcbf642932f3b03a25a2f068131acf1..1f47a401847bf6e353c539d6bbee73944e81653f 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()); }); });