Molecular Viewer: Attempt no. 2

BioAnalyticResource · Oct 11, 2016 · d410998 · d410998
1 parent ec950bd
commit d410998
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 12 deletions.
diff --git a/app/main.html b/app/main.html
@@ -580,7 +580,7 @@ <h3 class="subtitle animate"> Select one of the tool icons to adjust the view. <
 								<div id="JSmol_container" style="width:100%;height:100%;position:absolute;left:0;top:0;opacity:0.99;">
 								</div>
 								<div id="dalliance_container" style="width:100%;height:100%;position:absolute;left:0;top:0;opacity:0.99;visibility:hidden;"> 
-								</div>
+								</div> 
 								<canvas id="ZUI_canvas" width="900px" height="600px" style="position:absolute;left:0;top:0;outline:none;">
 									Canvas is not supported by your browser, please upgrade.
 								</canvas>
@@ -608,5 +608,5 @@ <h3 class="subtitle animate"> Select one of the tool icons to adjust the view. <
 			</div>
 		</div>
 	</div>
-	<div id='molHolder' style="position:relative;width:100%;height:100%"></div>
+	<!--<div id='molHolder' style="position:relative;width:100%;height:100%"></div>-->
 </div>
diff --git a/app/scripts/js/molViewer283.js b/app/scripts/js/molViewer283.js
@@ -53,13 +53,13 @@
 				//the name to use to create the jmol object
 				jMolObject : 'myJmol',
 				//
-				pfamUrlBar : '//bar.utoronto.ca/~gfucile/cdd3d/cgi-bin/PfamAnnot.cgi',
+				pfamUrlBar : Eplant.cdd3dUrl + 'PfamAnnot.cgi',
 				//
 				pfamUrlDev : 'ProxyServlet',
 				//
 				pfamParams : 'FASTAseq',
 				//
-				cddUrlBar : '//bar.utoronto.ca/~gfucile/cdd3d/cgi-bin/CDDannot.cgi',
+				cddUrlBar : Eplant.cdd3dUrl + 'CDDannot.cgi',
 				//
 				cddUrlDev : 'ProxyServlet',
 				//

diff --git a/app/scripts/src/Eplant.MolViewer.js b/app/scripts/src/Eplant.MolViewer.js
@@ -55,15 +55,15 @@
 				//the name to use to create the jmol object
 				jMolObject : 'myJmol',
 				//
-				pfamUrlBar : '//bar.utoronto.ca/~gfucile/cdd3d/cgi-bin/PfamAnnot.cgi',
+				pfamUrlBar : Eplant.cdd3dUrl + 'PfamAnnot.cgi',
 				//
-				pfamUrlDev : 'ProxyServlet',
+				//pfamUrlDev : 'ProxyServlet',
 				//
 				pfamParams : 'FASTAseq',
 				//
-				cddUrlBar : '//bar.utoronto.ca/~gfucile/cdd3d/cgi-bin/CDDannot.cgi',
+				cddUrlBar : Eplant.cdd3dUrl + 'CDDannot.cgi',
 				//
-				cddUrlDev : 'ProxyServlet',
+				//cddUrlDev : 'ProxyServlet',
 				//
 				cddParams : 'FASTAseq',
 				//Turn off DSSP; Set default Van der Waals to babel; Turn off space fill; 

diff --git a/app/scripts/src/Eplant.Views/MoleculeView/Eplant.Views.MoleculeView.Base.js b/app/scripts/src/Eplant.Views/MoleculeView/Eplant.Views.MoleculeView.Base.js
@@ -52,11 +52,11 @@
 				//
 				pfamUrlBar : Eplant.cdd3dUrl + 'PfamAnnot.cgi',
 				//
-				pfamUrlDev : 'ProxyServlet',
+				//pfamUrlDev : 'ProxyServlet',
 				//
 				cddUrlBar : Eplant.cdd3dUrl + 'CDDannot.cgi',
 				//
-				cddUrlDev : 'ProxyServlet',
+				//cddUrlDev : 'ProxyServlet',
 				/*
 					* background HOVER - background color for the hover label when letting mouse over atom
 					* color HOVER - text color for the hover label when letting mouse over atom
@@ -1312,7 +1312,7 @@
 		else if(window.location.hostname.indexOf('bar.utoronto.ca') > -1)//running at bar.utoronto.ca server
 		u = this.config.application.cddUrlBar;
 		else//dev environment
-		u = this.config.application.cddUrlDev;
+		u = this.config.application.cddUrlBar;	// Araport
 
 		this.viewer.Xhrs.getCDDXhr = $.ajax({
 			beforeSend: function(request) {
@@ -1465,7 +1465,7 @@
 		else if(window.location.hostname.indexOf('bar.utoronto.ca') > -1)//running at bar.utoronto.ca server
 		u = this.config.application.pfamUrlBar;
 		else//dev environment
-		u = this.config.application.pfamUrlDev;
+		u = this.config.application.pfamUrlBar; // Araport!
 
 		this.viewer.Xhrs.getPfamXhr = $.ajax({
 			beforeSend: function(request) {