Skip to content

Commit

Permalink
wip, removing var declarations in Controller.js
Browse files Browse the repository at this point in the history
  • Loading branch information
colin-combe committed Jun 14, 2020
1 parent 270ef2f commit 4e8937e
Show file tree
Hide file tree
Showing 10 changed files with 959 additions and 417 deletions.
2 changes: 2 additions & 0 deletions .babelrc
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,8 @@
[
"@babel/preset-env",
{
"useBuiltIns": "entry",
"corejs": "3.0.0",
"modules": false
}
]
Expand Down
3 changes: 2 additions & 1 deletion .eslintrc.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,8 @@
"rules": {},
"env": {
"es6": true,
"browser": true
"browser": true,
"node" : true
},
"parserOptions": {
"ecmaVersion": 2018,
Expand Down
2 changes: 0 additions & 2 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,6 @@ package-lock.json

.cache/
coverage/
dist/*
!dist/index.html
node_modules/
*.log

Expand Down
24 changes: 15 additions & 9 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -17,16 +17,22 @@ JAMI is capable of converting between various MI data formats, it can convert th

JAMI was originally developed by Marine Dumousseau, who also largely determined the structure of the MI-JSON format the viewer reads.

## Build Process
## Building on localhost

(0. install nodejs, npm)
1. Clone the repository.
2. $ cd /interaction-viewer
3. $ npm install
4. $ npm start
First install dependencies:

This starts a grunt task to watch the /src folder for changes. When a file changes (is saved), grunt will browserify the folder and save the compiled version in /build.
```sh
npm install
```

To build the minified version in /build, run:
To create a production build:

1. $ grunt package
```sh
npm run build-prod
```

To create a development build:

```sh
npm run build-dev
```
2 changes: 1 addition & 1 deletion demo/data/miJson/CPX-1920.json
Original file line number Diff line number Diff line change
Expand Up @@ -1365,4 +1365,4 @@
]
}
]
}
}
613 changes: 613 additions & 0 deletions dist/complexviewer.js

Large diffs are not rendered by default.

3 changes: 1 addition & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -50,11 +50,10 @@
},
"dependencies": {
"colorbrewer": "^1.3.0",
"core-js": "^3.6.5",
"d3": "~3.5.5",
"intersectionjs": "^1.0.1",
"point2d": "^0.0.1",
"rgbcolor": "^1.0.0",
"spin.js": "^4.1.0",
"webcola": "^3.4.0"
},
"keywords": [
Expand Down
2 changes: 1 addition & 1 deletion src/controller/Config.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
var Config = {
const Config = {

svgns: "http://www.w3.org/2000/svg", // namespace for svg elements
xlinkNS: "http://www.w3.org/1999/xlink", // namespace for xlink, for use/defs elements
Expand Down
Loading

0 comments on commit 4e8937e

Please sign in to comment.