Skip to content

Commit

Permalink
Merge branch 'release/0.4.3'
Browse files Browse the repository at this point in the history
  • Loading branch information
nwtgck committed Nov 27, 2019
2 parents d9c7973 + dbee24a commit af6406b
Show file tree
Hide file tree
Showing 4 changed files with 25 additions and 17 deletions.
8 changes: 7 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,11 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)

## [Unreleased]

## [0.4.3] - 2019-11-27
### Changed
- Update dependencies
- Add random secret path without extension for file and zip inputs

## [0.4.2] - 2019-11-24
### Changed
- Update dependencies
Expand Down Expand Up @@ -74,7 +79,8 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
### Added
- First release

[Unreleased]: https://github.com/nwtgck/piping-ui-web/compare/v0.4.2...HEAD
[Unreleased]: https://github.com/nwtgck/piping-ui-web/compare/v0.4.3...HEAD
[0.4.3]: https://github.com/nwtgck/piping-ui-web/compare/v0.4.2...v0.4.3
[0.4.2]: https://github.com/nwtgck/piping-ui-web/compare/v0.4.1...v0.4.2
[0.4.1]: https://github.com/nwtgck/piping-ui-web/compare/v0.4.0...v0.4.1
[0.4.0]: https://github.com/nwtgck/piping-ui-web/compare/v0.3.1...v0.4.0
Expand Down
20 changes: 10 additions & 10 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 4 additions & 4 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "piping-ui",
"version": "0.4.2",
"version": "0.4.3",
"private": true,
"author": "Ryo Ota <[email protected]> (https://github.com/nwtgck)",
"scripts": {
Expand All @@ -19,7 +19,7 @@
"@fortawesome/vue-fontawesome": "^0.1.8",
"binconv": "github:nwtgck/binconv-npm#v0.1.0",
"clipboard": "^2.0.4",
"core-js": "^3.4.2",
"core-js": "^3.4.3",
"file-saver": "^2.0.2",
"file-type": "^12.4.0",
"filepond": "^4.7.4",
Expand All @@ -36,7 +36,7 @@
"vue-class-component": "^7.1.0",
"vue-filepond": "^5.1.3",
"vue-property-decorator": "^8.3.0",
"vuetify": "^2.1.11"
"vuetify": "^2.1.12"
},
"devDependencies": {
"@babel/plugin-proposal-nullish-coalescing-operator": "^7.7.4",
Expand Down Expand Up @@ -70,7 +70,7 @@
"typescript": "^3.7.2",
"vue-cli-plugin-vuetify": "^2.0.2",
"vue-template-compiler": "^2.6.10",
"vuetify-loader": "^1.4.1",
"vuetify-loader": "^1.4.2",
"watch-build-serve": "github:nwtgck/watch-build-serve-node#afc757410b3339e1603916ab98b8e5760569dbaa"
},
"license": "MIT",
Expand Down
6 changes: 4 additions & 2 deletions src/components/PipingUI.vue
Original file line number Diff line number Diff line change
Expand Up @@ -390,15 +390,17 @@ export default class PipingUI extends Vue {
const {ext} = baseAndExt(fileName);
return [
fileName,
...this.randomStrs.map(s => `${s}${ext}`)
...this.randomStrs.map(s => `${s}${ext}`),
...this.randomStrs,
];
} else if(this.files.length > 1) {
if(this.secretPath.endsWith('.zip')) {
return [];
} else {
return [
...(this.secretPath === '' ? [] : [`${this.secretPath}.zip`]),
...this.randomStrs.map(s => `${s}.zip`)
...this.randomStrs.map(s => `${s}.zip`),
...this.randomStrs,
];
}
} else {
Expand Down

0 comments on commit af6406b

Please sign in to comment.