Skip to content

Commit 22d02bb

Browse files
authored
Merge pull request #33 from SpringRoll/feature/caption-studio-tests
Feature/caption studio tests
2 parents 4e3b89a + db9ce0f commit 22d02bb

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

43 files changed

+793
-81
lines changed

CHANGELOG.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,8 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
55
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
66

77
## [1.0.0] - UNRELEASED
8+
### Added
9+
- Unit tests added for caption studio components and classes
810
### Changed
911
- Caption Studio now reads audio files directly from project root, or user specified audio directory
1012
- Caption studio now allows for saving/opening caption JSON files directly from projects

jsconfig.json

Lines changed: 0 additions & 9 deletions
This file was deleted.

package-lock.json

Lines changed: 7 additions & 9 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
@@ -23,7 +23,7 @@
2323
"electron-store": "^6.0.0",
2424
"file-type": "^16.2.0",
2525
"lodash-es": "^4.17.15",
26-
"springroll": "^2.3.2",
26+
"springroll": "^2.4.0",
2727
"springroll-container": "^2.0.3",
2828
"v-jsoneditor": "^1.4.1",
2929
"vue": "^2.6.11",

src/main/studio/index.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import { join } from 'path';
22
import { ipcMain, dialog, BrowserWindow } from 'electron';
3-
import { EVENTS, DIALOGS } from '../../contents';
3+
import { EVENTS, DIALOGS } from '../../constants';
44
import { projectInfo, gamePreview, captionInfo } from './storage';
55

66
import ProjectTemplateCreator from './managers/ProjectTemplateCreator';

src/main/studio/managers/ProjectTemplateCreator.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import * as fs from 'fs';
2-
import { TEMPLATES } from '../../../contents';
2+
import { TEMPLATES } from '../../../constants';
33
import { join } from 'path';
44
import { app, net } from 'electron';
55
import DecompressZip from 'decompress-zip';

src/main/studio/menus/AppMenuTemplate.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import { app } from 'electron';
2-
import { EVENTS } from '../../../contents';
2+
import { EVENTS } from '../../../constants';
33

44
const isMac = process.platform === 'darwin';
55

src/renderer/class/Caption.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ export class Caption {
1919
* @param {*} name
2020
* @param {*} param1
2121
*/
22-
constructor(name, { content = '', end = 0, start = 0 } = {}) {
22+
constructor(name, { content = ' ', end = 0, start = 0 } = {}) {
2323
this.updateContent({ name, content, end, start });
2424
}
2525

src/renderer/class/CaptionManager.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,7 @@ class CaptionManager {
3838
* for that file, it creates a new Caption.
3939
*/
4040
fileChanged($event, $origin = '') {
41+
4142
if (!$event.file) {
4243
return;
4344
}

0 commit comments

Comments
 (0)