Merge branch '559-cursor-shape-change' into 'devel_12.1.x'

Resolve "cursor shape change"

See merge request !481

frontend-js/src/main/css/global.css

@@ -155,6 +155,15 @@
     font-weight: 900;
 }
 
+.minerva-search-result-icon {
+    float: left;
+    margin: 0 10px;
+}
+
+.minerva-clickable {
+    cursor: pointer;
+}
+
 .input-field {
     background-color: #21BDF1;
     color: #ffffff;

frontend-js/src/main/js/gui/leftPanel/AbstractDbPanel.js

@@ -228,10 +228,10 @@ AbstractDbPanel.prototype.refreshSearchResults = function () {
     promises.push(searchDb.getElementsByQuery(queries[i]));
   }
   return Promise.all(promises).then(function (results) {
-    return Promise.each(queries, function(query, index){
+    return Promise.each(queries, function (query, index) {
       return self.addResultTab(query, results[index]);
     });
-  }).then(function(){
+  }).then(function () {
     self.onresize();
   });
 };
@@ -348,7 +348,34 @@ AbstractDbPanel.prototype.createTargetRow = function (target, icon) {
   var i;
   if (target.getTargetElements().length > 0) {
     var submapAddedIds = [];
-    iconColumn.appendChild(guiUtils.createIcon(icon));
+    var elements = target.getTargetElements();
+    for (i = 0; i < elements.length; i++) {
+      var elementId = elements[i].getModelId();
+      if (elementId !== self.getMap().getId() && !submapAddedIds[elementId]) {
+        submaps.push(elementId);
+        submapAddedIds[elementId] = true;
+      }
+    }
+
+    iconColumn.appendChild(guiUtils.createIcon(icon, function () {
+      var maps = submaps.concat([self.getMap().getId()]);
+      var promises = [];
+      for (var j = 0; j < maps.length; j++) {
+        var submap = self.getMap().getSubmapById(maps[j]);
+        var submapElements = [];
+        for (var k = 0; k < elements.length; k++) {
+          if (elements[k].getModelId() === submap.getId()) {
+            submapElements.push(elements[k]);
+          }
+        }
+        if (submap.isInitialized()) {
+          promises.push(submap.getModel().getByIdentifiedElements(submapElements, false).then(function (fetchedElements) {
+            return self.getMap().getSubmapById(fetchedElements[0].getModelId()).fitBounds(fetchedElements);
+          }));
+        }
+      }
+      return Promise.all(promises);
+    }));
     var checkbox = document.createElement('input');
     checkbox.type = "checkbox";
     checkbox.checked = target.isVisible();
@@ -358,14 +385,6 @@ AbstractDbPanel.prototype.createTargetRow = function (target, icon) {
     };
 
     iconColumn.appendChild(checkbox);
-    var elements = target.getTargetElements();
-    for (i = 0; i < elements.length; i++) {
-      var elementId = elements[i].getModelId();
-      if (elementId !== self.getMap().getId() && !submapAddedIds[elementId]) {
-        submaps.push(elementId);
-        submapAddedIds[elementId] = true;
-      }
-    }
   }
 
   var descColumn = document.createElement("td");

frontend-js/src/main/js/gui/leftPanel/GuiUtils.js

@@ -510,11 +510,11 @@ GuiUtils.prototype.createIcon = function (icon, onclickFunction) {
   if (icon !== undefined && icon !== null) {
     var img = document.createElement("img");
     img.src = GuiConnector.getImgPrefix() + icon;
-    img.style.float = "left";
-    img.hspace = 5;
     if (onclickFunction !== undefined) {
       img.onclick = onclickFunction;
-      img.style.cursor = "pointer";
+      img.className = "minerva-search-result-icon minerva-clickable";
+    } else {
+      img.className = "minerva-search-result-icon";
     }
     result.appendChild(img);
   }