Skip to content

Commit 0144e2d

Browse files
jiywang3jiywang3
committed
Pull request #624: Simplified code to make icn3dnode calls simpler.
Merge in STRUC/icn3d from release3292 to master * commit 'bd19df94385cfaf7d055af365c6797a24d576ef4': Simplified code to make icn3dnode calls simpler.
2 parents e87daa9 + bd19df9 commit 0144e2d

35 files changed

+1475
-927
lines changed

‎CHANGELOG.md‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
11
## Change Log
2+
[icn3d-3.29.2](https://www.ncbi.nlm.nih.gov/Structure/icn3d/icn3d-3.29.2.zip) was release on January 8, 2024. Simplified code to make icn3dnode calls simpler.
3+
24
[icn3d-3.29.1](https://www.ncbi.nlm.nih.gov/Structure/icn3d/icn3d-3.29.1.zip) was release on December 14, 2023. Allowed users to load a collection of structures via the menu "File > Open File > Collection File". The example collection file is at https://github.com/ncbi/icn3d/blob/master/example/collection.json.
35

46
[icn3d-3.29.0](https://www.ncbi.nlm.nih.gov/Structure/icn3d/icn3d-3.29.0.zip) was release on December 13, 2023. Added the feature to load electron density maps from ccp4 or MTZ files either locally or via URLs.

‎build/icn3d.js‎

Lines changed: 287 additions & 177 deletions
Large diffs are not rendered by default.

‎build/icn3d.min.js‎

Lines changed: 5 additions & 7 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎build/icn3d.module.js‎

Lines changed: 287 additions & 177 deletions
Large diffs are not rendered by default.

‎dist/CHANGELOG.md‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
11
## Change Log
2+
[icn3d-3.29.2](https://www.ncbi.nlm.nih.gov/Structure/icn3d/icn3d-3.29.2.zip) was release on January 8, 2024. Simplified code to make icn3dnode calls simpler.
3+
24
[icn3d-3.29.1](https://www.ncbi.nlm.nih.gov/Structure/icn3d/icn3d-3.29.1.zip) was release on December 14, 2023. Allowed users to load a collection of structures via the menu "File > Open File > Collection File". The example collection file is at https://github.com/ncbi/icn3d/blob/master/example/collection.json.
35

46
[icn3d-3.29.0](https://www.ncbi.nlm.nih.gov/Structure/icn3d/icn3d-3.29.0.zip) was release on December 13, 2023. Added the feature to load electron density maps from ccp4 or MTZ files either locally or via URLs.

‎dist/full.html‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,11 +19,11 @@
1919
<div id="div0"></div>
2020

2121
<link rel="stylesheet" href="lib/jquery-ui-1.13.2.min.css">
22-
<link rel="stylesheet" href="icn3d_3.29.1.css">
22+
<link rel="stylesheet" href="icn3d_3.29.2.css">
2323
<script src="lib/jquery-3.5.0.min.js"></script>
2424
<script src="lib/jquery-ui-1.13.2.min.js"></script>
2525
<script src="lib/three_0.151.0.min.js"></script>
26-
<script src="icn3d_3.29.1.min.js"></script>
26+
<script src="icn3d_3.29.2.min.js"></script>
2727

2828
<script type="text/javascript">
2929

@@ -41,7 +41,7 @@
4141
alert("IE does NOT work with the current iCn3D version 3. The old iCn3D version 2 is used instead.");
4242
}
4343
else {
44-
//$.getScript('icn3d_3.29.1.min.js', function() {
44+
//$.getScript('icn3d_3.29.2.min.js', function() {
4545
var version = 3;
4646
await launchIcn3d(version); //await
4747
//});

‎dist/full2.html‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,11 +20,11 @@
2020
<div id="div1" style="float:left;"></div>
2121

2222
<link rel="stylesheet" href="lib/jquery-ui-1.13.2.min.css">
23-
<link rel="stylesheet" href="icn3d_3.29.1.css">
23+
<link rel="stylesheet" href="icn3d_3.29.2.css">
2424
<script src="lib/jquery-3.5.0.min.js"></script>
2525
<script src="lib/jquery-ui-1.13.2.min.js"></script>
2626
<script src="lib/three_0.151.0.min.js"></script>
27-
<script src="icn3d_3.29.1.min.js"></script>
27+
<script src="icn3d_3.29.2.min.js"></script>
2828

2929
<script type="text/javascript">
3030
$( document ).ready(async function() {
@@ -41,7 +41,7 @@
4141
alert("IE does NOT work with the current iCn3D version 3. The old iCn3D version 2 is used instead.");
4242
}
4343
else {
44-
//$.getScript('icn3d_3.29.1.min.js', function() {
44+
//$.getScript('icn3d_3.29.2.min.js', function() {
4545
var version = 3;
4646
await launchIcn3d(version);
4747
//});

dist/full2_3.29.1.html renamed to dist/full2_3.29.2.html

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,11 +20,11 @@
2020
<div id="div1" style="float:left;"></div>
2121

2222
<link rel="stylesheet" href="lib/jquery-ui-1.13.2.min.css">
23-
<link rel="stylesheet" href="icn3d_3.29.1.css">
23+
<link rel="stylesheet" href="icn3d_3.29.2.css">
2424
<script src="lib/jquery-3.5.0.min.js"></script>
2525
<script src="lib/jquery-ui-1.13.2.min.js"></script>
2626
<script src="lib/three_0.151.0.min.js"></script>
27-
<script src="icn3d_3.29.1.min.js"></script>
27+
<script src="icn3d_3.29.2.min.js"></script>
2828

2929
<script type="text/javascript">
3030
$( document ).ready(async function() {
@@ -41,7 +41,7 @@
4141
alert("IE does NOT work with the current iCn3D version 3. The old iCn3D version 2 is used instead.");
4242
}
4343
else {
44-
//$.getScript('icn3d_3.29.1.min.js', function() {
44+
//$.getScript('icn3d_3.29.2.min.js', function() {
4545
var version = 3;
4646
await launchIcn3d(version);
4747
//});

dist/full_3.29.1.html renamed to dist/full_3.29.2.html

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,11 +19,11 @@
1919
<div id="div0"></div>
2020

2121
<link rel="stylesheet" href="lib/jquery-ui-1.13.2.min.css">
22-
<link rel="stylesheet" href="icn3d_3.29.1.css">
22+
<link rel="stylesheet" href="icn3d_3.29.2.css">
2323
<script src="lib/jquery-3.5.0.min.js"></script>
2424
<script src="lib/jquery-ui-1.13.2.min.js"></script>
2525
<script src="lib/three_0.151.0.min.js"></script>
26-
<script src="icn3d_3.29.1.min.js"></script>
26+
<script src="icn3d_3.29.2.min.js"></script>
2727

2828
<script type="text/javascript">
2929

@@ -41,7 +41,7 @@
4141
alert("IE does NOT work with the current iCn3D version 3. The old iCn3D version 2 is used instead.");
4242
}
4343
else {
44-
//$.getScript('icn3d_3.29.1.min.js', function() {
44+
//$.getScript('icn3d_3.29.2.min.js', function() {
4545
var version = 3;
4646
await launchIcn3d(version); //await
4747
//});

dist/icn3d-3.29.1.zip renamed to dist/icn3d-3.29.2.zip

4.32 MB
Binary file not shown.

0 commit comments

Comments
 (0)