The page loads now.

BioAnalyticResource · Oct 4, 2016 · a00aa60 · a00aa60
1 parent abe8047
commit a00aa60
Show file tree

Hide file tree

Showing 6 changed files with 27 additions and 20 deletions.
diff --git a/app/data/heatMap/viewsMap.json b/app/data/heatMap/viewsMap.json
@@ -1,62 +1,62 @@
 [  
    {  
       "name":"Plant",
-      "xmlurl":"data/plant/"
+      "xmlurl":"app/data/plant/"
    },
    {  
       "name":"Abiotic Stress",
-      "xmlurl":"data/experiment/efps/AbioticStress/"
+      "xmlurl":"app/data/experiment/efps/AbioticStress/"
    },
    {  
       "name":"Chemical",
-      "xmlurl":"data/experiment/efps/Chemical/"
+      "xmlurl":"app/data/experiment/efps/Chemical/"
    },
    {  
       "name":"Guard Cell Meristemoids",
-      "xmlurl":"data/experiment/efps/GuardCellMeristemoids/"
+      "xmlurl":"app/data/experiment/efps/GuardCellMeristemoids/"
    },
    {  
       "name":"Guard Cell Mutant And Wild Type Guard Cell ABA Response",
-      "xmlurl":"data/experiment/efps/GuardCellMutantAndWildTypeGuardCellABAResponse/"
+      "xmlurl":"app/data/experiment/efps/GuardCellMutantAndWildTypeGuardCellABAResponse/"
    },
    {  
       "name":"Guard Cell Suspension Cell ABA Response With ROS Scavenger",
-      "xmlurl":"data/experiment/efps/GuardCellSuspensionCellABAResponseWithROSScavenger/"
+      "xmlurl":"app/data/experiment/efps/GuardCellSuspensionCellABAResponseWithROSScavenger/"
    },
    {  
       "name":"Tissue Specific Guard And Mesophyll Cells",
-      "xmlurl":"data/experiment/efps/TissueSpecificGuardAndMesophyllCells/"
+      "xmlurl":"app/data/experiment/efps/TissueSpecificGuardAndMesophyllCells/"
    },
    {  
       "name":"Tissue Specific Pollen Germination",
-      "xmlurl":"data/experiment/efps/TissueSpecificPollenGermination/"
+      "xmlurl":"app/data/experiment/efps/TissueSpecificPollenGermination/"
    },
    {  
       "name":"Tissue Specific Root",
-      "xmlurl":"data/experiment/efps/TissueSpecificRoot/"
+      "xmlurl":"app/data/experiment/efps/TissueSpecificRoot/"
    },
    {  
       "name":"Tissue Specific Shoot Apical Meristem",
-      "xmlurl":"data/experiment/efps/TissueSpecificShootApicalMeristem/"
+      "xmlurl":"app/data/experiment/efps/TissueSpecificShootApicalMeristem/"
    },
    {  
       "name":"Tissue Specific Stem Epidermis",
-      "xmlurl":"data/experiment/efps/TissueSpecificStemEpidermis/"
+      "xmlurl":"app/data/experiment/efps/TissueSpecificStemEpidermis/"
    },
    {  
       "name":"Tissue Specific Stigma And Ovaries",
-      "xmlurl":"data/experiment/efps/TissueSpecificStigmaAndOvaries/"
+      "xmlurl":"app/data/experiment/efps/TissueSpecificStigmaAndOvaries/"
    },
    {  
       "name":"Tissue Specific Trichomes",
-      "xmlurl":"data/experiment/efps/TissueSpecificTrichomes/"
+      "xmlurl":"app/data/experiment/efps/TissueSpecificTrichomes/"
    },
    {  
       "name":"Tissue Specific Xylem And Cork",
-      "xmlurl":"data/experiment/efps/TissueSpecificXylemAndCork/"
+      "xmlurl":"app/data/experiment/efps/TissueSpecificXylemAndCork/"
    },
          {  
       "name":"Cell",
-      "xmlurl":"data/cell/"
+      "xmlurl":"app/data/cell/"
    }
-]
+]
diff --git a/app/data/molecule/AcidLetterMap.json b/app/data/molecule/AcidLetterMap.json
@@ -15,7 +15,6 @@
 	"K":"Lys",
 	"M":"Met",
 	"F":"Phe",
-	"F":"Phe",
 	"P":"Pro",
 	"S":"Ser",
 	"T":"Thr",

diff --git a/app/scripts/src/Eplant.Views/MoleculeView/Eplant.Views.MoleculeView3.js b/app/scripts/src/Eplant.Views/MoleculeView/Eplant.Views.MoleculeView3.js
@@ -148,8 +148,8 @@
 			Eplant.Views.MoleculeView.Params.htmlPage = data;
 		});
 
-		Eplant.Views.MoleculeView.Params.acidLetterMap = $.get(Eplant.Views.MoleculeView.Params.acidLetterMapUrl, function(data) {
-			Eplant.Views.MoleculeView.Params.acidLetterMap = JSON.parse( data );
+		Eplant.Views.MoleculeView.Params.acidLetterMap = $.getJSON(Eplant.Views.MoleculeView.Params.acidLetterMapUrl, function(data) {
+			Eplant.Views.MoleculeView.Params.acidLetterMap =  data;
 		});
 
 	};

diff --git a/app/scripts/src/Eplant.js b/app/scripts/src/Eplant.js
@@ -1813,6 +1813,11 @@
 
 						/* Add Species to ePlant */
 						Eplant.addSpecies(species);
+
+						/* Araport: Set Arabidopsis as active species */
+						if (n == 0) {
+							Eplant.setActiveSpecies(species);
+						}
 					}
 
 					/* Set Species load status */

diff --git a/araport-app.json b/araport-app.json
@@ -167,5 +167,8 @@
     "scripts/js/jquery.mCustomScrollbar.css",
     "styles/eplant.css"
   ],
+  "tags": [
+    "arabidopsis", "eplant", "BAR"
+  ],
   "fullscreen": "require"
 }
diff --git a/lib/test-runner.js b/lib/test-runner.js
@@ -93,6 +93,6 @@
   	  .fail(function( error ) {
   	    console.log( error );
   	  });
-  }, 5000);
+  }, 3000);
 
 })( window, jQuery, Agave );