From: tcofoegbu <tcnofoegbu@dundee.ac.uk>
Date: Fri, 24 Jul 2015 12:57:06 +0000 (+0100)
Subject: JAL-857 modified javascipt to read browser url on page load and redirect accordingly
X-Git-Tag: Release_2_10_0~479^2~3
X-Git-Url: http://source.jalview.org/gitweb/?p=jalview.git;a=commitdiff_plain;h=3c0a8e0b1119904c40b913124146a16583541e77

JAL-857 modified javascipt to read browser url on page load and redirect accordingly
---

diff --git a/examples/javascript/jvcontroller.js b/examples/javascript/jvcontroller.js
index ca4678a..828179d 100644
--- a/examples/javascript/jvcontroller.js
+++ b/examples/javascript/jvcontroller.js
@@ -24,7 +24,7 @@
     var unsignedJars = "u_jalviewApplet.jar,u_JmolApplet-12.2.4.jar,u_java-json.jar,u_json_simple-1.1.jar";
     setOrUpdateCookie('jv_applet_mode', 'false', '1');
     //var isSignedAppletMode = readCookie("jv_applet_mode");
-    var appletJars = (isSignedAppletMode === 'true') ? signedJars : unsignedJars;
+    //var appletJars = (isSignedAppletMode === 'true') ? signedJars : unsignedJars;
     //alert(unsigned);
 
 
@@ -70,10 +70,15 @@
         document.cookie = name + "=" + value + expires + "; path=/";
     }
 
-   $(function(){
-       //alert("cur page : " + currentPage); 
+   $(function(){        
+        var url = window.location.href;
+	var end = url.length;
+	var start = url.lastIndexOf("#");
+	var newPage = url.substring(start + 1, end);
+	var page = ((start === -1) ? currentPage : newPage);
+	alert("page:" + page); 
        $('#header').load("includes/header_jv.html");
-       $('#content').load(currentPage+".html");
+       $('#content').load(page+".html");
        $('#nav').load("includes/nav_jv.html");
        $('#footer').load("includes/footer_jv.html"); 
        $('#'+ currentPage).addClass('active-trail active');