From 554df834587f4b0a11f72156902aba2bc881261b Mon Sep 17 00:00:00 2001
From: Piotr Gawron <piotr.gawron@uni.lu>
Date: Fri, 20 Apr 2018 12:32:02 +0200
Subject: [PATCH] molstar released as npm package
---
frontend-js/package-lock.json | 74 ++++++++++---------
frontend-js/package.json | 2 +-
.../src/main/js/map/structure/MolStar.js | 2 +-
3 files changed, 40 insertions(+), 38 deletions(-)
diff --git a/frontend-js/package-lock.json b/frontend-js/package-lock.json
index 0dd0f1e74a..a97b88ebea 100644
--- a/frontend-js/package-lock.json
+++ b/frontend-js/package-lock.json
@@ -35,48 +35,22 @@
"through": "2.3.8"
}
},
- "MolStar": {
- "version": "git://github.com/davidhoksza/MolStar.git#702c7417cd3dffdb45554b54ce49e27bc881b109",
+ "ProtVista": {
+ "version": "git://github.com/davidhoksza/protvista.git#4e4bb737ba1e183291505bd25f8bae2e651ce21e",
"dev": true,
"requires": {
- "ProtVista": "git://github.com/davidhoksza/protvista.git#4e4bb737ba1e183291505bd25f8bae2e651ce21e",
- "downloadjs": "1.4.7",
- "jquery": "3.3.1",
- "litemol": "github:dsehnal/LiteMol#67556b0de0d2428f9494136758cbf8a662f66412"
+ "d3": "3.5.17",
+ "file-saver": "1.3.3",
+ "jquery": "2.2.4",
+ "jszip": "3.1.4",
+ "underscore": "1.8.3"
},
"dependencies": {
- "ProtVista": {
- "version": "git://github.com/davidhoksza/protvista.git#4e4bb737ba1e183291505bd25f8bae2e651ce21e",
- "dev": true,
- "requires": {
- "d3": "3.5.17",
- "file-saver": "1.3.3",
- "jquery": "2.2.4",
- "jszip": "3.1.4",
- "underscore": "1.8.3"
- },
- "dependencies": {
- "jquery": {
- "version": "2.2.4",
- "resolved": "https://registry.npmjs.org/jquery/-/jquery-2.2.4.tgz",
- "integrity": "sha1-LInWiJterFIqfuoywUUhVZxsvwI=",
- "dev": true
- }
- }
- },
"jquery": {
- "version": "3.3.1",
- "resolved": "https://registry.npmjs.org/jquery/-/jquery-3.3.1.tgz",
- "integrity": "sha512-Ubldcmxp5np52/ENotGxlLe6aGMvmF4R8S6tZjsP6Knsaxd/xp3Zrh50cG93lR6nPXyUFwzN3ZSOQI0wRJNdGg==",
+ "version": "2.2.4",
+ "resolved": "https://registry.npmjs.org/jquery/-/jquery-2.2.4.tgz",
+ "integrity": "sha1-LInWiJterFIqfuoywUUhVZxsvwI=",
"dev": true
- },
- "litemol": {
- "version": "github:dsehnal/LiteMol#67556b0de0d2428f9494136758cbf8a662f66412",
- "dev": true,
- "requires": {
- "@types/react": "15.6.15",
- "@types/react-dom": "15.5.7"
- }
}
}
},
@@ -2058,6 +2032,14 @@
"immediate": "3.0.6"
}
},
+ "litemol": {
+ "version": "github:dsehnal/LiteMol#67556b0de0d2428f9494136758cbf8a662f66412",
+ "dev": true,
+ "requires": {
+ "@types/react": "15.6.15",
+ "@types/react-dom": "15.5.7"
+ }
+ },
"lodash": {
"version": "4.17.4",
"resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.4.tgz",
@@ -2383,6 +2365,26 @@
}
}
},
+ "molstar": {
+ "version": "1.0.0",
+ "resolved": "https://registry.npmjs.org/molstar/-/molstar-1.0.0.tgz",
+ "integrity": "sha1-2e0KopdXq1iOLnbtYUOHiZVi8rA=",
+ "dev": true,
+ "requires": {
+ "ProtVista": "git://github.com/davidhoksza/protvista.git#4e4bb737ba1e183291505bd25f8bae2e651ce21e",
+ "downloadjs": "1.4.7",
+ "jquery": "3.3.1",
+ "litemol": "github:dsehnal/LiteMol#67556b0de0d2428f9494136758cbf8a662f66412"
+ },
+ "dependencies": {
+ "jquery": {
+ "version": "3.3.1",
+ "resolved": "https://registry.npmjs.org/jquery/-/jquery-3.3.1.tgz",
+ "integrity": "sha512-Ubldcmxp5np52/ENotGxlLe6aGMvmF4R8S6tZjsP6Knsaxd/xp3Zrh50cG93lR6nPXyUFwzN3ZSOQI0wRJNdGg==",
+ "dev": true
+ }
+ }
+ },
"ms": {
"version": "2.0.0",
"resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
diff --git a/frontend-js/package.json b/frontend-js/package.json
index a6345728a8..46a8504fbf 100644
--- a/frontend-js/package.json
+++ b/frontend-js/package.json
@@ -17,7 +17,7 @@
},
"author": "Piotr Gawron",
"devDependencies": {
- "MolStar": "git://github.com/davidhoksza/MolStar.git",
+ "molstar": "1.0.0",
"assert": "1.4.1",
"bluebird": "^3.4.6",
"bootstrap": "^3.3.7",
diff --git a/frontend-js/src/main/js/map/structure/MolStar.js b/frontend-js/src/main/js/map/structure/MolStar.js
index 98e3a0f261..e94605f89c 100644
--- a/frontend-js/src/main/js/map/structure/MolStar.js
+++ b/frontend-js/src/main/js/map/structure/MolStar.js
@@ -81,7 +81,7 @@ MolStar.prototype._activate = function (uniprotId) {
});
container.appendChild(molStarCloseButton);
- var MolStarPlugin = require('MolStar');
+ var MolStarPlugin = require('molstar');
this.molStar = new MolStarPlugin({
uniprotId: uniprotId,
--
GitLab