Skip to content

Commit b2eee58

Browse files
authored
Merge pull request #70 from SpringRoll/bugfix/caption-studio-file-changing
Caption Studio file selection fix
2 parents d1273b7 + 5103bac commit b2eee58

File tree

5 files changed

+13
-9
lines changed

5 files changed

+13
-9
lines changed

CHANGELOG.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
1515
- Fixed unit test errors
1616
- Created new testing process for CaptionStudio
1717

18+
### Fixed
19+
20+
- fixed bug when selecting a caption that caused the new audio file to not be selected and loaded into the wave form
21+
1822
## [1.1.0] - 2021-08-16
1923

2024
### Added
@@ -40,6 +44,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
4044
### Added
4145

4246
- This CHANGELOG
47+
4348
- VUE front end renderer
4449
- Electron back end
4550
- Project Templating via Github or bundled seed projects

package-lock.json

Lines changed: 4 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "springroll-studio",
3-
"version": "1.1.0",
3+
"version": "1.2.0",
44
"private": true,
55
"scripts": {
66
"test": "npm run lint && npm run unit:renderer && npm run unit:caption-studio",

src/main/index.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,10 @@ import { createProtocol } from 'vue-cli-plugin-electron-builder/lib';
55
import installExtension, { VUEJS_DEVTOOLS } from 'electron-devtools-installer';
66
import { studio } from './studio';
77
import { template, captionStudioTemplate } from './studio/menus/AppMenuTemplate';
8+
import Store from 'electron-store';
89

910
const isDevelopment = process.env.NODE_ENV !== 'production';
10-
11+
Store.initRenderer();
1112
// Keep a global reference of the window object, if you don't, the window will
1213
// be closed automatically when the JavaScript object is garbage collected.
1314
let win;

src/renderer/components/caption-studio/JsonPreview.vue

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -225,11 +225,7 @@ export default {
225225
const index = node.path[1];
226226
const indexDelta = index - this.currentIndex;
227227
228-
if (this.currentIndex === index) {
229-
return;
230-
}
231-
232-
if (this.activeFile === node.path[0]) {
228+
if (this.activeFile === node.path[0] && indexDelta !== 0) {
233229
EventBus.$emit('caption_move_index', indexDelta, this.origin);
234230
return;
235231
}

0 commit comments

Comments
 (0)