Fixed bug where the block argument in the URL wasn't working properly in all cases

theme_tripal/node-chado_analysis.tpl.php

@@ -64,10 +64,12 @@ if (Drupal.jsEnabled) {
 
       // we want the base details to show up when the page is first shown 
       // unless the user specified a specific block
-      var block = window.location.href.match(/\?block=.*/);
+      var block = window.location.href.match(/[\?|\&]block=(.+?)\&/)
+      if(block == null){
+         block = window.location.href.match(/[\?|\&]block=(.+)/)
+      }
       if(block != null){
-         block_title = block.toString().replace(/\?block=/g,'');
-         $("#tripal_analysis-"+block_title+"-box").show();
+         $("#tripal_analysis-"+block[1]+"-box").show();
       } else {
          $("#tripal_analysis-base-box").show();
       }

theme_tripal/node-chado_feature.tpl.php

@@ -62,10 +62,12 @@ if (Drupal.jsEnabled) {
 
       // we want the base details to show up when the page is first shown 
       // unless the user specified a specific block
-      var block = window.location.href.match(/\?block=.*/);
+      var block = window.location.href.match(/[\?|\&]block=(.+?)\&/)
+      if(block == null){
+         block = window.location.href.match(/[\?|\&]block=(.+)/)
+      }
       if(block != null){
-         block_title = block.toString().replace(/\?block=/g,'');
-         $("#tripal_feature-"+block_title+"-box").show();
+         $("#tripal_feature-"+block[1]+"-box").show();
       } else {
          $("#tripal_feature-base-box").show();
       }

theme_tripal/node-chado_library.tpl.php

@@ -62,15 +62,17 @@ if (Drupal.jsEnabled) {
 
       // we want the base details to show up when the page is first shown 
       // unless the user specified a specific block
-      var block = window.location.href.match(/\?block=.*/);
+      var block = window.location.href.match(/[\?|\&]block=(.+?)\&/)
+      if(block == null){
+         block = window.location.href.match(/[\?|\&]block=(.+)/)
+      }
       if(block != null){
-         block_title = block.toString().replace(/\?block=/g,'');
-         $("#tripal_library-"+block_title+"-box").show();
+         $("#tripal_library-"+block[1]+"-box").show();
       } else {
          $("#tripal_library-base-box").show();
       }
 
-      $("#tripal_organism_toc").height($("#tripal_library-base-box").parent().height());
+      $("#tripal_library_toc").height($("#tripal_library-base-box").parent().height());
    });
 }
 </script>

theme_tripal/node-chado_organism.tpl.php

@@ -62,15 +62,13 @@ if (Drupal.jsEnabled) {
 
       // we want the base details to show up when the page is first shown 
       // unless we're using the feature browser then we want that page to show
-      var block = window.location.href.match(/\?block=.*/);
+      var block = window.location.href.match(/[\?|\&]block=(.+?)\&/)
+      if(block == null){
+         block = window.location.href.match(/[\?|\&]block=(.+)/)
+      }
       if(block != null){
-         block_title = block.toString().replace(/\?block=/g,'');
-         $("#tripal_orgnism-"+block_title+"-box").show();
-      } 
-      else if(window.location.href.match(/\?page=\d+/)){
-         $("#tripal_organism-feature_browser-box").show();
-      } 
-      else {
+         $("#tripal_organism-"+block[1]+"-box").show();
+      } else {
          $("#tripal_organism-base-box").show();
       }
       $("#tripal_organism_toc").height($("#tripal_organism-base-box").parent().height());

theme_tripal/node-chado_stock.tpl.php

@@ -62,10 +62,12 @@ drupal_add_css('./tripal-node-templates.css');
 
       // we want the base details to show up when the page is first shown 
       // unless the user specified a specific block
-      var block = window.location.href.match(/\?block=.*/);
+      var block = window.location.href.match(/[\?|\&]block=(.+?)\&/)
+      if(block == null){
+         block = window.location.href.match(/[\?|\&]block=(.+)/)
+      }
       if(block != null){
-         block_title = block.toString().replace(/\?block=/g,'');
-         $("#tripal_stock-"+block_title+"-box").show();
+         $("#tripal_stock-"+block[1]+"-box").show();
       } else {
          $("#tripal_stock-base-box").show();
       }

tripal_analysis_blast/theme/node-chado_analysis_blast.tpl.php

@@ -63,10 +63,12 @@ if (Drupal.jsEnabled) {
 
       // we want the base details to show up when the page is first shown 
       // unless the user specified a specific block
-      var block = window.location.href.match(/\?block=.*/);
+      var block = window.location.href.match(/[\?|\&]block=(.+?)\&/)
+      if(block == null){
+         block = window.location.href.match(/[\?|\&]block=(.+)/)
+      }
       if(block != null){
-         block_title = block.toString().replace(/\?block=/g,'');
-         $("#tripal_analysis_blast-"+block_title+"-box").show();
+         $("#tripal_analysis_blast-"+block[1]+"-box").show();
       } else {
          $("#tripal_analysis_blast-base-box").show();
       }

tripal_analysis_interpro/theme/node-chado_analysis_interpro.tpl.php

@@ -63,10 +63,12 @@ if (Drupal.jsEnabled) {
 
       // we want the base details to show up when the page is first shown 
       // unless the user specified a specific block
-      var block = window.location.href.match(/\?block=.*/);
+      var block = window.location.href.match(/[\?|\&]block=(.+?)\&/)
+      if(block == null){
+         block = window.location.href.match(/[\?|\&]block=(.+)/)
+      }
       if(block != null){
-         block_title = block.toString().replace(/\?block=/g,'');
-         $("#tripal_analysis_interpro-"+block_title+"-box").show();
+         $("#tripal_analysis_interpro-"+block[1]+"-box").show();
       } else {
          $("#tripal_analysis_interpro-base-box").show();
       }

tripal_analysis_kegg/theme/node-chado_analysis_kegg.tpl.php

@@ -62,10 +62,12 @@ if (Drupal.jsEnabled) {
 
       // we want the base details to show up when the page is first shown 
       // unless the user specified a specific block
-      var block = window.location.href.match(/\?block=.*/);
+      var block = window.location.href.match(/[\?|\&]block=(.+?)\&/)
+      if(block == null){
+         block = window.location.href.match(/[\?|\&]block=(.+)/)
+      }
       if(block != null){
-         block_title = block.toString().replace(/\?block=/g,'');
-         $("#tripal_analysis_kegg-"+block_title+"-box").show();
+         $("#tripal_analysis_kegg-"+block[1]+"-box").show();
       } else {
          $("#tripal_analysis_kegg-base-box").show();
       }

tripal_analysis_unigene/theme/node-chado_analysis_unigene.tpl.php

@@ -69,10 +69,12 @@ if (Drupal.jsEnabled) {
 
       // we want the base details to show up when the page is first shown 
       // unless the user specified a specific block
-      var block = window.location.href.match(/\?block=.*/);
+      var block = window.location.href.match(/[\?|\&]block=(.+?)\&/)
+      if(block == null){
+         block = window.location.href.match(/[\?|\&]block=(.+)/)
+      }
       if(block != null){
-         block_title = block.toString().replace(/\?block=/g,'');
-         $("#tripal_analysis_unigene-"+block_title+"-box").show();
+         $("#tripal_analysis_unigene-"+block[1]+"-box").show();
       } else {
          $("#tripal_analysis_unigene-base-box").show();
       }