Merge branch...

Merge branch '107-searching-for-element-that-was-search-when-minerva-started-from-session-throws-an-exception' into 'master'

fix for onSearch event listeners

Closes #107

See merge request !10

frontend-js/src/main/js/map/overlay/SearchDbOverlay.js

@@ -175,7 +175,7 @@ SearchDbOverlay.prototype.searchBySingleQuery = function(originalQuery, perfect)
   var self = this;
   var query = self.encodeQuery(AbstractDbOverlay.QueryType.SEARCH_BY_QUERY, originalQuery, perfect);
   if (self._elementsByQuery[query] !== undefined) {
-    Promise.resolve(self._elementsByQuery[query]);
+    return Promise.resolve(self._elementsByQuery[query]);
   } else {
     return ServerConnector.getElementsByQuery({
       query : originalQuery,

frontend-js/src/test/js/minerva-test.js

@@ -201,11 +201,14 @@ describe('minerva global', function() {
 
   it('add search listener', function() {
     var callbackOk = false;
+    var globalResult ;
     return ServerConnectorMock.getProject().then(function(project) {
       var options = helper.createCustomMapOptions(project);
       options.setDebug(true);
       return minerva.create(options);
     }).then(function(result) {
+      globalResult = result;
+      
       result.addListener({
         dbOverlayName : "search",
         type : "onSearch",
@@ -214,6 +217,10 @@ describe('minerva global', function() {
         }
       });
       return result.customMap.getOverlayByName("search").searchByQuery("s1");
+    }).then(function() {
+      assert.ok(callbackOk);
+      callbackOk = false;
+      return globalResult.customMap.getOverlayByName("search").searchByQuery("s1");
     }).then(function() {
       assert.ok(callbackOk);
     });