diff --git a/frontend-js/src/main/js/gui/leftPanel/GenericSearchPanel.js b/frontend-js/src/main/js/gui/leftPanel/GenericSearchPanel.js index 470e8bdf54c5b17e5a8efbbeb5a202bc21d2281e..c14a59f39dee736b78b145184ff2235606cf9643 100644 --- a/frontend-js/src/main/js/gui/leftPanel/GenericSearchPanel.js +++ b/frontend-js/src/main/js/gui/leftPanel/GenericSearchPanel.js @@ -17,7 +17,7 @@ function GenericSearchPanel(params) { params.helpTip = "<p>search tab allows to search for particular elements or interactions in the map</p>" + "<p>perfect match tick box active: only terms with an exact match to the query will be returned</p>" + "<p>separate multiple search by semicolon</p>"; - params.placeholder = "keyword"; + params.placeholder = "keyword"; AbstractDbPanel.call(this, params); @@ -66,14 +66,15 @@ GenericSearchPanel.prototype.createReactionElement = function(reaction) { var td = document.createElement("td"); result.appendChild(td); - var div = guiUtils.createReactionElement(reaction); + var div = guiUtils.createReactionElement({ + reaction : reaction + }); div.appendChild(guiUtils.createSeparator()); td.appendChild(div); return result; }; - GenericSearchPanel.prototype.createAliasElement = function(alias, icon) { var self = this; var guiUtils = self.getGuiUtils(); @@ -81,7 +82,10 @@ GenericSearchPanel.prototype.createAliasElement = function(alias, icon) { var result = document.createElement("tr"); var td = document.createElement("td"); result.appendChild(td); - var div = guiUtils.createAliasElement(alias, icon); + var div = guiUtils.createAliasElement({ + alias : alias, + icon : icon + }); div.appendChild(guiUtils.createSeparator()); td.appendChild(div); diff --git a/frontend-js/src/main/js/gui/leftPanel/GuiUtils.js b/frontend-js/src/main/js/gui/leftPanel/GuiUtils.js index 4f99a08a8ffa0e5ac73ace03167ee1addf9f9dbd..85ac29f4b9cc41c28cdcaa883e002d2d2f3f5fb8 100644 --- a/frontend-js/src/main/js/gui/leftPanel/GuiUtils.js +++ b/frontend-js/src/main/js/gui/leftPanel/GuiUtils.js @@ -303,7 +303,8 @@ GuiUtils.prototype.createTableRow = function(elements) { return row; }; -GuiUtils.prototype.createReactionElement = function(reaction) { +GuiUtils.prototype.createReactionElement = function(params) { + var reaction = params.reaction; var self = this; var div = document.createElement("div"); @@ -336,7 +337,9 @@ GuiUtils.prototype.createReactionElement = function(reaction) { return div; }; -GuiUtils.prototype.createAliasElement = function(alias, icon) { +GuiUtils.prototype.createAliasElement = function(params) { + var alias = params.alias; + var icon = params.icon; var self = this; var div = document.createElement("div"); diff --git a/frontend-js/src/main/js/gui/leftPanel/LeftPanel.js b/frontend-js/src/main/js/gui/leftPanel/LeftPanel.js index 25057e24cbab79b0d7f4aeab8e6e760d37e2c549..240caadcc9efe70db8df42c53aace23fe64f3559 100644 --- a/frontend-js/src/main/js/gui/leftPanel/LeftPanel.js +++ b/frontend-js/src/main/js/gui/leftPanel/LeftPanel.js @@ -198,9 +198,13 @@ LeftPanel.prototype.prepareElementDetailsContent = function(bioEntity) { var guiUtils = new GuiUtils(this.getMap().getConfiguration()); guiUtils.setMap(this.getMap()); if (bioEntity instanceof Reaction) { - return guiUtils.createReactionElement(bioEntity); + return guiUtils.createReactionElement({ + reaction : bioEntity + }); } else if (bioEntity instanceof Alias) { - return guiUtils.createAliasElement(bioEntity); + return guiUtils.createAliasElement({ + alias : bioEntity + }); } else if (bioEntity instanceof PointData) { return Functions.createElement({ type : "div" diff --git a/frontend-js/src/test/js/gui/leftPanel/GuiUtils-test.js b/frontend-js/src/test/js/gui/leftPanel/GuiUtils-test.js index 0b096d11d03720499b37f0a277fe2d4430b16b41..c57e0c966530bbb71dca0fb2d9a65e65eccdf773 100644 --- a/frontend-js/src/test/js/gui/leftPanel/GuiUtils-test.js +++ b/frontend-js/src/test/js/gui/leftPanel/GuiUtils-test.js @@ -48,7 +48,9 @@ describe('GuiUtils', function() { var guiUtils = new GuiUtils(); guiUtils.setMap(map); - var aliasDiv = guiUtils.createAliasElement(alias); + var aliasDiv = guiUtils.createAliasElement({ + alias : alias + }); assert.ok(aliasDiv.innerHTML); }); @@ -61,7 +63,7 @@ describe('GuiUtils', function() { var res = guiUtils.createLabelText(); assert.notOk(res.innerHTML); }); - + it('createSubMapLink', function() { var map = helper.createCustomMap(); @@ -71,7 +73,6 @@ describe('GuiUtils', function() { var res = guiUtils.createSubMapLink("TEST", map.getId()); assert.ok(res.innerHTML); }); - it('createPostTranslationalModifications', function() { var alias = helper.createAlias(); @@ -104,12 +105,14 @@ describe('GuiUtils', function() { var guiUtils = new GuiUtils(); guiUtils.setMap(map); - + var reaction = helper.createReaction(map); var reactionType = "XX TYPE"; reaction.setType(reactionType); - assert.ok(guiUtils.createReactionElement(reaction).innerHTML.indexOf(reactionType) >= 0); + assert.ok(guiUtils.createReactionElement({ + reaction : reaction + }).innerHTML.indexOf(reactionType) >= 0); }); }); @@ -123,10 +126,14 @@ describe('GuiUtils', function() { var alias = helper.createAlias(map); alias.setFullName("xxx"); - assert.ok(guiUtils.createAliasElement(alias).innerHTML.indexOf("Full name") >= 0); + assert.ok(guiUtils.createAliasElement({ + alias : alias + }).innerHTML.indexOf("Full name") >= 0); alias.setFullName(""); - assert.ok(guiUtils.createAliasElement(alias).innerHTML.indexOf("Full name") === -1); + assert.ok(guiUtils.createAliasElement({ + alias : alias + }).innerHTML.indexOf("Full name") === -1); }); });