Skip to content

Commit

Permalink
Merge branch 'release/0.1.5'
Browse files Browse the repository at this point in the history
  • Loading branch information
nwtgck committed Oct 14, 2019
2 parents 6b56092 + 6747648 commit 1bca0ee
Show file tree
Hide file tree
Showing 5 changed files with 32 additions and 19 deletions.
12 changes: 11 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,15 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)

## [Unreleased]

## [0.1.5] - 2019-10-14
### Changed
- Update dependencies

### Fixed
- Set dark theme in initial page
- Wait to show text viewer until sanitized text is ready
- Not auto-refresh in first visiting

## [0.1.4] - 2019-10-10
### Changed
- Detect MIME type from binary data by magic number
Expand All @@ -29,7 +38,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.1.4...HEAD
[Unreleased]: https://github.com/nwtgck/piping-ui-web/compare/v0.1.5...HEAD
[0.1.5]: https://github.com/nwtgck/piping-ui-web/compare/v0.1.4...v0.1.5
[0.1.4]: https://github.com/nwtgck/piping-ui-web/compare/v0.1.3...v0.1.4
[0.1.3]: https://github.com/nwtgck/piping-ui-web/compare/v0.1.2...v0.1.3
[0.1.2]: https://github.com/nwtgck/piping-ui-web/compare/v0.1.1...v0.1.2
Expand Down
14 changes: 7 additions & 7 deletions package-lock.json

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

6 changes: 3 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "piping-ui",
"version": "0.1.4",
"version": "0.1.5",
"private": true,
"scripts": {
"generate-version": "cross-var echo \"export const VERSION = \\\"$npm_package_version\\\";\" > src/version.ts",
Expand All @@ -23,7 +23,7 @@
"@fortawesome/vue-fontawesome": "^0.1.7",
"binconv": "github:nwtgck/binconv-npm#v0.1.0",
"clipboard": "^2.0.4",
"core-js": "^2.6.5",
"core-js": "^2.6.10",
"file-saver": "^2.0.2",
"file-type": "^12.3.0",
"filepond": "^4.7.2",
Expand All @@ -38,7 +38,7 @@
"vue-class-component": "^7.0.2",
"vue-filepond": "^5.1.3",
"vue-property-decorator": "^8.1.0",
"vuetify": "^2.1.2"
"vuetify": "^2.1.3"
},
"devDependencies": {
"@mdi/js": "^4.5.95",
Expand Down
17 changes: 10 additions & 7 deletions src/App.vue
Original file line number Diff line number Diff line change
Expand Up @@ -90,14 +90,9 @@ export default class App extends Vue {
document.addEventListener(
'swUpdated', this.showRefreshUI, { once: true }
);
navigator.serviceWorker.addEventListener(
'controllerchange', () => {
if (this.pwa.refreshing) return;
this.pwa.refreshing = true;
window.location.reload();
}
);
}
beforeMount() {
// Dark theme setting
this.$vuetify.theme.dark = enableDarkTheme();
}
Expand All @@ -115,6 +110,14 @@ export default class App extends Vue {
return;
}
this.pwa.registration.waiting.postMessage('skipWaiting');
navigator.serviceWorker.addEventListener(
'controllerchange', () => {
if (this.pwa.refreshing) return;
this.pwa.refreshing = true;
window.location.reload();
},
{once: true}
);
}
async mounted () {
Expand Down
2 changes: 1 addition & 1 deletion src/components/DataViewer.vue
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@

<!-- Text viewer -->
<!-- NOTE: Don't use v-if because the inner uses "ref" and the ref is loaded in mounted()-->
<div v-show="text !== ''" style="text-align: center">
<div v-show="linkifiedText !== ''" style="text-align: center">
<div style="text-align: right">
<v-tooltip v-model="showsCopied" bottom>
<template v-slot:activator="{ on }">
Expand Down

0 comments on commit 1bca0ee

Please sign in to comment.