Updated Molecular View.

BioAnalyticResource · May 5, 2017 · 4503017 · 4503017
1 parent 8954d98
commit 4503017
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 7 deletions.
diff --git a/app/pages/molviewer.html b/app/pages/molviewer.html
@@ -171,11 +171,11 @@ <h4 class="features" style="white-space: normal;">Predicted Carbohydrate Binding
 			</div>
 		</div>
 	</div>
-	<div id="divBottomWrapper" class="noselect" style="overflow: hidden;position: absolute; bottom: 0px;width: 100%; z-index: 2;bottom: 0px">
+	<div id="divBottomWrapper" class="noselect" style="overflow: hidden;position: absolute; bottom: 0px;width: 100%; z-index: 2;bottom: 0px;pointer-events: none;">
 
 		<div style="position:relative">
 			<div id='divSeqContainer' class="" style="overflow-y: hidden; overflow-x: hidden;">
-				<div id="protSeq" style="display:inline-block;white-space: nowrap;margin-bottom: 20px;padding-top: 70px;height:20px;">
+				<div id="protSeq" style="display:inline-block;white-space: nowrap;margin-bottom: 20px;padding-top: 70px;height:20px;pointer-events: all;">
 				</div>
 			</div>
 
@@ -186,12 +186,12 @@ <h4 class="features" style="white-space: normal;">Predicted Carbohydrate Binding
 			<div class="fadeOnCornersSequence fadeOnCornersSequenceRight" id="fadeRight">
 			</div>
 		</div>
-		<div style="position:absolute;width: 100%;bottom: -15px">
+		<div style="pointer-events: all;position:absolute;width: 100%;bottom: -15px">
 			<div id="SeqSlider" class="overviewSlider" style="">
 			</div>
 		</div>
 		<div>
-			<div class="sequenceOverview" style="">
+			<div class="sequenceOverview" style="pointer-events: all;">
 				<div class="sequenceIndicator"></div>
 			</div>
 

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
@@ -156,7 +156,8 @@
 		//-------end
 
 		//try to get the agi (gene id) from its file name, will happen when running at eplant (bar.utoronto.ca)
-		var agi = load.substring( load.lastIndexOf('_')+1, load.lastIndexOf('.'));//format Phyre2_AT1G01200.1.pdb
+		//var agi = load.substring( load.lastIndexOf('_')+1, load.lastIndexOf('.'));//format Phyre2_AT1G01200.1.pdb
+		var agi = this.info.identifier;//format Phyre2_AT1G01200.1.pdb
 		if(agi)
 		this.mySequence.agi = agi;
 

diff --git a/app/scripts/src/Eplant.Views/MoleculeView/Eplant.Views.MoleculeView3.js b/app/scripts/src/Eplant.Views/MoleculeView/Eplant.Views.MoleculeView3.js
@@ -190,8 +190,9 @@
 						this.moleculeModelRawText = JSON.stringify(response);
 						var fileLink = "";
 						fileLink = response.link.match("Phyre2_AT.+pdb");
-						if (fileLink == "") {
-							fileLink = response.link.match("....\.pdb");
+						// Araport
+						if (fileLink == null ) {
+							fileLink = response.link.match("....\.pdb$");
 						}
 						$.ajax({
 							beforeSend: function(request) {