Bugfix prev commit.

Also Ant build script cleanup.
yeastrc · Jun 25, 2019 · a3983cb · a3983cb
1 parent 43a9d3a
commit a3983cb
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 8 deletions.
diff --git a/proxl_web_app/front_end/ant_buildFrontEnd_CopyToTomcat.xml b/proxl_web_app/front_end/ant_buildFrontEnd_CopyToTomcat.xml
@@ -5,7 +5,6 @@
 
 	<!--
 	<property environment="env" />
-	<property name="gradle.wrapper.executable" location="${env.GRADLE_HOME}/bin/gradle" />
 	
 	<echo>env:${env}</echo>
 	<echo>env.GRADLE_HOME:${env.GRADLE_HOME}</echo>
@@ -39,8 +38,6 @@
 	<!-- This does not fail if the file is not found -->
 	<property file="${config_file__Build_Front_End_with_path}" />
 
-	<echo>gradle.wrapper.executable: ${gradle.wrapper.executable}</echo>
-
 	<echo>tomcat.webapps.root: ${tomcat.webapps.root}</echo>
 	<echo>proxl.context: ${proxl.context}</echo>
 

diff --git a/...s/page_js/data_pages/project_search_ids_driven_pages/image_page/crosslink-image-viewer.js b/...s/page_js/data_pages/project_search_ids_driven_pages/image_page/crosslink-image-viewer.js
@@ -47,7 +47,7 @@ import { searchesChangeDisplayOrder } from 'page_js/data_pages/project_search_id
 import { searchesForPageChooser } from 'page_js/data_pages/project_search_ids_driven_pages/common/searchesForPageChooser.js';
 import { sharePageURLShortener  } from 'page_js/data_pages/project_search_ids_driven_pages/common/sharePageURLShortener.js';
 
-import { loadSnapSVG_CoreChart } from 'page_js/data_pages/data_pages_common/snapSVG_Library_Loader.js';
+import { loadSnapSVG_Library } from 'page_js/data_pages/data_pages_common/snapSVG_Library_Loader.js';
 
 
 import { defaultPageView } from 'page_js/data_pages/project_search_ids_driven_pages/common/defaultPageView.js';
@@ -6405,10 +6405,10 @@ window.imageViewerPageObject = {
 
 $(document).ready(function()  { 
 	try {
-		const loadSnapSVG_CoreChart_Response = loadSnapSVG_CoreChart();
-		const promise_loadSnapSVG_CoreChart = loadSnapSVG_CoreChart_Response.loadingPromise;
-		if ( promise_loadSnapSVG_CoreChart ) {
-			promise_loadSnapSVG_CoreChart.then( ( ) => {
+		const loadSnapSVG_Library_Response = loadSnapSVG_Library();
+		const promise_loadSnapSVG_Library = loadSnapSVG_Library_Response.loadingPromise;
+		if ( promise_loadSnapSVG_Library ) {
+			promise_loadSnapSVG_Library.then( ( ) => {
 				imagePagePrimaryRootCodeObject.call__initPage();
 			});
 		} else {