#210 Ensembl fix; adds embedding test
authorhansonr <hansonr@STO24954W.ad.stolaf.edu>
Sun, 31 Mar 2019 12:18:31 +0000 (07:18 -0500)
committerhansonr <hansonr@STO24954W.ad.stolaf.edu>
Sun, 31 Mar 2019 12:18:31 +0000 (07:18 -0500)
was incorrect catch parameter in close() of swingjs/json/JSON.js

site-resources/jalview_bin_JalviewJS_embedded.html [new file with mode: 0644]
swingjs/SwingJS-site.zip
swingjs/net.sf.j2s.core.jar
swingjs/timestamp
swingjs/ver/3.2.4/SwingJS-site.zip
swingjs/ver/3.2.4/net.sf.j2s.core.jar
swingjs/ver/3.2.4/timestamp

diff --git a/site-resources/jalview_bin_JalviewJS_embedded.html b/site-resources/jalview_bin_JalviewJS_embedded.html
new file mode 100644 (file)
index 0000000..6650720
--- /dev/null
@@ -0,0 +1,45 @@
+<!DOCTYPE html>
+<html>
+<head>
+<title>SwingJS test JalviewJS2</title><meta charset="utf-8" />
+<script src="swingjs/swingjs2.js"></script>
+<script>
+if (!self.SwingJS)alert('swingjs2.js was not found. It needs to be in swingjs folder in the same directory as ' + document.location.href)
+Info = {
+  code: null,
+  main: "jalview.bin.JalviewJS2",
+  core: "NONE",
+  readyFunction: null,
+       serverURL: 'https://chemapps.stolaf.edu/jmol/jsmol/php/jsmol2.php',
+       j2sPath: 'swingjs/j2s',
+       console:'sysoutdiv',
+       allowjavascript: true,
+       
+       //JalviewJS-specific:
+       jalview_SCREEN_WIDTH: 300, // desktop width
+       jalview_SCREEN_HEIGHT: 1,  // desktop height -- 0 to hide
+       jalview_SCREEN_X: 10,
+       jalview_SCREEN_Y: 10,
+       jalview_EMBEDDED: true
+       
+}
+</script>
+</head>
+<body>
+<div id="align-frame-div" style="position:absolute;left:100px;top:100px;width:600px;height:400px;">
+The alignment frame will appear here momentarily...
+</div>
+
+
+<script>
+SwingJS.getApplet('testApplet', Info)
+getClassList = function(){J2S._saveFile('_j2sclasslist.txt', Clazz.ClassFilesLoaded.sort().join('\n'))}
+</script>
+
+
+<div style="position:absolute;left:900px;top:30px;width:600px;height:300px;">
+<div id="sysoutdiv" style="border:1px solid green;width:100%;height:95%;overflow:auto"></div>
+This is System.out. <a href="javascript:testApplet._clearConsole()">clear it</a> <br>Add ?j2snocore to URL to see full class list; ?j2sdebug to use uncompressed j2s/core files <br><a href="javascript:getClassList()">get _j2sClassList.txt</a>
+</div>
+</body>
+</html>
index cfb21dc..ac7e135 100644 (file)
Binary files a/swingjs/SwingJS-site.zip and b/swingjs/SwingJS-site.zip differ
index 575d81d..5bb94fa 100644 (file)
Binary files a/swingjs/net.sf.j2s.core.jar and b/swingjs/net.sf.j2s.core.jar differ
index 57b360d..f8d7b74 100644 (file)
@@ -1 +1 @@
-20190205030857 
+20190331071416 
index cfb21dc..ac7e135 100644 (file)
Binary files a/swingjs/ver/3.2.4/SwingJS-site.zip and b/swingjs/ver/3.2.4/SwingJS-site.zip differ
index 575d81d..5bb94fa 100644 (file)
Binary files a/swingjs/ver/3.2.4/net.sf.j2s.core.jar and b/swingjs/ver/3.2.4/net.sf.j2s.core.jar differ
index 57b360d..f8d7b74 100644 (file)
@@ -1 +1 @@
-20190205030857 
+20190331071416