Forráskód Böngészése

Updated packeges, fixed RCSB prop

David Sehnal 6 éve
szülő
commit
7987019598

A különbségek nem kerülnek megjelenítésre, a fájl túl nagy
+ 262 - 334
package-lock.json


+ 10 - 10
package.json

@@ -73,15 +73,15 @@
   "author": "",
   "author": "",
   "license": "MIT",
   "license": "MIT",
   "devDependencies": {
   "devDependencies": {
-    "@types/argparse": "^1.0.34",
+    "@types/argparse": "^1.0.35",
     "@types/benchmark": "^1.0.31",
     "@types/benchmark": "^1.0.31",
     "@types/compression": "0.0.36",
     "@types/compression": "0.0.36",
     "@types/express": "^4.16.0",
     "@types/express": "^4.16.0",
-    "@types/jest": "^23.3.2",
-    "@types/node": "^10.10.1",
+    "@types/jest": "^23.3.3",
+    "@types/node": "^10.11.4",
     "@types/node-fetch": "^2.1.2",
     "@types/node-fetch": "^2.1.2",
     "@types/react": "^16.4.14",
     "@types/react": "^16.4.14",
-    "@types/react-dom": "^16.0.7",
+    "@types/react-dom": "^16.0.8",
     "benchmark": "^2.1.4",
     "benchmark": "^2.1.4",
     "cpx": "^1.5.0",
     "cpx": "^1.5.0",
     "css-loader": "^1.0.0",
     "css-loader": "^1.0.0",
@@ -89,8 +89,8 @@
     "file-loader": "^2.0.0",
     "file-loader": "^2.0.0",
     "glslify-import": "^3.1.0",
     "glslify-import": "^3.1.0",
     "glslify-loader": "^1.0.2",
     "glslify-loader": "^1.0.2",
-    "graphql-code-generator": "^0.12.5",
-    "graphql-codegen-typescript-template": "^0.12.5",
+    "graphql-code-generator": "^0.12.6",
+    "graphql-codegen-typescript-template": "^0.12.6",
     "jest": "^23.6.0",
     "jest": "^23.6.0",
     "jest-raw-loader": "^1.0.1",
     "jest-raw-loader": "^1.0.1",
     "mini-css-extract-plugin": "^0.4.3",
     "mini-css-extract-plugin": "^0.4.3",
@@ -99,13 +99,13 @@
     "resolve-url-loader": "^3.0.0",
     "resolve-url-loader": "^3.0.0",
     "sass-loader": "^7.1.0",
     "sass-loader": "^7.1.0",
     "style-loader": "^0.23.0",
     "style-loader": "^0.23.0",
-    "ts-jest": "^23.10.0",
+    "ts-jest": "^23.10.3",
     "tslint": "^5.11.0",
     "tslint": "^5.11.0",
-    "typescript": "^3.0.3",
+    "typescript": "^3.1.1",
     "uglify-js": "^3.4.9",
     "uglify-js": "^3.4.9",
     "util.promisify": "^1.0.0",
     "util.promisify": "^1.0.0",
-    "webpack": "^4.19.1",
-    "webpack-cli": "^3.1.0"
+    "webpack": "^4.20.2",
+    "webpack-cli": "^3.1.2"
   },
   },
   "dependencies": {
   "dependencies": {
     "argparse": "^1.0.10",
     "argparse": "^1.0.10",

+ 1 - 1
src/mol-model/structure/model/properties/custom/indexed.ts

@@ -78,7 +78,7 @@ export namespace IndexedCustomProperty {
 
 
 function arrayToMap<Idx extends IndexedCustomProperty.Index, T>(array: ArrayLike<T>): Map<Idx, T> {
 function arrayToMap<Idx extends IndexedCustomProperty.Index, T>(array: ArrayLike<T>): Map<Idx, T> {
     const ret = new Map<Idx, T>();
     const ret = new Map<Idx, T>();
-    for (let i = 0 as Idx, _i = array.length; i < _i; i++) ret.set(i, array[i]);
+    for (let i = 0 as Idx, _i = array.length; i < _i; i++) ret.set(i, array[i as number]);
     return ret;
     return ret;
 }
 }
 
 

+ 3 - 3
src/mol-task/util/scheduler.ts

@@ -129,7 +129,7 @@ function createImmediateActions() {
     }
     }
 
 
     function installReadyStateChangeImplementation() {
     function installReadyStateChangeImplementation() {
-        const html = doc!.documentElement;
+        const html = doc!.documentElement!;
         registerImmediate = function(handle) {
         registerImmediate = function(handle) {
             // Create a <script> element; its readystatechange event will be fired asynchronously once it is inserted
             // Create a <script> element; its readystatechange event will be fired asynchronously once it is inserted
             // into the document. Do so, thus queuing up the task. Remember to clean up once it's been called.
             // into the document. Do so, thus queuing up the task. Remember to clean up once it's been called.
@@ -178,8 +178,8 @@ const immediateActions = (function () {
     if (typeof setImmediate !== 'undefined') {
     if (typeof setImmediate !== 'undefined') {
         if (typeof window !== 'undefined') {
         if (typeof window !== 'undefined') {
             return {
             return {
-                setImmediate: (handler: any, ...args: any[]) => window.setImmediate(handler, ...args as any),
-                clearImmediate: (handle: any) => window.clearImmediate(handle)
+                setImmediate: (handler: any, ...args: any[]) => (window as any).setImmediate(handler, ...args as any) as number,
+                clearImmediate: (handle: any) => (window as any).clearImmediate(handle)
             };
             };
         } else {
         } else {
             return { setImmediate, clearImmediate }
             return { setImmediate, clearImmediate }

+ 2 - 2
src/mol-util/input/input-observer.ts

@@ -189,7 +189,7 @@ namespace InputObserver {
         function attach () {
         function attach () {
             element.addEventListener( 'contextmenu', onContextMenu, false )
             element.addEventListener( 'contextmenu', onContextMenu, false )
 
 
-            element.addEventListener('wheel', onMouseWheel, false)
+            element.addEventListener('wheel', onMouseWheel as any, false)
             element.addEventListener('mousedown', onPointerDown as any, false)
             element.addEventListener('mousedown', onPointerDown as any, false)
             // for dragging to work outside canvas bounds,
             // for dragging to work outside canvas bounds,
             // mouse move/up events have to be added to a parent, i.e. window
             // mouse move/up events have to be added to a parent, i.e. window
@@ -214,7 +214,7 @@ namespace InputObserver {
 
 
             element.removeEventListener( 'contextmenu', onContextMenu, false )
             element.removeEventListener( 'contextmenu', onContextMenu, false )
 
 
-            element.removeEventListener('wheel', onMouseWheel, false)
+            element.removeEventListener('wheel', onMouseWheel as any, false)
             element.removeEventListener('mousedown', onMouseDown as any, false)
             element.removeEventListener('mousedown', onMouseDown as any, false)
             window.removeEventListener('mousemove', onMouseMove as any, false)
             window.removeEventListener('mousemove', onMouseMove as any, false)
             window.removeEventListener('mouseup', onMouseUp as any, false)
             window.removeEventListener('mouseup', onMouseUp as any, false)

+ 3 - 3
src/servers/model/properties/rcsb.ts

@@ -5,13 +5,13 @@
  * @author Alexander Rose <alexander.rose@weirdbyte.de>
  * @author Alexander Rose <alexander.rose@weirdbyte.de>
  */
  */
 
 
-import { Model } from 'mol-model/structure';
+import { AttachModelProperties } from '../property-provider';
 import { RCSB_assemblySymmetry } from './providers/rcsb';
 import { RCSB_assemblySymmetry } from './providers/rcsb';
 
 
-export function attachModelProperties(model: Model): Promise<any>[] {
+export const attachModelProperties: AttachModelProperties = (args) => {
     // return a list of promises that start attaching the props in parallel
     // return a list of promises that start attaching the props in parallel
     // (if there are downloads etc.)
     // (if there are downloads etc.)
     return [
     return [
-        RCSB_assemblySymmetry(model)
+        RCSB_assemblySymmetry(args)
     ];
     ];
 }
 }

Nem az összes módosított fájl került megjelenítésre, mert túl sok fájl változott