From 567f49467a13ef3149681f6a901dcd4ea5b3ea6a Mon Sep 17 00:00:00 2001
From: Piotr Gawron <piotr.gawron@uni.lu>
Date: Thu, 24 Aug 2017 17:05:55 +0200
Subject: [PATCH] resize is triggered once when crating admin panel
---
frontend-js/.idea/workspace.xml | 391 +++++++++++-------
frontend-js/src/main/js/Admin.js | 4 +-
.../main/js/gui/admin/CommentsAdminPanel.js | 2 -
.../src/main/js/gui/admin/MapsAdminPanel.js | 2 -
frontend-js/src/test/js/minerva-test.js | 18 +-
5 files changed, 253 insertions(+), 164 deletions(-)
diff --git a/frontend-js/.idea/workspace.xml b/frontend-js/.idea/workspace.xml
index c9767306e0..32c1527a69 100644
--- a/frontend-js/.idea/workspace.xml
+++ b/frontend-js/.idea/workspace.xml
@@ -6,7 +6,11 @@
</component>
<component name="ChangeListManager">
<list default="true" id="c119f0dd-fdda-4d02-a51e-86bc6ef7e50c" name="Default" comment="">
- <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/js/gui/LoginDialog.js" afterPath="$PROJECT_DIR$/src/main/js/gui/LoginDialog.js" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/js/Admin.js" afterPath="$PROJECT_DIR$/src/main/js/Admin.js" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/js/gui/admin/CommentsAdminPanel.js" afterPath="$PROJECT_DIR$/src/main/js/gui/admin/CommentsAdminPanel.js" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/js/gui/admin/MapsAdminPanel.js" afterPath="$PROJECT_DIR$/src/main/js/gui/admin/MapsAdminPanel.js" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/test/js/minerva-test.js" afterPath="$PROJECT_DIR$/src/test/js/minerva-test.js" />
</list>
<ignored path="$PROJECT_DIR$/.tmp/" />
<ignored path="$PROJECT_DIR$/temp/" />
@@ -20,91 +24,77 @@
</component>
<component name="FileEditorManager">
<leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
- <file leaf-file-name="PublicationListDialog.js" pinned="false" current-in-tab="false">
- <entry file="file://$PROJECT_DIR$/src/main/js/gui/leftPanel/PublicationListDialog.js">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="65">
- <caret line="6" column="47" lean-forward="false" selection-start-line="6" selection-start-column="47" selection-end-line="6" selection-end-column="47" />
- <folding />
- </state>
- </provider>
- </entry>
- </file>
- <file leaf-file-name="AbstractGuiElement.js" pinned="false" current-in-tab="false">
- <entry file="file://$PROJECT_DIR$/src/main/js/gui/AbstractGuiElement.js">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="306">
- <caret line="18" column="6" lean-forward="false" selection-start-line="18" selection-start-column="6" selection-end-line="18" selection-end-column="6" />
- <folding />
- </state>
- </provider>
- </entry>
- </file>
- <file leaf-file-name="LoginDialog.js" pinned="false" current-in-tab="true">
- <entry file="file://$PROJECT_DIR$/src/main/js/gui/LoginDialog.js">
+ <file leaf-file-name="minerva-test.js" pinned="false" current-in-tab="false">
+ <entry file="file://$PROJECT_DIR$/src/test/js/minerva-test.js">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="438">
- <caret line="101" column="5" lean-forward="true" selection-start-line="101" selection-start-column="5" selection-end-line="101" selection-end-column="5" />
+ <state relative-caret-position="223">
+ <caret line="515" column="0" lean-forward="false" selection-start-line="515" selection-start-column="0" selection-end-line="515" selection-end-column="0" />
<folding />
</state>
</provider>
</entry>
</file>
- <file leaf-file-name="ObjectWithListeners.js" pinned="false" current-in-tab="false">
- <entry file="file://$PROJECT_DIR$/src/main/js/ObjectWithListeners.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="170">
- <caret line="10" column="9" lean-forward="false" selection-start-line="10" selection-start-column="9" selection-end-line="10" selection-end-column="9" />
- <folding />
+ <state relative-caret-position="255">
+ <caret line="581" column="32" lean-forward="true" selection-start-line="581" selection-start-column="32" selection-end-line="581" selection-end-column="32" />
+ <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="EcmaScript.js" pinned="false" current-in-tab="false">
- <entry file="jar://$APPLICATION_HOME_DIR$/plugins/JavaScriptLanguage/lib/JavaScriptLanguage.jar!/com/intellij/lang/javascript/index/predefined/EcmaScript.js">
+ <file leaf-file-name="EditProjectDialog-test.js" pinned="false" current-in-tab="true">
+ <entry file="file://$PROJECT_DIR$/src/test/js/gui/admin/EditProjectDialog-test.js">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="218">
- <caret line="64" column="0" lean-forward="false" selection-start-line="64" selection-start-column="0" selection-end-line="64" selection-end-column="0" />
+ <state relative-caret-position="671">
+ <caret line="93" column="42" lean-forward="true" selection-start-line="93" selection-start-column="42" selection-end-line="93" selection-end-column="42" />
<folding />
</state>
</provider>
</entry>
</file>
- <file leaf-file-name="minerva-test.js" pinned="false" current-in-tab="false">
- <entry file="file://$PROJECT_DIR$/src/test/js/minerva-test.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="204">
- <caret line="17" column="0" lean-forward="false" selection-start-line="12" selection-start-column="0" selection-end-line="17" selection-end-column="0" />
- <folding />
+ <state relative-caret-position="206">
+ <caret line="126" column="0" lean-forward="false" selection-start-line="126" selection-start-column="0" selection-end-line="126" selection-end-column="0" />
+ <folding>
+ <marker date="1503586944911" expanded="true" signature="1612:1618" ph="Â " />
+ <marker date="1503586944911" expanded="true" signature="1922:1928" ph="Â " />
+ </folding>
</state>
</provider>
</entry>
</file>
- <file leaf-file-name="NetworkError.js" pinned="false" current-in-tab="false">
- <entry file="file://$PROJECT_DIR$/src/main/js/NetworkError.js">
+ <file leaf-file-name="Admin.js" pinned="false" current-in-tab="false">
+ <entry file="file://$PROJECT_DIR$/src/main/js/Admin.js">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="0">
- <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
+ <state relative-caret-position="335">
+ <caret line="150" column="0" lean-forward="false" selection-start-line="150" selection-start-column="0" selection-end-line="150" selection-end-column="0" />
<folding />
</state>
</provider>
</entry>
</file>
- <file leaf-file-name="global.css" pinned="false" current-in-tab="false">
- <entry file="file://$PROJECT_DIR$/src/main/css/global.css">
+ <file leaf-file-name="CommentsAdminPanel.js" pinned="false" current-in-tab="false">
+ <entry file="file://$PROJECT_DIR$/src/main/js/gui/admin/CommentsAdminPanel.js">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="341">
- <caret line="503" column="37" lean-forward="false" selection-start-line="503" selection-start-column="37" selection-end-line="503" selection-end-column="37" />
+ <state relative-caret-position="233">
+ <caret line="120" column="0" lean-forward="false" selection-start-line="120" selection-start-column="0" selection-end-line="120" selection-end-column="0" />
<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="promise.js" pinned="false" current-in-tab="false">
+ <entry file="file://$PROJECT_DIR$/node_modules/bluebird/js/release/promise.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" />
+ <state relative-caret-position="216">
+ <caret line="681" column="45" lean-forward="false" selection-start-line="681" selection-start-column="45" selection-end-line="681" selection-end-column="45" />
<folding />
</state>
</provider>
@@ -114,9 +104,6 @@
</component>
<component name="FindInProjectRecents">
<findStrings>
- <find>openDa</find>
- <find>dialog</find>
- <find>TopMe</find>
<find>showOverviewButton</find>
<find>TopMen</find>
<find>getProject</find>
@@ -130,7 +117,6 @@
<find>createAdmin</find>
<find>destr</find>
<find>logger.in</find>
- <find>resize</find>
<find>DataT</find>
<find>Table</find>
<find>DataTa</find>
@@ -144,6 +130,10 @@
<find>getLcsbLogoImg</find>
<find>destroy</find>
<find>open</find>
+ <find>create Ad</find>
+ <find>(window).tri</find>
+ <find>resize</find>
+ <find>init</find>
</findStrings>
<dirStrings>
<dir>C:\Users\piotr.gawron\workspace\MapViewer-parent\frontend-js\src\main\js\gui\leftPanel</dir>
@@ -174,9 +164,6 @@
<option value="$PROJECT_DIR$/src/main/js/map/Submap.js" />
<option value="$PROJECT_DIR$/src/test/js/map/CustomMap-test.js" />
<option value="$PROJECT_DIR$/src/main/js/gui/topMenu/TopMenu.js" />
- <option value="$PROJECT_DIR$/src/main/js/gui/admin/MapsAdminPanel.js" />
- <option value="$PROJECT_DIR$/src/main/js/gui/admin/CommentsAdminPanel.js" />
- <option value="$PROJECT_DIR$/src/main/js/Admin.js" />
<option value="$PROJECT_DIR$/src/main/js/gui/export/ElementExportPanel.js" />
<option value="$PROJECT_DIR$/src/test/js/gui/leftPanel/PublicationListDialog-test.js" />
<option value="$PROJECT_DIR$/src/test/js/gui/leftPanel/LeftPanel-test.js" />
@@ -184,7 +171,6 @@
<option value="$PROJECT_DIR$/src/test/js/gui/admin/EditProjectDialog-test.js" />
<option value="$PROJECT_DIR$/src/test/js/gui/admin/MapsAdminPanel-test.js" />
<option value="$PROJECT_DIR$/src/test/js/mocha-config.js" />
- <option value="$PROJECT_DIR$/src/test/js/minerva-test.js" />
<option value="$PROJECT_DIR$/src/main/js/gui/leftPanel/ProjectInfoPanel.js" />
<option value="$PROJECT_DIR$/src/main/js/map/window/AbstractInfoWindow.js" />
<option value="$PROJECT_DIR$/src/main/css/global.css" />
@@ -194,6 +180,10 @@
<option value="$PROJECT_DIR$/src/main/js/map/CustomMap.js" />
<option value="$PROJECT_DIR$/src/main/js/gui/leftPanel/PublicationListDialog.js" />
<option value="$PROJECT_DIR$/src/main/js/gui/LoginDialog.js" />
+ <option value="$PROJECT_DIR$/src/main/js/gui/admin/CommentsAdminPanel.js" />
+ <option value="$PROJECT_DIR$/src/main/js/gui/admin/MapsAdminPanel.js" />
+ <option value="$PROJECT_DIR$/src/main/js/Admin.js" />
+ <option value="$PROJECT_DIR$/src/test/js/minerva-test.js" />
</list>
</option>
</component>
@@ -243,13 +233,67 @@
<path>
<item name="frontend-js" type="b2602c69:ProjectViewProjectNode" />
<item name="frontend-js" type="462c0819:PsiDirectoryNode" />
- <item name="coverage" type="462c0819:PsiDirectoryNode" />
+ <item name="src" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="frontend-js" type="b2602c69:ProjectViewProjectNode" />
<item name="frontend-js" type="462c0819:PsiDirectoryNode" />
- <item name="coverage" type="462c0819:PsiDirectoryNode" />
- <item name="lcov-report" type="462c0819:PsiDirectoryNode" />
+ <item name="src" type="462c0819:PsiDirectoryNode" />
+ <item name="main" type="462c0819:PsiDirectoryNode" />
+ </path>
+ <path>
+ <item name="frontend-js" type="b2602c69:ProjectViewProjectNode" />
+ <item name="frontend-js" type="462c0819:PsiDirectoryNode" />
+ <item name="src" type="462c0819:PsiDirectoryNode" />
+ <item name="main" type="462c0819:PsiDirectoryNode" />
+ <item name="js" type="462c0819:PsiDirectoryNode" />
+ </path>
+ <path>
+ <item name="frontend-js" type="b2602c69:ProjectViewProjectNode" />
+ <item name="frontend-js" type="462c0819:PsiDirectoryNode" />
+ <item name="src" type="462c0819:PsiDirectoryNode" />
+ <item name="main" type="462c0819:PsiDirectoryNode" />
+ <item name="js" type="462c0819:PsiDirectoryNode" />
+ <item name="gui" type="462c0819:PsiDirectoryNode" />
+ </path>
+ <path>
+ <item name="frontend-js" type="b2602c69:ProjectViewProjectNode" />
+ <item name="frontend-js" type="462c0819:PsiDirectoryNode" />
+ <item name="src" type="462c0819:PsiDirectoryNode" />
+ <item name="main" type="462c0819:PsiDirectoryNode" />
+ <item name="js" type="462c0819:PsiDirectoryNode" />
+ <item name="gui" type="462c0819:PsiDirectoryNode" />
+ <item name="admin" type="462c0819:PsiDirectoryNode" />
+ </path>
+ <path>
+ <item name="frontend-js" type="b2602c69:ProjectViewProjectNode" />
+ <item name="frontend-js" type="462c0819:PsiDirectoryNode" />
+ <item name="src" type="462c0819:PsiDirectoryNode" />
+ <item name="test" type="462c0819:PsiDirectoryNode" />
+ </path>
+ <path>
+ <item name="frontend-js" type="b2602c69:ProjectViewProjectNode" />
+ <item name="frontend-js" type="462c0819:PsiDirectoryNode" />
+ <item name="src" type="462c0819:PsiDirectoryNode" />
+ <item name="test" type="462c0819:PsiDirectoryNode" />
+ <item name="js" type="462c0819:PsiDirectoryNode" />
+ </path>
+ <path>
+ <item name="frontend-js" type="b2602c69:ProjectViewProjectNode" />
+ <item name="frontend-js" type="462c0819:PsiDirectoryNode" />
+ <item name="src" type="462c0819:PsiDirectoryNode" />
+ <item name="test" type="462c0819:PsiDirectoryNode" />
+ <item name="js" type="462c0819:PsiDirectoryNode" />
+ <item name="gui" type="462c0819:PsiDirectoryNode" />
+ </path>
+ <path>
+ <item name="frontend-js" type="b2602c69:ProjectViewProjectNode" />
+ <item name="frontend-js" type="462c0819:PsiDirectoryNode" />
+ <item name="src" type="462c0819:PsiDirectoryNode" />
+ <item name="test" type="462c0819:PsiDirectoryNode" />
+ <item name="js" type="462c0819:PsiDirectoryNode" />
+ <item name="gui" type="462c0819:PsiDirectoryNode" />
+ <item name="admin" type="462c0819:PsiDirectoryNode" />
</path>
</expand>
<select />
@@ -261,7 +305,7 @@
</component>
<component name="PropertiesComponent">
<property name="WebServerToolWindowFactoryState" value="false" />
- <property name="last_opened_file_path" value="$PROJECT_DIR$/isolate-000000000032F7A0-v8.log" />
+ <property name="last_opened_file_path" value="$PROJECT_DIR$/isolate-000000000052C010-v8.log" />
<property name="nodejs_interpreter_path" value="C:/Program Files/nodejs/node" />
<property name="HbShouldOpenHtmlAsHb" value="" />
<property name="nodejs.mocha.mocha_node_package_dir" value="$PROJECT_DIR$/node_modules/mocha" />
@@ -285,7 +329,7 @@
</list>
</option>
</component>
- <component name="RunManager" selected="Mocha.src\test\js\GuiConnector-test.js">
+ <component name="RunManager" selected="Node.js.Unnamed">
<configuration name="MapsAdminPanel" type="mocha-javascript-test-runner" factoryName="Mocha" temporary="true" nameIsGenerated="true">
<node-interpreter>project</node-interpreter>
<node-options />
@@ -315,7 +359,33 @@
<name value="onAddClicked" />
</test-names>
</configuration>
- <configuration name="OverlayPanel.js" type="NodeJSConfigurationType" factoryName="Node.js" temporary="true" path-to-node="project" path-to-js-file="OverlayPanel.js" working-dir="$PROJECT_DIR$/src/main/js/gui/leftPanel" />
+ <configuration name="Unnamed" type="NodeJSConfigurationType" factoryName="Node.js" path-to-node="project" path-to-js-file="node_modules/mocha/bin/_mocha" application-parameters="--recursive src/test --grep "create Admin"" working-dir="$PROJECT_DIR$">
+ <profiling do-profile="true" />
+ <EXTENSION ID="com.jetbrains.nodejs.remote.docker.NodeJSDockerRunConfigurationExtension">
+ <option name="envVars">
+ <list />
+ </option>
+ <option name="extraHosts">
+ <list />
+ </option>
+ <option name="links">
+ <list />
+ </option>
+ <option name="networkDisabled" value="false" />
+ <option name="networkMode" value="bridge" />
+ <option name="portBindings">
+ <list />
+ </option>
+ <option name="publishAllPorts" value="false" />
+ <option name="version" value="1" />
+ <option name="volumeBindings">
+ <list />
+ </option>
+ </EXTENSION>
+ <EXTENSION ID="com.jetbrains.nodejs.run.NodeJSProfilingRunConfigurationExtension">
+ <profiling do-profile="true" />
+ </EXTENSION>
+ </configuration>
<configuration default="true" type="mocha-javascript-test-runner" factoryName="Mocha">
<node-interpreter>project</node-interpreter>
<node-options />
@@ -328,6 +398,29 @@
<test-directory>$PROJECT_DIR$/src/test/js</test-directory>
<recursive>true</recursive>
</configuration>
+ <configuration default="true" type="NodeJSConfigurationType" factoryName="Node.js" path-to-node="project" working-dir="">
+ <EXTENSION ID="com.jetbrains.nodejs.remote.docker.NodeJSDockerRunConfigurationExtension">
+ <option name="envVars">
+ <list />
+ </option>
+ <option name="extraHosts">
+ <list />
+ </option>
+ <option name="links">
+ <list />
+ </option>
+ <option name="networkDisabled" value="false" />
+ <option name="networkMode" value="bridge" />
+ <option name="portBindings">
+ <list />
+ </option>
+ <option name="publishAllPorts" value="false" />
+ <option name="version" value="1" />
+ <option name="volumeBindings">
+ <list />
+ </option>
+ </EXTENSION>
+ </configuration>
<configuration default="true" type="js.build_tools.npm" factoryName="npm">
<package-json value="$PROJECT_DIR$/package.json" />
<command value="run" />
@@ -372,20 +465,19 @@
<envs />
</configuration>
<list size="6">
- <item index="0" class="java.lang.String" itemvalue="npm.test" />
- <item index="1" class="java.lang.String" itemvalue="Mocha.MapsAdminPanel.onAddClicked" />
- <item index="2" class="java.lang.String" itemvalue="Node.js.OverlayPanel.js" />
+ <item index="0" class="java.lang.String" itemvalue="Node.js.Unnamed" />
+ <item index="1" class="java.lang.String" itemvalue="npm.test" />
+ <item index="2" class="java.lang.String" itemvalue="Mocha.MapsAdminPanel.onAddClicked" />
<item index="3" class="java.lang.String" itemvalue="Mocha.MapsAdminPanel" />
<item index="4" class="java.lang.String" itemvalue="Mocha.minerva global" />
<item index="5" class="java.lang.String" itemvalue="Mocha.src\test\js\GuiConnector-test.js" />
</list>
<recent_temporary>
- <list size="5">
+ <list size="4">
<item index="0" class="java.lang.String" itemvalue="Mocha.src\test\js\GuiConnector-test.js" />
<item index="1" class="java.lang.String" itemvalue="Mocha.minerva global" />
<item index="2" class="java.lang.String" itemvalue="Mocha.MapsAdminPanel" />
<item index="3" class="java.lang.String" itemvalue="Mocha.MapsAdminPanel.onAddClicked" />
- <item index="4" class="java.lang.String" itemvalue="Node.js.OverlayPanel.js" />
</list>
</recent_temporary>
</component>
@@ -405,7 +497,7 @@
<workItem from="1503501472332" duration="132000" />
<workItem from="1503501772627" duration="21000" />
<workItem from="1503502231792" duration="5017000" />
- <workItem from="1503560609163" duration="15860000" />
+ <workItem from="1503560609163" duration="18006000" />
</task>
<servers />
</component>
@@ -442,10 +534,11 @@
</history-entry>
</component>
<component name="TimeTrackingManager">
- <option name="totallyTimeSpent" value="21030000" />
+ <option name="totallyTimeSpent" value="23176000" />
</component>
<component name="ToolWindowManager">
<frame x="-8" y="-8" width="1936" height="1176" extended-state="6" />
+ <editor active="true" />
<layout>
<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" />
@@ -456,7 +549,7 @@
<window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.18020834" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
<window_info id="Inspection Results" 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="-1" 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.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
- <window_info id="V8 CPU Profiling" active="true" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.34489223" sideWeight="0.66197914" order="0" 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="true" show_stripe_button="true" weight="0.34489223" sideWeight="0.66197914" order="0" side_tool="false" 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="Favorites" 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="3" side_tool="true" content_ui="tabs" />
<window_info id="Debug" 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="3" side_tool="false" content_ui="tabs" />
@@ -479,22 +572,6 @@
<watches-manager />
</component>
<component name="editorHistoryManager">
- <entry file="file://$PROJECT_DIR$/src/main/js/gui/leftPanel/ProjectInfoPanel.js">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="6086">
- <caret line="358" column="37" lean-forward="false" selection-start-line="358" selection-start-column="27" selection-end-line="358" selection-end-column="37" />
- <folding />
- </state>
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/src/test/js/gui/leftPanel/LeftPanel-test.js">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="1394">
- <caret line="82" column="76" lean-forward="false" selection-start-line="82" selection-start-column="75" selection-end-line="82" selection-end-column="76" />
- <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="249">
@@ -639,14 +716,6 @@
</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="77">
- <caret line="203" column="18" lean-forward="false" selection-start-line="203" selection-start-column="0" selection-end-line="203" selection-end-column="18" />
- <folding />
- </state>
- </provider>
- </entry>
<entry file="file://$PROJECT_DIR$/src/main/js/gui/leftPanel/LeftPanel.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="252">
@@ -655,22 +724,6 @@
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/src/main/js/Admin.js">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="-7">
- <caret line="178" column="17" lean-forward="false" selection-start-line="178" selection-start-column="17" selection-end-line="178" selection-end-column="17" />
- <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="-24">
- <caret line="127" column="33" lean-forward="false" selection-start-line="127" selection-start-column="27" selection-end-line="127" selection-end-column="33" />
- <folding />
- </state>
- </provider>
- </entry>
<entry file="file://$PROJECT_DIR$/src/test/js/gui/leftPanel/LeftPanel-test.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="580">
@@ -695,25 +748,6 @@
</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="-7">
- <caret line="567" column="47" lean-forward="false" selection-start-line="567" selection-start-column="47" selection-end-line="567" selection-end-column="47" />
- <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/test/js/gui/admin/EditProjectDialog-test.js">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="-7">
- <caret line="111" column="0" lean-forward="false" selection-start-line="111" selection-start-column="0" selection-end-line="111" selection-end-column="0" />
- <folding />
- </state>
- </provider>
- </entry>
<entry file="file://$PROJECT_DIR$/src/test/js/mocha-config.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="493">
@@ -822,14 +856,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="204">
- <caret line="17" column="0" lean-forward="false" selection-start-line="12" selection-start-column="0" selection-end-line="17" selection-end-column="0" />
- <folding />
- </state>
- </provider>
- </entry>
<entry file="jar://$APPLICATION_HOME_DIR$/plugins/JavaScriptLanguage/lib/JavaScriptLanguage.jar!/com/intellij/lang/javascript/index/predefined/EcmaScript.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="218">
@@ -898,26 +924,95 @@
</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="65">
+ <caret line="6" column="47" lean-forward="false" selection-start-line="6" selection-start-column="47" selection-end-line="6" selection-end-column="47" />
+ <folding />
+ </state>
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/src/main/js/gui/LoginDialog.js">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="234">
+ <caret line="89" column="0" lean-forward="true" selection-start-line="89" selection-start-column="0" selection-end-line="89" selection-end-column="0" />
+ <folding />
+ </state>
+ </provider>
+ </entry>
<entry file="file://$PROJECT_DIR$/src/main/js/gui/AbstractGuiElement.js">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="306">
- <caret line="18" column="6" lean-forward="false" selection-start-line="18" selection-start-column="6" selection-end-line="18" selection-end-column="6" />
+ <state relative-caret-position="119">
+ <caret line="7" column="34" lean-forward="true" selection-start-line="7" selection-start-column="34" selection-end-line="7" selection-end-column="34" />
<folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/src/main/js/gui/leftPanel/PublicationListDialog.js">
+ <entry file="file://$PROJECT_DIR$/node_modules/bluebird/js/release/promise.js">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="65">
- <caret line="6" column="47" lean-forward="false" selection-start-line="6" selection-start-column="47" selection-end-line="6" selection-end-column="47" />
+ <state relative-caret-position="216">
+ <caret line="681" column="45" lean-forward="false" selection-start-line="681" selection-start-column="45" selection-end-line="681" selection-end-column="45" />
<folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/src/main/js/gui/LoginDialog.js">
+ <entry file="file://$PROJECT_DIR$/isolate-0000000000455D70-v8-2017-08-24_16-56-20-.log">
+ <provider selected="true" editor-type-id="LargeFileEditor">
+ <state relative-caret-position="289">
+ <caret line="17" column="47" lean-forward="true" selection-start-line="17" selection-start-column="47" selection-end-line="17" selection-end-column="47" />
+ </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="233">
+ <caret line="120" column="0" lean-forward="false" selection-start-line="120" selection-start-column="0" selection-end-line="120" selection-end-column="0" />
+ <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="206">
+ <caret line="126" column="0" lean-forward="false" selection-start-line="126" selection-start-column="0" selection-end-line="126" selection-end-column="0" />
+ <folding>
+ <marker date="1503586944911" expanded="true" signature="1612:1618" ph="Â " />
+ <marker date="1503586944911" expanded="true" signature="1922:1928" ph="Â " />
+ </folding>
+ </state>
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/src/main/js/Admin.js">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="335">
+ <caret line="150" column="0" lean-forward="false" selection-start-line="150" selection-start-column="0" selection-end-line="150" selection-end-column="0" />
+ <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="223">
+ <caret line="515" column="0" lean-forward="false" selection-start-line="515" selection-start-column="0" selection-end-line="515" selection-end-column="0" />
+ <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="255">
+ <caret line="581" column="32" lean-forward="true" selection-start-line="581" selection-start-column="32" selection-end-line="581" selection-end-column="32" />
+ <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/test/js/gui/admin/EditProjectDialog-test.js">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="438">
- <caret line="101" column="5" lean-forward="true" selection-start-line="101" selection-start-column="5" selection-end-line="101" selection-end-column="5" />
+ <state relative-caret-position="671">
+ <caret line="93" column="42" lean-forward="true" selection-start-line="93" selection-start-column="42" selection-end-line="93" selection-end-column="42" />
<folding />
</state>
</provider>
diff --git a/frontend-js/src/main/js/Admin.js b/frontend-js/src/main/js/Admin.js
index d9d4055e6f..b492db71a5 100644
--- a/frontend-js/src/main/js/Admin.js
+++ b/frontend-js/src/main/js/Admin.js
@@ -146,7 +146,9 @@ Admin.prototype.init = function () {
promises.push(this._panels[i].init());
}
promises.push(this.getHeader().init());
- return Promise.all(promises);
+ return Promise.all(promises).then(function(){
+ $(window).trigger('resize');
+ });
};
Admin.prototype.setConfiguration = function (configuration) {
diff --git a/frontend-js/src/main/js/gui/admin/CommentsAdminPanel.js b/frontend-js/src/main/js/gui/admin/CommentsAdminPanel.js
index 341e37072c..75e221292c 100644
--- a/frontend-js/src/main/js/gui/admin/CommentsAdminPanel.js
+++ b/frontend-js/src/main/js/gui/admin/CommentsAdminPanel.js
@@ -118,8 +118,6 @@ CommentsAdminPanel.prototype.refreshProjects = function() {
}).then(function(projectId) {
projectSelect.value = projectId;
return self.onProjectChange();
- }).then(function() {
- $(window).trigger('resize');
});
};
diff --git a/frontend-js/src/main/js/gui/admin/MapsAdminPanel.js b/frontend-js/src/main/js/gui/admin/MapsAdminPanel.js
index b4bbd2a061..fbc215fbe7 100644
--- a/frontend-js/src/main/js/gui/admin/MapsAdminPanel.js
+++ b/frontend-js/src/main/js/gui/admin/MapsAdminPanel.js
@@ -124,8 +124,6 @@ MapsAdminPanel.prototype.init = function () {
var self = this;
return ServerConnector.getProjects().then(function (projects) {
return self.setProjects(projects);
- }).then(function () {
- $(window).trigger('resize');
});
};
diff --git a/frontend-js/src/test/js/minerva-test.js b/frontend-js/src/test/js/minerva-test.js
index 8c18abf298..3b32cb2e94 100644
--- a/frontend-js/src/test/js/minerva-test.js
+++ b/frontend-js/src/test/js/minerva-test.js
@@ -16,11 +16,14 @@ var logger = require('./logger');
describe('minerva global', function () {
beforeEach(function () {
+ global.scriptDiv = document.createElement("script");
global.GuiConnector = undefined;
global.ServerConnector = undefined;
+ document.body.appendChild(global.scriptDiv);
});
afterEach(function () {
+ document.body.removeChild(global.scriptDiv);
global.GuiConnector = GuiConnectorMock;
global.ServerConnector = ServerConnectorMock;
});
@@ -71,18 +74,15 @@ describe('minerva global', function () {
it("showComments", function () {
var options = null;
- var customMap;
return ServerConnectorMock.getProject().then(function (project) {
options = helper.createCustomMapOptions(project);
return minerva.create(options);
- }).then(function (result) {
- customMap = result;
+ }).then(function () {
var commentCheckbox = document.getElementsByName("commentCheckbox")[0];
commentCheckbox.checked = true;
return commentCheckbox.onclick();
}).then(function () {
assert.ok(ServerConnectorMock.getSessionData(options.getProject()).getShowComments());
- return customMap.destroy();
});
});
@@ -92,10 +92,9 @@ describe('minerva global', function () {
return ServerConnectorMock.getProject().then(function (project) {
options = helper.createCustomMapOptions(project);
return minerva.create(options);
- }).then(function (result) {
+ }).then(function () {
var sessionData = ServerConnectorMock.getSessionData(options.getProject());
assert.equal(sessionData.getZoomLevel(options.getProject().getModel()), 5);
- return result.destroy();
});
});
@@ -105,12 +104,11 @@ describe('minerva global', function () {
return ServerConnectorMock.getProject().then(function (project) {
options = helper.createCustomMapOptions(project);
return minerva.create(options);
- }).then(function (result) {
+ }).then(function () {
var center = ServerConnectorMock.getSessionData(options.getProject()).getCenter(options.getProject().getModel());
assert.ok(center instanceof google.maps.Point);
assert.equal(center.x, 5);
assert.equal(center.y, 6);
- return result.destroy();
});
});
@@ -128,7 +126,6 @@ describe('minerva global', function () {
return minerva.create(options);
}).then(function (result) {
- customMap = result;
assert.ok(result);
// input file is not available so it's the background
return result.getVisibleDataOverlays();
@@ -137,7 +134,6 @@ describe('minerva global', function () {
assert.equal(visibleDataOverlays.length, 0);
assert.equal(ServerConnectorMock.getSessionData(project).getSelectedBackgroundOverlay(), layout.getId());
assert.equal(logger.getWarnings().length, 0);
- return customMap.destroy();
});
});
@@ -514,7 +510,7 @@ describe('minerva global', function () {
}).then(function (result) {
assert.ok(result);
assert.equal(logger.getWarnings().length, 0);
- return result.destroy();
+ result.destroy();
});
});
it("getAllBioEntities", function () {
--
GitLab