Skip to content

Commit

Permalink
Merge branch 'release/0.1.1'
Browse files Browse the repository at this point in the history
  • Loading branch information
nwtgck committed Sep 23, 2019
2 parents a0c9dd0 + c1d2ae0 commit bc5ee95
Show file tree
Hide file tree
Showing 16 changed files with 23 additions and 9 deletions.
7 changes: 6 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,13 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)

## [Unreleased]

## [0.1.1] - 2019-09-23
### Fixed
- Apply latest server URL and secret path inputs

## 0.1.0 - 2019-09-23
### Added
- First release

[Unreleased]: https://github.com/nwtgck/piping-ui-web/compare/v0.1.0...HEAD
[Unreleased]: https://github.com/nwtgck/piping-ui-web/compare/v0.1.1...HEAD
[0.1.1]: https://github.com/nwtgck/piping-ui-web/compare/v0.1.0...v0.1.1
2 changes: 1 addition & 1 deletion package-lock.json

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

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "piping-ui",
"version": "0.1.0",
"version": "0.1.1",
"private": true,
"scripts": {
"generate-version": "cross-var echo \"export const VERSION = \\\"$npm_package_version\\\";\" > src/version.ts",
Expand Down
Binary file modified public/img/icons/android-chrome-192x192.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified public/img/icons/android-chrome-512x512.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified public/img/icons/apple-touch-icon-120x120.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified public/img/icons/apple-touch-icon-152x152.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified public/img/icons/apple-touch-icon-180x180.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified public/img/icons/apple-touch-icon-60x60.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified public/img/icons/apple-touch-icon-76x76.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified public/img/icons/apple-touch-icon.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified public/img/icons/favicon-16x16.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified public/img/icons/msapplication-icon-144x144.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified public/img/icons/mstile-150x150.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified src/assets/logo.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
21 changes: 15 additions & 6 deletions src/components/PipingUI.vue
Original file line number Diff line number Diff line change
Expand Up @@ -248,15 +248,15 @@ export default class PipingUI extends Vue {
return strings(globalStore.language);
}
// FIXME: Remove this
// FIXME: Should be removed
// This for lazy v-model of Combobox
private shouldBeRemoved = {
latestServerUrl: this.serverUrl,
latestSecretPath: this.secretPath,
};
// FIXME: Remove
// FIXME: Should be removed
// NOTE: This is for update by clicking listed auto-complete
@Watch('serverUrl')
private onServerUrl() {
Expand All @@ -270,7 +270,7 @@ export default class PipingUI extends Vue {
this.secretPath = '';
}
// FIXME: Remove
// FIXME: Should be removed
// NOTE: This is for update by clicking listed auto-complete
this.shouldBeRemoved.latestSecretPath = this.secretPath;
}
Expand Down Expand Up @@ -366,13 +366,18 @@ export default class PipingUI extends Vue {
}
}
private send() {
// FIXME: remove
// FIXME: Should be removed
private applyLatestServerUrlAndSecretPath() {
// FIXME: should be removed after fix
// NOTE: This set the latest secret path because v-model of Combobox is lazy
this.serverUrl = this.shouldBeRemoved.latestServerUrl;
// FIXME: remove
// FIXME: should be removed after fix
// NOTE: This set the latest secret path because v-model of Combobox is lazy
this.secretPath = this.shouldBeRemoved.latestSecretPath;
}
private send() {
this.applyLatestServerUrlAndSecretPath();
if (!this.isTextMode && this.files.length === 0) {
// Show error message
Expand Down Expand Up @@ -419,6 +424,8 @@ export default class PipingUI extends Vue {
// NOTE: Some file types are displayed inline
private async get() {
this.applyLatestServerUrlAndSecretPath();
// If secret path is empty
if (this.secretPath === '') {
// Show error message
Expand Down Expand Up @@ -447,6 +454,8 @@ export default class PipingUI extends Vue {
}
private view() {
this.applyLatestServerUrlAndSecretPath();
// If secret path is empty
if (this.secretPath === '') {
// Show error message
Expand Down

0 comments on commit bc5ee95

Please sign in to comment.