From 7247cf1b2d2511e8c0dcc153d40904a6b1d1ce2f Mon Sep 17 00:00:00 2001
From: Piotr Gawron <piotr.gawron@uni.lu>
Date: Tue, 29 Aug 2017 19:58:23 +0200
Subject: [PATCH] lint issues
---
.../.idea/dictionaries/piotr_gawron.xml | 17 +
frontend-js/.idea/workspace.xml | 419 +++++++++---------
.../main/js/gui/export/AbstractExportPanel.js | 28 +-
.../src/main/js/map/data/UserPreferences.js | 2 +-
frontend-js/src/test/js/helper.js | 1 +
.../test/js/map/data/UserPreferences-test.js | 7 +-
frontend-js/src/test/js/minerva-test.js | 2 -
7 files changed, 248 insertions(+), 228 deletions(-)
diff --git a/frontend-js/.idea/dictionaries/piotr_gawron.xml b/frontend-js/.idea/dictionaries/piotr_gawron.xml
index 82a73e70bc..740acb692a 100644
--- a/frontend-js/.idea/dictionaries/piotr_gawron.xml
+++ b/frontend-js/.idea/dictionaries/piotr_gawron.xml
@@ -2,13 +2,17 @@
<dictionary name="piotr.gawron">
<words>
<w>antisense</w>
+ <w>arrowthickstop</w>
<w>biocompendium</w>
<w>celldesigner</w>
<w>chebi</w>
<w>chembl</w>
<w>drugbank</w>
+ <w>embl</w>
<w>ensembl</w>
<w>entrez</w>
+ <w>genomics</w>
+ <w>glyphicon</w>
<w>heterodimer</w>
<w>hgnc</w>
<w>hmdb</w>
@@ -17,18 +21,31 @@
<w>kegg</w>
<w>lcsb</w>
<w>mapviewer</w>
+ <w>mirtarbase</w>
<w>ncbigene</w>
<w>omim</w>
+ <w>onerror</w>
+ <w>onkeypress</w>
+ <w>onload</w>
+ <w>ontouchstart</w>
+ <w>orderable</w>
<w>pubchem</w>
<w>pubmed</w>
<w>reactome</w>
<w>refseq</w>
+ <w>rnas</w>
<w>saccharomyces</w>
<w>sbgn</w>
<w>smtp</w>
<w>submap</w>
<w>submaps</w>
+ <w>submodel</w>
+ <w>tbody</w>
+ <w>textarea</w>
+ <w>thead</w>
<w>toxicogenomic</w>
+ <w>toxicogenomics</w>
+ <w>typeahead</w>
<w>uniprot</w>
<w>wikipathways</w>
</words>
diff --git a/frontend-js/.idea/workspace.xml b/frontend-js/.idea/workspace.xml
index 1456e2a7db..5a11e29f92 100644
--- a/frontend-js/.idea/workspace.xml
+++ b/frontend-js/.idea/workspace.xml
@@ -6,27 +6,12 @@
</component>
<component name="ChangeListManager">
<list default="true" id="c119f0dd-fdda-4d02-a51e-86bc6ef7e50c" name="Default" comment="">
- <change type="MOVED" beforePath="$PROJECT_DIR$/testFiles/apiCalls/projects/sample/comments/models/all/columns=id,elementId,modelId,type,icon,removed&token=MOCK_TOKEN_ID&" afterPath="$PROJECT_DIR$/testFiles/apiCalls/projects/sample/comments/models/all/columns=elementId,icon,id,modelId,removed,type&token=MOCK_TOKEN_ID&" />
- <change type="MOVED" beforePath="$PROJECT_DIR$/testFiles/apiCalls/projects/sample/comments/models/all/columns=id,elementId,modelId,type,icon,removed,pinned&token=MOCK_TOKEN_ID&" afterPath="$PROJECT_DIR$/testFiles/apiCalls/projects/sample/comments/models/all/columns=elementId,icon,id,modelId,pinned,removed,type&token=MOCK_TOKEN_ID&" />
- <change type="MOVED" beforePath="$PROJECT_DIR$/testFiles/apiCalls/projects/sample/comments/models/all/columns=id,elementId,modelId,type,removed,pinned,author,email&token=MOCK_TOKEN_ID&" afterPath="$PROJECT_DIR$/testFiles/apiCalls/projects/sample/comments/models/all/columns=author,elementId,email,id,modelId,pinned,removed,type&token=MOCK_TOKEN_ID&" />
- <change type="MOVED" beforePath="$PROJECT_DIR$/testFiles/apiCalls/projects/sample/models/15781/bioEntities/elements/columns=id,bounds,modelId&type=Drug,Complex,Phenotype,Gene,RNA,Unknown,Degraded,Antisense RNA,Ion,Simple molecule,Protein,Compartment&token=MOCK_TOKEN_ID&" afterPath="$PROJECT_DIR$/testFiles/apiCalls/projects/sample/models/15781/bioEntities/elements/columns=id,bounds,modelId&type=Antisense RNA,Compartment,Complex,Degraded,Drug,Gene,Ion,Phenotype,Protein,RNA,Simple molecule,Unknown&token=MOCK_TOKEN_ID&" />
- <change type="MOVED" beforePath="$PROJECT_DIR$/testFiles/apiCalls/projects/sample/models/15781/bioEntities/elements/columns=id,modelId&type=Drug,Complex,Phenotype,Gene,RNA,Unknown,Degraded,Antisense RNA,Ion,Simple molecule,Protein,Compartment&token=MOCK_TOKEN_ID&" afterPath="$PROJECT_DIR$/testFiles/apiCalls/projects/sample/models/15781/bioEntities/elements/columns=id,modelId&type=Antisense RNA,Compartment,Complex,Degraded,Drug,Gene,Ion,Phenotype,Protein,RNA,Simple molecule,Unknown&token=MOCK_TOKEN_ID&" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/dictionaries/piotr_gawron.xml" afterPath="$PROJECT_DIR$/.idea/dictionaries/piotr_gawron.xml" />
- <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
- <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/js/Configuration.js" afterPath="$PROJECT_DIR$/src/main/js/Configuration.js" />
- <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/js/ServerConnector.js" afterPath="$PROJECT_DIR$/src/main/js/ServerConnector.js" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/js/gui/export/AbstractExportPanel.js" afterPath="$PROJECT_DIR$/src/main/js/gui/export/AbstractExportPanel.js" />
- <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/js/minerva.js" afterPath="$PROJECT_DIR$/src/main/js/minerva.js" />
- <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/test/js/gui/export/ElementExportPanel-test.js" afterPath="$PROJECT_DIR$/src/test/js/gui/export/ElementExportPanel-test.js" />
- <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/test/js/gui/export/NetworkExportPanel-test.js" afterPath="$PROJECT_DIR$/src/test/js/gui/export/NetworkExportPanel-test.js" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/js/map/data/UserPreferences.js" afterPath="$PROJECT_DIR$/src/main/js/map/data/UserPreferences.js" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/test/js/helper.js" afterPath="$PROJECT_DIR$/src/test/js/helper.js" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/test/js/map/data/UserPreferences-test.js" afterPath="$PROJECT_DIR$/src/test/js/map/data/UserPreferences-test.js" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/test/js/minerva-test.js" afterPath="$PROJECT_DIR$/src/test/js/minerva-test.js" />
- <change type="MODIFICATION" beforePath="$PROJECT_DIR$/testFiles/apiCalls/configuration/token=MOCK_TOKEN_ID&" afterPath="$PROJECT_DIR$/testFiles/apiCalls/configuration/token=MOCK_TOKEN_ID&" />
- <change type="MODIFICATION" beforePath="$PROJECT_DIR$/../model/src/main/java/lcsb/mapviewer/model/user/ConfigurationElementType.java" afterPath="$PROJECT_DIR$/../model/src/main/java/lcsb/mapviewer/model/user/ConfigurationElementType.java" />
- <change type="MODIFICATION" beforePath="$PROJECT_DIR$/../rest-api/src/main/java/lcsb/mapviewer/api/configuration/ConfigurationController.java" afterPath="$PROJECT_DIR$/../rest-api/src/main/java/lcsb/mapviewer/api/configuration/ConfigurationController.java" />
- <change type="MODIFICATION" beforePath="$PROJECT_DIR$/../rest-api/src/main/java/lcsb/mapviewer/api/configuration/ConfigurationRestImpl.java" afterPath="$PROJECT_DIR$/../rest-api/src/main/java/lcsb/mapviewer/api/configuration/ConfigurationRestImpl.java" />
- <change type="MODIFICATION" beforePath="$PROJECT_DIR$/../rest-api/src/main/java/lcsb/mapviewer/api/users/UserController.java" afterPath="$PROJECT_DIR$/../rest-api/src/main/java/lcsb/mapviewer/api/users/UserController.java" />
- <change type="MODIFICATION" beforePath="$PROJECT_DIR$/../rest-api/src/test/java/lcsb/mapviewer/api/configuration/ConfigurationRestImplTest.java" afterPath="$PROJECT_DIR$/../rest-api/src/test/java/lcsb/mapviewer/api/configuration/ConfigurationRestImplTest.java" />
- <change type="MODIFICATION" beforePath="$PROJECT_DIR$/../web/src/main/java/lcsb/mapviewer/bean/ConfigurationBean.java" afterPath="$PROJECT_DIR$/../web/src/main/java/lcsb/mapviewer/bean/ConfigurationBean.java" />
</list>
<ignored path="$PROJECT_DIR$/.tmp/" />
<ignored path="$PROJECT_DIR$/temp/" />
@@ -43,88 +28,97 @@
<file leaf-file-name="ServerConnector.js" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/main/js/ServerConnector.js">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="720">
- <caret line="849" column="18" lean-forward="false" selection-start-line="849" selection-start-column="18" selection-end-line="849" selection-end-column="18" />
+ <state relative-caret-position="229">
+ <caret line="492" column="6" lean-forward="false" selection-start-line="492" selection-start-column="6" selection-end-line="492" selection-end-column="6" />
<folding />
</state>
</provider>
</entry>
</file>
- <file leaf-file-name="NetworkExportPanel-test.js" pinned="false" current-in-tab="false">
- <entry file="file://$PROJECT_DIR$/src/test/js/gui/export/NetworkExportPanel-test.js">
+ <file leaf-file-name="OverviewDialog.js" pinned="false" current-in-tab="false">
+ <entry file="file://$PROJECT_DIR$/src/main/js/gui/OverviewDialog.js">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="85">
- <caret line="5" column="0" lean-forward="false" selection-start-line="5" selection-start-column="0" selection-end-line="5" selection-end-column="0" />
+ <state relative-caret-position="229">
+ <caret line="123" column="24" lean-forward="false" selection-start-line="123" selection-start-column="24" selection-end-line="123" selection-end-column="24" />
<folding />
</state>
</provider>
</entry>
</file>
- <file leaf-file-name="NetworkExportPanel.js" pinned="false" current-in-tab="false">
- <entry file="file://$PROJECT_DIR$/src/main/js/gui/export/NetworkExportPanel.js">
+ <file leaf-file-name="MapsAdminPanel.js" pinned="false" current-in-tab="false">
+ <entry file="file://$PROJECT_DIR$/src/main/js/gui/admin/MapsAdminPanel.js">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="98">
- <caret line="162" column="23" lean-forward="false" selection-start-line="162" selection-start-column="23" selection-end-line="162" selection-end-column="23" />
- <folding />
+ <state relative-caret-position="229">
+ <caret line="186" column="40" lean-forward="false" selection-start-line="186" selection-start-column="40" selection-end-line="186" selection-end-column="40" />
+ <folding>
+ <marker date="1503673820763" expanded="true" signature="1540:1546" ph="Â " />
+ <marker date="1503673820763" expanded="true" signature="1820:1826" ph="Â " />
+ </folding>
</state>
</provider>
</entry>
</file>
- <file leaf-file-name="AddProjectDialog-test.js" pinned="false" current-in-tab="false">
- <entry file="file://$PROJECT_DIR$/src/test/js/gui/admin/AddProjectDialog-test.js">
+ <file leaf-file-name="EditProjectDialog.js" pinned="false" current-in-tab="false">
+ <entry file="file://$PROJECT_DIR$/src/main/js/gui/admin/EditProjectDialog.js">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="85">
- <caret line="5" column="0" lean-forward="false" selection-start-line="4" selection-start-column="0" selection-end-line="5" selection-end-column="0" />
- <folding />
+ <state relative-caret-position="229">
+ <caret line="298" column="24" lean-forward="false" selection-start-line="298" selection-start-column="24" selection-end-line="298" selection-end-column="24" />
+ <folding>
+ <marker date="1503577627579" expanded="true" signature="6500:6506" ph="Â " />
+ <marker date="1503577627579" expanded="true" signature="6861:6867" ph="Â " />
+ </folding>
</state>
</provider>
</entry>
</file>
- <file leaf-file-name="AbstractExportPanel.js" pinned="false" current-in-tab="true">
- <entry file="file://$PROJECT_DIR$/src/main/js/gui/export/AbstractExportPanel.js">
+ <file leaf-file-name="AddProjectDialog.js" pinned="false" current-in-tab="false">
+ <entry file="file://$PROJECT_DIR$/src/main/js/gui/admin/AddProjectDialog.js">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="234">
- <caret line="97" column="5" lean-forward="true" selection-start-line="97" selection-start-column="5" selection-end-line="97" selection-end-column="5" />
- <folding />
+ <state relative-caret-position="229">
+ <caret line="386" column="13" lean-forward="false" selection-start-line="386" selection-start-column="13" selection-end-line="386" selection-end-column="13" />
+ <folding>
+ <marker date="1504022727026" expanded="true" signature="4949:4955" ph="Â " />
+ <marker date="1504022727026" expanded="true" signature="5265:5271" ph="Â " />
+ </folding>
</state>
</provider>
</entry>
</file>
- <file leaf-file-name="ElementExportPanel-test.js" pinned="false" current-in-tab="false">
- <entry file="file://$PROJECT_DIR$/src/test/js/gui/export/ElementExportPanel-test.js">
+ <file leaf-file-name="AbstractDbPanel.js" pinned="false" current-in-tab="false">
+ <entry file="file://$PROJECT_DIR$/src/main/js/gui/leftPanel/AbstractDbPanel.js">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="234">
- <caret line="31" column="39" lean-forward="false" selection-start-line="31" selection-start-column="39" selection-end-line="31" selection-end-column="39" />
+ <state relative-caret-position="229">
+ <caret line="38" column="14" lean-forward="false" selection-start-line="38" selection-start-column="14" selection-end-line="38" selection-end-column="14" />
<folding />
</state>
</provider>
</entry>
</file>
- <file leaf-file-name="Configuration.js" pinned="false" current-in-tab="false">
- <entry file="file://$PROJECT_DIR$/src/main/js/Configuration.js">
+ <file leaf-file-name="AbstractInfoWindow.js" pinned="false" current-in-tab="false">
+ <entry file="file://$PROJECT_DIR$/src/main/js/map/window/AbstractInfoWindow.js">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="362">
- <caret line="93" column="16" lean-forward="false" selection-start-line="93" selection-start-column="16" selection-end-line="93" selection-end-column="16" />
+ <state relative-caret-position="229">
+ <caret line="116" column="2" lean-forward="false" selection-start-line="116" selection-start-column="2" selection-end-line="116" selection-end-column="2" />
<folding />
</state>
</provider>
</entry>
</file>
- <file leaf-file-name="ServerConnector-mock.js" pinned="false" current-in-tab="false">
- <entry file="file://$PROJECT_DIR$/src/test/js/ServerConnector-mock.js">
+ <file leaf-file-name="Functions-test.js" pinned="false" current-in-tab="false">
+ <entry file="file://$PROJECT_DIR$/src/test/js/Functions-test.js">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="720">
- <caret line="76" column="28" lean-forward="false" selection-start-line="71" selection-start-column="0" selection-end-line="82" selection-end-column="0" />
+ <state relative-caret-position="229">
+ <caret line="15" column="11" lean-forward="false" selection-start-line="15" selection-start-column="11" selection-end-line="15" selection-end-column="11" />
<folding />
</state>
</provider>
</entry>
</file>
- <file leaf-file-name="minerva.js" pinned="false" current-in-tab="false">
+ <file leaf-file-name="minerva.js" pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/src/main/js/minerva.js">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="243">
- <caret line="338" column="65" lean-forward="false" selection-start-line="338" selection-start-column="65" selection-end-line="338" selection-end-column="65" />
+ <state relative-caret-position="221">
+ <caret line="414" column="59" lean-forward="true" selection-start-line="414" selection-start-column="59" selection-end-line="414" selection-end-column="59" />
<folding>
<marker date="1504026137494" expanded="true" signature="16593:16652" ph="..." />
<marker date="1504026137494" expanded="true" signature="19918:19977" ph="..." />
@@ -134,11 +128,11 @@
</provider>
</entry>
</file>
- <file leaf-file-name="token=MOCK_TOKEN_ID&" pinned="false" current-in-tab="false">
- <entry file="file://$PROJECT_DIR$/testFiles/apiCalls/configuration/token=MOCK_TOKEN_ID&">
+ <file leaf-file-name="AbstractMarker.js" pinned="false" current-in-tab="false">
+ <entry file="file://$PROJECT_DIR$/src/main/js/map/marker/AbstractMarker.js">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="-583">
- <caret line="0" column="10147" lean-forward="false" selection-start-line="0" selection-start-column="10147" selection-end-line="0" selection-end-column="10147" />
+ <state relative-caret-position="229">
+ <caret line="77" column="4" lean-forward="false" selection-start-line="77" selection-start-column="4" selection-end-line="77" selection-end-column="4" />
<folding />
</state>
</provider>
@@ -231,8 +225,6 @@
<option value="$PROJECT_DIR$/src/test/js/map/CustomMap-test.js" />
<option value="$PROJECT_DIR$/src/test/js/map/data/IdentifiedElement-test.js" />
<option value="$PROJECT_DIR$/src/main/js/GuiConnector.js" />
- <option value="$PROJECT_DIR$/src/test/js/helper.js" />
- <option value="$PROJECT_DIR$/src/test/js/map/data/UserPreferences-test.js" />
<option value="$PROJECT_DIR$/testFiles/preferences.json" />
<option value="$PROJECT_DIR$/src/main/js/map/data/User.js" />
<option value="$PROJECT_DIR$/src/test/js/gui/admin/AddProjectDialog-test.js" />
@@ -241,17 +233,19 @@
<option value="$PROJECT_DIR$/src/test/js/gui/admin/EditProjectDialog-test.js" />
<option value="$PROJECT_DIR$/src/main/js/gui/admin/AddProjectDialog.js" />
<option value="$PROJECT_DIR$/src/test/js/GuiConnector-mock.js" />
- <option value="$PROJECT_DIR$/src/main/js/map/data/UserPreferences.js" />
<option value="$PROJECT_DIR$/testFiles/apiCalls/users/admin.updatePreferences/PATCH_preferences.project-upload.cache-data=true&" />
<option value="$PROJECT_DIR$/testFiles/apiCalls/users/admin.updatePreferences/PATCH_preferences.project-upload.cache-data=false&" />
<option value="$PROJECT_DIR$/testFiles/apiCalls/configuration/token=MOCK_TOKEN_ID&" />
- <option value="$PROJECT_DIR$/src/test/js/minerva-test.js" />
- <option value="$PROJECT_DIR$/src/main/js/minerva.js" />
<option value="$PROJECT_DIR$/src/main/js/Configuration.js" />
<option value="$PROJECT_DIR$/src/main/js/ServerConnector.js" />
<option value="$PROJECT_DIR$/src/test/js/gui/export/NetworkExportPanel-test.js" />
<option value="$PROJECT_DIR$/src/test/js/gui/export/ElementExportPanel-test.js" />
<option value="$PROJECT_DIR$/src/main/js/gui/export/AbstractExportPanel.js" />
+ <option value="$PROJECT_DIR$/src/test/js/map/data/UserPreferences-test.js" />
+ <option value="$PROJECT_DIR$/src/test/js/helper.js" />
+ <option value="$PROJECT_DIR$/src/test/js/minerva-test.js" />
+ <option value="$PROJECT_DIR$/src/main/js/map/data/UserPreferences.js" />
+ <option value="$PROJECT_DIR$/src/main/js/minerva.js" />
</list>
</option>
</component>
@@ -791,7 +785,7 @@
<workItem from="1503648028157" duration="9357000" />
<workItem from="1503673204553" duration="8891000" />
<workItem from="1503992362005" duration="615000" />
- <workItem from="1504003657581" duration="14917000" />
+ <workItem from="1504003657581" duration="16006000" />
</task>
<servers />
</component>
@@ -828,7 +822,7 @@
</history-entry>
</component>
<component name="TimeTrackingManager">
- <option name="totallyTimeSpent" value="61376000" />
+ <option name="totallyTimeSpent" value="62465000" />
</component>
<component name="ToolWindowManager">
<frame x="-8" y="-8" width="1936" height="1176" extended-state="6" />
@@ -837,8 +831,10 @@
<window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.20364584" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
<window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
<window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.5679475" sideWeight="0.33802083" order="7" side_tool="true" content_ui="tabs" />
+ <window_info id="Inspection Results" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.3298969" sideWeight="0.5" order="11" side_tool="false" content_ui="tabs" />
+ <window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.3298969" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
<window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="8" side_tool="false" content_ui="tabs" />
- <window_info id="Run" active="true" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.24554826" sideWeight="0.49791667" order="10" side_tool="false" content_ui="tabs" x="-170" y="502" width="1920" height="493" />
+ <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.24554826" sideWeight="0.49791667" order="10" side_tool="false" content_ui="tabs" x="-170" y="502" width="1920" height="493" />
<window_info id="npm" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="2" side_tool="true" content_ui="tabs" />
<window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
<window_info id="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="9" side_tool="false" content_ui="tabs" />
@@ -849,8 +845,6 @@
<window_info id="Commander" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
<window_info id="Inspection" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" />
<window_info id="Hierarchy" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="2" side_tool="false" content_ui="combo" />
- <window_info id="Inspection Results" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.3298969" sideWeight="0.5" order="11" side_tool="false" content_ui="tabs" />
- <window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.3298969" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
<window_info id="V8 CPU Profiling" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.34489223" sideWeight="0.66197914" order="0" side_tool="false" content_ui="tabs" />
<window_info id="Ant Build" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
</layout>
@@ -887,48 +881,6 @@
<watches-manager />
</component>
<component name="editorHistoryManager">
- <entry file="file://$PROJECT_DIR$/src/test/js/gui/leftPanel/PublicationListDialog-test.js">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="204">
- <caret line="12" column="10" lean-forward="false" selection-start-line="12" selection-start-column="10" selection-end-line="12" selection-end-column="10" />
- </state>
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/src/test/js/gui/leftPanel/AbstractPanel-test.js">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="229">
- <caret line="16" column="10" lean-forward="false" selection-start-line="16" selection-start-column="10" selection-end-line="16" selection-end-column="10" />
- </state>
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/src/test/js/gui/leftPanel/GuiUtils-test.js">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="221">
- <caret line="81" column="19" lean-forward="false" selection-start-line="81" selection-start-column="19" selection-end-line="81" selection-end-column="19" />
- </state>
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/src/test/js/gui/leftPanel/ChemicalPanel-test.js">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="221">
- <caret line="30" column="75" lean-forward="false" selection-start-line="30" selection-start-column="75" selection-end-line="30" selection-end-column="75" />
- </state>
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/src/test/js/gui/leftPanel/DrugPanel-test.js">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="221">
- <caret line="61" column="43" lean-forward="false" selection-start-line="61" selection-start-column="43" selection-end-line="61" selection-end-column="43" />
- </state>
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/src/test/js/map/AbstractCustomMap-test.js">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="273">
- <caret line="321" column="6" lean-forward="false" selection-start-line="321" selection-start-column="6" selection-end-line="321" selection-end-column="6" />
- </state>
- </provider>
- </entry>
<entry file="file://$PROJECT_DIR$/src/test/js/map/CustomMap-test.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="221">
@@ -957,13 +909,6 @@
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/src/main/js/map/marker/AbstractMarker.js">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="467">
- <caret line="91" column="2" lean-forward="false" selection-start-line="91" selection-start-column="2" selection-end-line="91" selection-end-column="2" />
- </state>
- </provider>
- </entry>
<entry file="file://$PROJECT_DIR$/src/main/js/gui/admin/CommentsAdminPanel.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="262">
@@ -995,14 +940,6 @@
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/src/test/js/helper.js">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="349">
- <caret line="383" column="16" lean-forward="true" selection-start-line="383" selection-start-column="16" selection-end-line="383" selection-end-column="16" />
- <folding />
- </state>
- </provider>
- </entry>
<entry file="file://$PROJECT_DIR$/testFiles/preferences.json">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="459">
@@ -1019,14 +956,6 @@
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/src/main/js/map/window/AbstractInfoWindow.js">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="17">
- <caret line="190" column="16" lean-forward="false" selection-start-line="190" selection-start-column="16" selection-end-line="190" selection-end-column="16" />
- <folding />
- </state>
- </provider>
- </entry>
<entry file="file://$PROJECT_DIR$/src/main/js/gui/leftPanel/PublicationListDialog.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="17">
@@ -1035,14 +964,6 @@
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/src/main/js/gui/OverviewDialog.js">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="0">
- <caret line="195" column="65" lean-forward="false" selection-start-line="195" selection-start-column="65" selection-end-line="195" selection-end-column="65" />
- <folding />
- </state>
- </provider>
- </entry>
<entry file="file://$PROJECT_DIR$/node_modules/chai/lib/chai/interface/assert.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="218">
@@ -1051,14 +972,6 @@
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/src/test/js/map/data/UserPreferences-test.js">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="357">
- <caret line="21" column="53" lean-forward="true" selection-start-line="21" selection-start-column="53" selection-end-line="21" selection-end-column="53" />
- <folding />
- </state>
- </provider>
- </entry>
<entry file="file://$PROJECT_DIR$/src/test/js/gui/admin/MapsAdminPanel-test.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="0">
@@ -1139,25 +1052,6 @@
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/src/main/js/map/data/UserPreferences.js">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="536">
- <caret line="68" column="39" lean-forward="true" selection-start-line="68" selection-start-column="39" selection-end-line="68" selection-end-column="39" />
- <folding />
- </state>
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/src/main/js/gui/admin/AddProjectDialog.js">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="218">
- <caret line="346" column="35" lean-forward="false" selection-start-line="346" selection-start-column="35" selection-end-line="346" selection-end-column="35" />
- <folding>
- <marker date="1504022727026" expanded="true" signature="4949:4955" ph="Â " />
- <marker date="1504022727026" expanded="true" signature="5265:5271" ph="Â " />
- </folding>
- </state>
- </provider>
- </entry>
<entry file="file://$PROJECT_DIR$/src/main/js/GuiConnector.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="226">
@@ -1190,14 +1084,6 @@
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/src/test/js/minerva-test.js">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="34">
- <caret line="2" column="23" lean-forward="false" selection-start-line="2" selection-start-column="23" selection-end-line="2" selection-end-column="23" />
- <folding />
- </state>
- </provider>
- </entry>
<entry file="file://$PROJECT_DIR$/src/test/js/gui/AddOverlayDialog-test.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="0">
@@ -1206,22 +1092,6 @@
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/src/main/js/ServerConnector.js">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="720">
- <caret line="849" column="18" lean-forward="false" selection-start-line="849" selection-start-column="18" selection-end-line="849" selection-end-column="18" />
- <folding />
- </state>
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/src/test/js/ServerConnector-mock.js">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="720">
- <caret line="76" column="28" lean-forward="false" selection-start-line="71" selection-start-column="0" selection-end-line="82" selection-end-column="0" />
- <folding />
- </state>
- </provider>
- </entry>
<entry file="file://$PROJECT_DIR$/src/main/js/Configuration.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="362">
@@ -1238,18 +1108,6 @@
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/src/main/js/minerva.js">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="243">
- <caret line="338" column="65" lean-forward="false" selection-start-line="338" selection-start-column="65" selection-end-line="338" selection-end-column="65" />
- <folding>
- <marker date="1504026137494" expanded="true" signature="16593:16652" ph="..." />
- <marker date="1504026137494" expanded="true" signature="19918:19977" ph="..." />
- <marker date="1504026137494" expanded="true" signature="20785:20844" ph="..." />
- </folding>
- </state>
- </provider>
- </entry>
<entry file="file://$PROJECT_DIR$/src/test/js/gui/admin/AddProjectDialog-test.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="85">
@@ -1284,12 +1142,161 @@
</entry>
<entry file="file://$PROJECT_DIR$/src/main/js/gui/export/AbstractExportPanel.js">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="234">
- <caret line="97" column="5" lean-forward="true" selection-start-line="97" selection-start-column="5" selection-end-line="97" selection-end-column="5" />
+ <state relative-caret-position="693">
+ <caret line="437" column="28" lean-forward="true" selection-start-line="437" selection-start-column="28" selection-end-line="437" selection-end-column="28" />
+ <folding />
+ </state>
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/src/test/js/ServerConnector-mock.js">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="187">
+ <caret line="11" column="18" lean-forward="false" selection-start-line="11" selection-start-column="18" selection-end-line="11" selection-end-column="18" />
+ <folding />
+ </state>
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/src/main/css/global.css">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="364">
+ <caret line="503" column="20" lean-forward="false" selection-start-line="503" selection-start-column="20" selection-end-line="503" selection-end-column="20" />
+ <folding />
+ </state>
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/src/test/js/map/data/UserPreferences-test.js">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="408">
+ <caret line="24" column="7" lean-forward="false" selection-start-line="24" selection-start-column="7" selection-end-line="24" selection-end-column="7" />
+ <folding />
+ </state>
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/src/test/js/helper.js">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="476">
+ <caret line="28" column="31" lean-forward="false" selection-start-line="28" selection-start-column="31" selection-end-line="28" selection-end-column="31" />
+ <folding />
+ </state>
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/src/test/js/minerva-test.js">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="289">
+ <caret line="17" column="8" lean-forward="false" selection-start-line="17" selection-start-column="8" selection-end-line="17" selection-end-column="8" />
+ <folding />
+ </state>
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/src/main/js/map/data/UserPreferences.js">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="324">
+ <caret line="61" column="47" lean-forward="false" selection-start-line="61" selection-start-column="47" selection-end-line="61" selection-end-column="47" />
<folding />
</state>
</provider>
</entry>
+ <entry file="file://$PROJECT_DIR$/src/main/js/gui/AddOverlayDialog.js">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="229">
+ <caret line="81" column="13" lean-forward="false" selection-start-line="81" selection-start-column="13" selection-end-line="81" selection-end-column="13" />
+ <folding />
+ </state>
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/src/main/js/gui/OverviewDialog.js">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="229">
+ <caret line="123" column="24" lean-forward="false" selection-start-line="123" selection-start-column="24" selection-end-line="123" selection-end-column="24" />
+ <folding />
+ </state>
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/src/main/js/gui/admin/MapsAdminPanel.js">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="229">
+ <caret line="186" column="40" lean-forward="false" selection-start-line="186" selection-start-column="40" selection-end-line="186" selection-end-column="40" />
+ <folding>
+ <marker date="1503673820763" expanded="true" signature="1540:1546" ph="Â " />
+ <marker date="1503673820763" expanded="true" signature="1820:1826" ph="Â " />
+ </folding>
+ </state>
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/src/main/js/gui/admin/EditProjectDialog.js">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="229">
+ <caret line="298" column="24" lean-forward="false" selection-start-line="298" selection-start-column="24" selection-end-line="298" selection-end-column="24" />
+ <folding>
+ <marker date="1503577627579" expanded="true" signature="6500:6506" ph="Â " />
+ <marker date="1503577627579" expanded="true" signature="6861:6867" ph="Â " />
+ </folding>
+ </state>
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/src/main/js/gui/admin/AddProjectDialog.js">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="229">
+ <caret line="386" column="13" lean-forward="false" selection-start-line="386" selection-start-column="13" selection-end-line="386" selection-end-column="13" />
+ <folding>
+ <marker date="1504022727026" expanded="true" signature="4949:4955" ph="Â " />
+ <marker date="1504022727026" expanded="true" signature="5265:5271" ph="Â " />
+ </folding>
+ </state>
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/src/main/js/gui/leftPanel/AbstractDbPanel.js">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="229">
+ <caret line="38" column="14" lean-forward="false" selection-start-line="38" selection-start-column="14" selection-end-line="38" selection-end-column="14" />
+ <folding />
+ </state>
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/src/test/js/Functions-test.js">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="229">
+ <caret line="15" column="11" lean-forward="false" selection-start-line="15" selection-start-column="11" selection-end-line="15" selection-end-column="11" />
+ <folding />
+ </state>
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/src/main/js/map/window/AbstractInfoWindow.js">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="229">
+ <caret line="116" column="2" lean-forward="false" selection-start-line="116" selection-start-column="2" selection-end-line="116" selection-end-column="2" />
+ <folding />
+ </state>
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/src/main/js/map/marker/AbstractMarker.js">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="229">
+ <caret line="77" column="4" lean-forward="false" selection-start-line="77" selection-start-column="4" selection-end-line="77" selection-end-column="4" />
+ <folding />
+ </state>
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/src/main/js/ServerConnector.js">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="229">
+ <caret line="492" column="6" lean-forward="false" selection-start-line="492" selection-start-column="6" selection-end-line="492" selection-end-column="6" />
+ <folding />
+ </state>
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/src/main/js/minerva.js">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="221">
+ <caret line="414" column="59" lean-forward="true" selection-start-line="414" selection-start-column="59" selection-end-line="414" selection-end-column="59" />
+ <folding>
+ <marker date="1504026137494" expanded="true" signature="16593:16652" ph="..." />
+ <marker date="1504026137494" expanded="true" signature="19918:19977" ph="..." />
+ <marker date="1504026137494" expanded="true" signature="20785:20844" ph="..." />
+ </folding>
+ </state>
+ </provider>
+ </entry>
</component>
<component name="masterDetails">
<states>
diff --git a/frontend-js/src/main/js/gui/export/AbstractExportPanel.js b/frontend-js/src/main/js/gui/export/AbstractExportPanel.js
index 1f0cb52ca9..bb1055d376 100644
--- a/frontend-js/src/main/js/gui/export/AbstractExportPanel.js
+++ b/frontend-js/src/main/js/gui/export/AbstractExportPanel.js
@@ -38,16 +38,16 @@ AbstractExportPanel.prototype._createMiriamTypeDiv = function (annotations) {
var typeDiv = Functions.createElement({
type: "div",
name: "miriamSelectDiv",
- className: "minerva-export-dual-listbox-container",
+ className: "minerva-export-dual-listbox-container"
});
typeDiv.appendChild(Functions.createElement({
type: "h4",
- content: " Annotations:",
+ content: " Annotations:"
}));
var selectElement = Functions.createElement({
type: "select",
- className: "minerva-multi-select",
+ className: "minerva-multi-select"
});
typeDiv.appendChild(selectElement);
@@ -94,7 +94,7 @@ AbstractExportPanel.prototype.createDualListbox = function (selectElement) {
AbstractExportPanel.prototype._createSelectTypeDiv = function (elementTypes) {
var typeDiv = Functions.createElement({
type: "div",
- name: "typeSelectDiv",
+ name: "typeSelectDiv"
});
typeDiv.appendChild(Functions.createElement({
type: "h4",
@@ -156,11 +156,11 @@ AbstractExportPanel.prototype.getMiriamTypesDualListbox = function () {
AbstractExportPanel.prototype._createSelectColumnDiv = function (columnTypes) {
var columnDiv = Functions.createElement({
type: "div",
- name: "columnSelectDiv",
+ name: "columnSelectDiv"
});
columnDiv.appendChild(Functions.createElement({
type: "h4",
- content: " COLUMN:",
+ content: " COLUMN:"
}));
var choicesContainer = Functions.createElement({
type: "ul",
@@ -279,7 +279,7 @@ AbstractExportPanel.prototype._createDownloadButton = function () {
var downloadDiv = Functions.createElement({
type: "div",
name: "downloadDiv",
- style: "clear:both; padding: 10px;",
+ style: "clear:both; padding: 10px;"
});
var button = Functions.createElement({
type: "button",
@@ -299,7 +299,7 @@ AbstractExportPanel.prototype._createDownloadButton = function () {
GuiConnector.hideProcessing();
GuiConnector.alert(error);
});
- },
+ }
});
downloadDiv.appendChild(button);
@@ -316,18 +316,18 @@ AbstractExportPanel.prototype._createSelectIncludedCompartmentDiv = function ()
var typeDiv = Functions.createElement({
type: "div",
name: "includedCompartmentSelectDiv",
- className: "minerva-export-dual-listbox-container",
+ className: "minerva-export-dual-listbox-container"
});
typeDiv.appendChild(Functions.createElement({
type: "h4",
- content: " Included compartment/pathways:",
+ content: " Included compartment/pathways:"
}));
return self._getCompartmentNames().then(function (compartmentNames) {
var selectElement = Functions.createElement({
type: "select",
- className: "minerva-multi-select",
+ className: "minerva-multi-select"
});
typeDiv.appendChild(selectElement);
@@ -349,18 +349,18 @@ AbstractExportPanel.prototype._createSelectExcludedCompartmentDiv = function ()
var typeDiv = Functions.createElement({
type: "div",
name: "excludedCompartmentSelectDiv",
- className: "minerva-export-dual-listbox-container",
+ className: "minerva-export-dual-listbox-container"
});
typeDiv.appendChild(Functions.createElement({
type: "h4",
- content: " Excluded compartment/pathways:",
+ content: " Excluded compartment/pathways:"
}));
return self._getCompartmentNames().then(function (compartmentNames) {
var selectElement = Functions.createElement({
type: "select",
- className: "minerva-multi-select",
+ className: "minerva-multi-select"
});
typeDiv.appendChild(selectElement);
diff --git a/frontend-js/src/main/js/map/data/UserPreferences.js b/frontend-js/src/main/js/map/data/UserPreferences.js
index 4612cdb866..ac5cc24f62 100644
--- a/frontend-js/src/main/js/map/data/UserPreferences.js
+++ b/frontend-js/src/main/js/map/data/UserPreferences.js
@@ -59,7 +59,7 @@ UserPreferences.prototype.getElementValidAnnotations = function (className) {
return this._elementValidAnnotations[className];
};
-UserPreferences.prototype.toExport = function (className) {
+UserPreferences.prototype.toExport = function () {
return {
"project-upload": {
"auto-resize": this._projectUpload.autoResize,
diff --git a/frontend-js/src/test/js/helper.js b/frontend-js/src/test/js/helper.js
index e2a1067d19..1502feff98 100644
--- a/frontend-js/src/test/js/helper.js
+++ b/frontend-js/src/test/js/helper.js
@@ -26,6 +26,7 @@ var User = require("../../main/js/map/data/User");
var Cookies = require('js-cookie');
var fs = require('fs');
+var Promise = require('bluebird');
var GuiConnector = require('../../main/js/GuiConnector');
diff --git a/frontend-js/src/test/js/map/data/UserPreferences-test.js b/frontend-js/src/test/js/map/data/UserPreferences-test.js
index 2f9c8e86e4..6a940f7717 100644
--- a/frontend-js/src/test/js/map/data/UserPreferences-test.js
+++ b/frontend-js/src/test/js/map/data/UserPreferences-test.js
@@ -1,6 +1,6 @@
"use strict";
-require("../../mocha-config")
+require("../../mocha-config");
/* exported logger */
var UserPreferences = require('../../../../main/js/map/data/UserPreferences');
@@ -10,9 +10,6 @@ var logger = require('../../logger');
var chai = require('chai');
var assert = chai.assert;
-var fs = require('fs');
-var Promise = require('fs');
-
describe('UserPreferences', function () {
it("constructor", function () {
return helper.readFile("testFiles/preferences.json").then(function (content) {
@@ -25,6 +22,6 @@ describe('UserPreferences', function () {
assert.ok(object.getElementValidAnnotations("lcsb.mapviewer.model.map.species.Protein").length > 0);
assert.ok(object.getElementRequiredAnnotations("lcsb.mapviewer.model.map.species.Protein").requiredAtLeastOnce);
assert.ok(object.getElementRequiredAnnotations("lcsb.mapviewer.model.map.species.Protein").list.length > 0);
- })
+ });
});
});
diff --git a/frontend-js/src/test/js/minerva-test.js b/frontend-js/src/test/js/minerva-test.js
index 383ef3a60b..dab3cc30ed 100644
--- a/frontend-js/src/test/js/minerva-test.js
+++ b/frontend-js/src/test/js/minerva-test.js
@@ -8,8 +8,6 @@ require("./mocha-config.js");
var Alias = require('../../main/js/map/data/Alias');
var minerva = require('../../main/js/minerva');
-var GuiConnectorMock = require('./GuiConnector-mock');
-var ServerConnectorMock = require('./ServerConnector-mock');
var ServerConnectorMock = require('./ServerConnector-mock');
var chai = require('chai');
--
GitLab