X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=examples%2Fjavascript%2Fjvcontroller.js;h=9b583060aeb245f9d9de940fe91655488db4018f;hb=17e77c3f2949a0729322b4a8d907f3f34b6a9914;hp=ca4678a9232be66eb62d5ab21ad2239e30283a85;hpb=1cb3861cfe07ba38ced9f998d3dc3c3337673a69;p=jalview.git

diff --git a/examples/javascript/jvcontroller.js b/examples/javascript/jvcontroller.js
index ca4678a..9b58306 100644
--- a/examples/javascript/jvcontroller.js
+++ b/examples/javascript/jvcontroller.js
@@ -1,6 +1,6 @@
 /**
- * Jalview - A Sequence Alignment Editor and Viewer ($$Version-Rel$$)
- * Copyright (C) $$Year-Rel$$ The Jalview Authors
+ * Jalview - A Sequence Alignment Editor and Viewer (Version 2.9)
+ * Copyright (C) 2015 The Jalview Authors
  * 
  * This file is part of Jalview.
  * 
@@ -18,15 +18,8 @@
  */
 
  
-    //var currentPage = (readCookie("current_page")) ? readCookie("current_page") : "applets";
+    
     var currentPage = "applets";
-    var signedJars = "jalviewApplet.jar,JmolApplet-12.2.4.jar,java-json.jar,json_simple-1.1.jar";
-    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;
-    //alert(unsigned);
-
 
     function createAppletTag(code, name, archive, width, height, params){
         var app = document.createElement('applet');
@@ -70,47 +63,50 @@
         document.cookie = name + "=" + value + expires + "; path=/";
     }
 
-   $(function(){
-       //alert("cur page : " + currentPage); 
-       $('#header').load("includes/header_jv.html");
-       $('#content').load(currentPage+".html");
-       $('#nav').load("includes/nav_jv.html");
-       $('#footer').load("includes/footer_jv.html"); 
-       $('#'+ currentPage).addClass('active-trail active');       
+   $(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); 
+       if(page === "embeddedWJmol"){
+         // do nothing embeddedWJmol page already include
+
+            $('#header').load("includes/header_jv.html");
+            //$('#content').load(page + ".html");
+            $('#nav').load("includes/nav_jv.html");
+            $('#footer').load("includes/footer_jv.html"); 
+            $('#'+ currentPage).addClass('active-trail active'); 
+        }else{
+            $('#header').load("includes/header_jv.html");
+            $('#content').load(page + ".html");
+            $('#nav').load("includes/nav_jv.html");
+            $('#footer').load("includes/footer_jv.html"); 
+            $('#'+ currentPage).addClass('active-trail active');  
+
+	    var e = document.getElementById("view_decorated");
+            e.style.display = 'none';
+	}     
    });
    
-  $(document).ready(function(){
-    //var currentPage = (readCookie("current_page")) ? readCookie("current_page") : "applets.html";
-    //updateLinks(currentPage);
-    var params = [["file","uniref50.fa"],
-		  ["treeFile","ferredoxin.nw"],
-      		  ["userDefinedColour","C=yellow; R,K,H=FF5555; D,E=5555F"],
-		  ["sortByTree","True"],
-		  ["showSequenceLogo","true"],
-		  ["showGroupConsensus","true"],
-		  ["showFullId","false"],
-		  ["linkLabel_1","Uniprot"],
-		  ["linkUrl_1","http://www.uniprot.org/uniprot/$SEQUENCE_ID$"],
-		  ["linkLabel_2","EMBL-EBI Search"],
-		  ["linkUrl_2","http://www.ebi.ac.uk/ebisearch/search.ebi?db=allebi&query=$SEQUENCE_ID$"],
-		  ["APPLICATION_URL","http://www.jalview.org/services/launchApp"]];
-    var app = createAppletTag('jalview.bin.JalviewLite','',appletJars,'140','35', params);
-    console.log('—————————> app ———————>  ' + app);
-    //var appDiv = document.getElementById("applet_div");
-    //var appDiv = document.getElementById("applet_div");
-    //appDiv.appendChild(app);
-    $("<div class='newbox'>I'm new box by appendTo</div>").appendTo('.applet_div');
-    //$(‘.applet_div').append(app);
-  });
 
 function doSubmit(target){
-   //setOrUpdateCookie('current_page', target, '1');
-   //alert('current page : ' + readCookie("current_page"));
    var currentPage = target+'.html';
-   $('#content').load(currentPage);
+   //alert("page:" + target); 
+   if(target == "embeddedWJmol"){
+      //loadJMolPage();
+      window.location.href = 'embeddedWJmol.html#' + target;
+      $('#content').load(currentPage);
+   }else{
+      window.location.href = 'index.html#' + target;
+      $('#content').load(currentPage);
+   }
    updateLinks(target);
 }
 
+
+
 function updateLinks(target) {
     var ul = document.getElementById("menu");
     var items = ul.getElementsByTagName("li");
@@ -134,3 +130,4 @@ function removeClass(ele,cls) {
     ele.className=ele.className.replace(reg,' ');
   }
 }
+