Browse Source

Automatically select GO/KEGG report on the organism page.

ccheng 14 years ago
parent
commit
30f3985e19

+ 5 - 2
theme_tripal/js/tripal_analysis_kegg.js

@@ -101,7 +101,7 @@ if (Drupal.jsEnabled) {
         ui      : {
            dots        : true,     // BOOL - dots or no dots
            rtl         : false,    // BOOL - is the tree right-to-left
-           animation   : 30,        // INT - duration of open/close animations in miliseconds
+           animation   : 0,        // INT - duration of open/close animations in miliseconds
            hover_mode  : true,     // SHOULD get_* functions chage focus or change hovered item
            scroll_spd  : 4,
            theme_path  : link,    // Path to themes
@@ -141,7 +141,10 @@ if (Drupal.jsEnabled) {
            beforedelete: function(NODE,TREE_OBJ) { return true }, 
 
            onJSONdata  : function(DATA,TREE_OBJ) { return DATA; },
-           onselect    : function(NODE,TREE_OBJ) { tripal_cv_cvterm_info( $(NODE).attr("id"),vars )},                  // node selected
+           onselect    : function(NODE,TREE_OBJ) {        	   
+               window.onerror = function(){return true;};
+        	   throw 'exit';
+        	},                  // node selected
            ondeselect  : function(NODE,TREE_OBJ) { },                  // node deselected
            onchange    : function(NODE,TREE_OBJ) { },                  // focus changed
            onrename    : function(NODE,LANG,TREE_OBJ,RB) { },              // node renamed ISNEW - TRUE|FALSE, current language

+ 14 - 0
theme_tripal/node-chado_organism.tpl.php

@@ -68,6 +68,20 @@ if (Drupal.jsEnabled) {
          $("#tripal_organism-base-box").show();
       }
       $("#tripal_organism_toc").height($("#tripal_organism-base-box").parent().height());
+
+      // we want to select the first GO/KEGG report by default
+		$('.form-select').each(function() {
+        var default_option = this.getElementsByTagName('option')[1];
+        if (default_option) {
+           this.selectedIndex =default_option.index ;
+           if (this.onchange.toString().match('tripal_analysis_go_org_charts')) {   
+              tripal_analysis_go_org_charts(default_option.value);
+           } else if (this.onchange.toString().match('tripal_analysis_kegg_org_report')) {            
+              tripal_analysis_kegg_org_report(default_option.value);
+           }
+        }
+		});
+      
    });
 }
 </script>

+ 0 - 18
theme_tripal/tripal_feature/tripal_feature_interpro_results.tpl.php

@@ -2,24 +2,6 @@
 $results = $variables['tripal_analysis_interpro']['results'];
 ?>
 
-<script type="text/javascript">
-if (Drupal.jsEnabled) {
-   $(document).ready(function() {
-      var selectbox = document.getElementById('edit-analysis-select');
-      if (selectbox) {
-        default_option = selectbox.getElementsByTagName('option')[1];
-        if (default_option) {
-           selectbox.selectedIndex =default_option.index ;
-           if (selectbox.onchange.toString().match('tripal_analysis_go_org_charts')) {   
-              tripal_analysis_go_org_charts(default_option.value);
-           } else if (selectbox.onchange.toString().match('tripal_analysis_kegg_org_report')) {            
-              tripal_analysis_kegg_org_report(default_option.value);
-           }
-        }
-      }
-   });
-}
-</script>
 <div id="tripal_feature-interpro_results-box" class="tripal_analysis_interpro-box tripal-info-box">
   <div class="tripal_feature-info-box-title tripal-info-box-title">InterPro Report</div>
   <div class="tripal_feature-info-box-desc tripal-info-box-desc"></div>