From: Ben Soares Date: Mon, 4 Dec 2023 20:32:04 +0000 (+0000) Subject: JAL-4059 rename files from jsmol j2s zip from jsmol to swingjs X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=8881839853584ea4181e4f1600d5cb7b4da89bec;p=jalview.git JAL-4059 rename files from jsmol j2s zip from jsmol to swingjs --- diff --git a/build.gradle b/build.gradle index 1475cdb..6137539 100644 --- a/build.gradle +++ b/build.gradle @@ -3427,6 +3427,19 @@ task jalviewjsTransferUnzipLib { from zipTree(file_zip) into "${jalviewDir}/${jalviewjsTransferSiteLibDir}" + // rename files in jsmol/j2s/... to swingjs/j2s/... + if (file_zip.getName().startsWith("Jmol-j2s-site")) { + eachFile { fcd -> + // jsmol/... -> swingjs/... + def relPathSegments = fcd.relativePath.getSegments() + if (relPathSegments[0] == "jsmol") { + def newRelPathSegments = relPathSegments + newRelPathSegments[0] = "swingjs" + fcd.relativePath = new RelativePath(true, newRelPathSegments) + } + } + } + // The following replace() is needed due to a mismatch in Jmol calls to // colorPtToFFRGB$javajs_util_T3d when only colorPtToFFRGB$javajs_util_T3 is defined // in the SwingJS.zip (github or the one distributed with JSmol) diff --git a/swingjs/SwingJS-site-3.1.1.zip b/swingjs/SwingJS-site-3.1.1.zip new file mode 100644 index 0000000..08b1c33 Binary files /dev/null and b/swingjs/SwingJS-site-3.1.1.zip differ diff --git a/swingjs/SwingJS-site-5.0.1.zip b/swingjs/SwingJS-site-5.0.1.zip new file mode 100644 index 0000000..b80c529 Binary files /dev/null and b/swingjs/SwingJS-site-5.0.1.zip differ diff --git a/swingjs/SwingJS-site.zip b/swingjs/SwingJS-site.zip deleted file mode 100644 index 08b1c33..0000000 Binary files a/swingjs/SwingJS-site.zip and /dev/null differ diff --git a/swingjs/SwingJS-site.zip b/swingjs/SwingJS-site.zip new file mode 120000 index 0000000..4748e7f --- /dev/null +++ b/swingjs/SwingJS-site.zip @@ -0,0 +1 @@ +SwingJS-site-5.0.1.zip \ No newline at end of file diff --git a/swingjs/j2s.core.jar b/swingjs/j2s.core.jar index e6f92de..e173208 100644 Binary files a/swingjs/j2s.core.jar and b/swingjs/j2s.core.jar differ diff --git a/swingjs/timestamp b/swingjs/timestamp index 4b48c4a..46d4974 100644 --- a/swingjs/timestamp +++ b/swingjs/timestamp @@ -1 +1 @@ -20231117083556 +20231128000108 diff --git a/swingjs/ver/5.0.1/timestamp b/swingjs/ver/5.0.1/timestamp index 4b48c4a..46d4974 100644 --- a/swingjs/ver/5.0.1/timestamp +++ b/swingjs/ver/5.0.1/timestamp @@ -1 +1 @@ -20231117083556 +20231128000108 diff --git a/utils/jalviewjs/libjs/Jmol-SwingJS-16.1.40.zip b/utils/jalviewjs/libjs/Jmol-SwingJS.zip similarity index 95% rename from utils/jalviewjs/libjs/Jmol-SwingJS-16.1.40.zip rename to utils/jalviewjs/libjs/Jmol-SwingJS.zip index ca35779..5aa9443 100644 Binary files a/utils/jalviewjs/libjs/Jmol-SwingJS-16.1.40.zip and b/utils/jalviewjs/libjs/Jmol-SwingJS.zip differ diff --git a/utils/jalviewjs/libjs/Jmol-j2s-site.zip b/utils/jalviewjs/libjs/Jmol-j2s-site.zip new file mode 100644 index 0000000..faff6c6 Binary files /dev/null and b/utils/jalviewjs/libjs/Jmol-j2s-site.zip differ diff --git a/utils/jalviewjs/site-resources/jalview_bin_JalviewJS-corenamespace.html b/utils/jalviewjs/site-resources/jalviewjs-core.html similarity index 75% rename from utils/jalviewjs/site-resources/jalview_bin_JalviewJS-corenamespace.html rename to utils/jalviewjs/site-resources/jalviewjs-core.html index c140192..b22caf1 100644 --- a/utils/jalviewjs/site-resources/jalview_bin_JalviewJS-corenamespace.html +++ b/utils/jalviewjs/site-resources/jalviewjs-core.html @@ -10,14 +10,16 @@ Info = { code: null, main: "jalview.bin.JalviewJS", core: "_jalview", - width: 850, - height: 550, + j2s_x: 100, + j2s_y: 100, + width: 200, + height: 100, readyFunction: null, serverURL: 'https://chemapps.stolaf.edu/jmol/jsmol/php/jsmol.php', j2sPath: 'swingjs/j2s', console:'sysoutdiv', allowjavascript: true, - // all j2s_... values can be accessed in Jalview.getInstance().getJSInfoValue(key) + // all j2s_... values can be accessed in JalviewJSUtil.getInstance().getJSInfoValue(key) j2s_namespace: "jv", j2s_overflow: true } @@ -31,41 +33,12 @@ Info = { transform: rotate(360deg); } } -@keyframes pulse { - 0% { - transform: scale(1); - } - 50% { - transform: scale(0.85); - } - 100% { - transform: scale(1); - } -} -.jv1_jalviewjsSplashRotate { - animation: rotation 3s infinite cubic-bezier(0.4, 0.6, 0.6, 0.4); -} -.jv1_jalviewjsSplashActive { - display: visible; - opacity: 100%; - z-index: 100; -} -.jv1_jalviewjsSplashInactive { - opacity: 0%; - transition: opacity 1s; - z-index: 100; -} -.jv1_jalviewjsSplashFinal { - display: none; -} - .jv_jalviewjsSplashRotate { - animation: pulse 1s cubic-bezier(0.4, 0.6, 0.6, 0.4); - animation-iteration-count: infinite; - animation-fill-mode: forwards; + animation: rotation 6s infinite cubic-bezier(0.4, 0.6, 0.6, 0.4); } .jv_jalviewjsSplashActive { - z-index: 100; + display: visible; + opacity: 100%; } .jv_jalviewjsSplashInactive { animation-iteration-count: 1; @@ -78,7 +51,6 @@ Info = { z-index: -1; opacity: 30%; } - @@ -88,7 +60,7 @@ getClassList = function(){J2S._saveFile('_j2sclasslist.txt', Clazz.ClassFilesLoa
-
+
diff --git a/utils/jalviewjs/site-resources/jalview_bin_Jalview-namespace.html b/utils/jalviewjs/site-resources/jalviewjs.html similarity index 85% rename from utils/jalviewjs/site-resources/jalview_bin_Jalview-namespace.html rename to utils/jalviewjs/site-resources/jalviewjs.html index 0114267..34b24c8 100644 --- a/utils/jalviewjs/site-resources/jalview_bin_Jalview-namespace.html +++ b/utils/jalviewjs/site-resources/jalviewjs.html @@ -8,16 +8,18 @@ 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.Jalview", + main: "jalview.bin.JalviewJS", core: "NONE", - width: 850, - height: 550, + j2s_x: 100, + j2s_y: 100, + width: 200, + height: 100, readyFunction: null, serverURL: 'https://chemapps.stolaf.edu/jmol/jsmol/php/jsmol.php', j2sPath: 'swingjs/j2s', console:'sysoutdiv', allowjavascript: true, - // all j2s_... values can be accessed in Jalview.getInstance().getJSInfoValue(key) + // all j2s_... values can be accessed in JalviewJSUtil.getInstance().getJSInfoValue(key) j2s_namespace: "jv", j2s_overflow: true } @@ -39,11 +41,15 @@ Info = { opacity: 100%; } .jv_jalviewjsSplashInactive { - opacity: 0%; - transition: opacity 1s; + animation-iteration-count: 1; + animation-fill-mode: forwards; + opacity: 30%; + transition: all 1s; + z-index: 100; } .jv_jalviewjsSplashFinal { - display: none; + z-index: -1; + opacity: 30%; }