Skip to content

Commit

Permalink
Merge branch 'release/0.2.1'
Browse files Browse the repository at this point in the history
  • Loading branch information
abought committed Mar 28, 2019
2 parents 0b768d1 + 1df5d14 commit dcdd483
Show file tree
Hide file tree
Showing 4 changed files with 28 additions and 6 deletions.
24 changes: 24 additions & 0 deletions deploy.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
#!/usr/bin/env sh

# Deploy script based on: https://cli.vuejs.org/guide/deployment.html

# abort on errors
set -e

# build
npx yarn run build

# navigate into the build output directory
cd dist

# if you are deploying to a custom domain
# echo 'www.example.com' > CNAME

git init
git add -A
git commit -m 'Deploy newest version'

# if you are deploying to https://<USERNAME>.github.io/<REPO>
git push -f https://github.com/abought/locuszoom-tabix.git master:gh-pages

cd -
5 changes: 2 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
{
"name": "locuszoom-tabix",
"version": "0.2.0",
"version": "0.2.1",
"private": true,
"main": "lib/LzTabix.umd.min.js",
"scripts": {
"serve": "vue-cli-service serve",
"build": "vue-cli-service build",
"build:library": "vue-cli-service build --target lib src/library.js --name LzTabix --dest lib",
"deploy": "gh-pages -n -d dist -r https://github.com/abought/locuszoom-tabix.git",
"deploy": "./deploy.sh",
"lint": "vue-cli-service lint",
"test:unit": "vue-cli-service test:unit"
},
Expand All @@ -30,7 +30,6 @@
"@vue/eslint-config-airbnb": "^3.0.1",
"@vue/test-utils": "^1.0.0-beta.20",
"chai": "^4.1.2",
"gh-pages": "^2.0.1",
"node-sass": "^4.9.0",
"sass-loader": "^7.0.1",
"vue-template-compiler": "^2.5.17",
Expand Down
1 change: 0 additions & 1 deletion src/components/GwasToolbar.vue
Original file line number Diff line number Diff line change
Expand Up @@ -122,7 +122,6 @@ export default {
@ready="selectRange"
@fail="showMessage" class="float-right"
:build="build"
:max_range="500000"
search_url="https://portaldev.sph.umich.edu/api_internal_dev/v1/annotation/omnisearch/" />
<bs-dropdown v-else text="Plot options" variant="info"
class="float-right">
Expand Down
4 changes: 2 additions & 2 deletions src/components/RegionPicker.vue
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ export default {
props: {
max_range: {
type: Number,
default: 500000,
default: 1000000,
},
search_url: {
type: String,
Expand Down Expand Up @@ -67,7 +67,7 @@ export default {
start = +start;
end = +end;
if ((end - start) > this.max_range) {
this.$emit('fail', `Maximum allowable range is ${this.max_range}`);
this.$emit('fail', `Maximum allowable range is ${this.max_range.toLocaleString()}`);
return;
}
} else if (single_match) {
Expand Down

0 comments on commit dcdd483

Please sign in to comment.