Skip to content

Commit 326bc97

Browse files
committed
releases: Hide flavor selection for VPX files.
1 parent d32a5e1 commit 326bc97

File tree

6 files changed

+17
-13
lines changed

6 files changed

+17
-13
lines changed

src/app/releases/admin/add/release.add-03-flavors.pug

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
+icon('info')
33
p A flavor defines attributes that are relevant to the table file, so users can find more easily what they're interested in. You can upload multiple flavors by adding several <code>.vpt</code> or <code>.vpx</code> files in step {{ step.files }}.
44
ul#flavors.list--files
5-
li.panel(ng-repeat="file in vm.meta.files | fileext:['vpt','vpx']", ng-class="{ error: vm.errors.versions[0].files[vm.meta.files.indexOf(file)].flavor }")
5+
li.panel(ng-repeat="file in vm.meta.files | fileext:['vpt']", ng-class="{ error: vm.errors.versions[0].files[vm.meta.files.indexOf(file)].flavor }")
66
.col--list-files-left
77
+icon('{{ file.icon }}').svg-4x
88
.col--list-files-right

src/app/releases/admin/add/release.add-07-upload.media.pug

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -98,12 +98,12 @@ span#media(ng-repeat="file in vm.meta.files | fileext:['vpt','vpx']")
9898

9999
.text-center(ng-hide="vm.getReleaseFile(file).flavor.orientation")
100100
+icon('warning').shift-up.space-right
101-
i Pleased set the <b>orientation</b> of the file under 3. before uploading media.
101+
i Please set the <b>orientation</b> of the file under 3. before uploading media.
102102

103103
.alert.alert-danger(ng-show="vm.errors.versions[0].files[vm.meta.files.indexOf(file)]._playfield_image")
104104
+icon('warning').shift-up.space-right
105105
| {{ vm.errors.versions[0].files[vm.meta.files.indexOf(file)]._playfield_image }}
106106

107107
.text-center(ng-show="(vm.meta.files | fileext:['vpt','vpx']).length == 0")
108108
+icon('warning').shift-up.space-right
109-
i Define the flavor of your uploaded files under {{ vm.step.flavors }}. in order to upload media.
109+
i Upload <code>.vpt</code>/<code>.vpx</code> files under {{ vm.step.files }}. before uploading media.

src/app/releases/admin/add/release.add.ctrl.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -147,6 +147,7 @@ export default class ReleaseAddCtrl extends ReleaseBaseCtrl {
147147
if (this.tags) {
148148
this.availableTags = this.tags.slice();
149149
}
150+
this.hasFlavors = false;
150151

151152

152153
// TODO remove files via API

src/app/releases/admin/add/release.add.pug

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -29,11 +29,12 @@ include ../../../template/_mixins
2929
hr
3030
include release.add-02-name.pug
3131

32-
h1 3. Define your Flavors
33-
hr
34-
include release.add-03-flavors.pug
32+
div(ng-show="vm.hasFlavors")
33+
h1 3. Define your Flavors
34+
hr
35+
include release.add-03-flavors.pug
3536

36-
h1 4. Describe your Release
37+
h1 {{ 4 - (vm.hasFlavors ? 0 : 1) }}. Describe your Release
3738
hr
3839
.form-group
3940
editor#description.tabset--light(ng-model="vm.release.description", placeholder="Description of the release", markdown-text="Markdown enabled. This will show up globally under your release.")
@@ -63,15 +64,15 @@ include ../../../template/_mixins
6364
hr.hr--light.hr--margin-small
6465
include release.add-04-links.pug
6566

66-
h1 5. Set Compatibility
67+
h1 {{ 5 - (vm.hasFlavors ? 0 : 1) }}. Set Compatibility
6768
hr
6869
include release.add-05-compat.pug
6970

70-
h1 6. Give Credits
71+
h1 {{ 6 - (vm.hasFlavors ? 0 : 1) }}. Give Credits
7172
hr
7273
include release.add-06-credits.pug
7374

74-
h1 7. Upload Media
75+
h1 {{ 7 - (vm.hasFlavors ? 0 : 1) }}. Upload Media
7576
hr
7677
include release.add-07-upload.media.pug
7778

src/app/releases/admin/add/release.add.version.pug

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -53,18 +53,18 @@ include ../../../template/_mixins
5353
hr
5454
include release.add-01-upload.files.pug
5555

56-
div(ng-show="vm.meta.mode == 'newVersion' || (vm.meta.files | fileext:['vpt','vpx']).length > 0")
56+
div(ng-show="vm.hasFlavors && (vm.meta.mode == 'newVersion' || (vm.meta.files | fileext:['vpt','vpx']).length > 0)")
5757
h1 2. Define your Flavors
5858
hr
5959
include release.add-03-flavors.pug
6060

6161
div(ng-show="vm.meta.mode == 'newVersion' || (vm.meta.files | fileext:['vpt','vpx']).length > 0")
62-
h1 3. Set Compatibility
62+
h1 {{ 3 - (vm.hasFlavors ? 0 : 1) }}. Set Compatibility
6363
hr
6464
include release.add-05-compat.pug
6565

6666
div(ng-show="vm.meta.mode == 'newVersion' || (vm.meta.files | fileext:['vpt','vpx']).length > 0")
67-
h1 4. Upload Media
67+
h1 {{ 4 - (vm.hasFlavors ? 0 : 1) }}. Upload Media
6868
hr
6969
include release.add-07-upload.media.pug
7070

src/app/releases/admin/release.base.ctrl.js

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -132,6 +132,7 @@ export default class ReleaseBaseCtrl {
132132
this.FileResource.delete({ id: file.storage.id }, () => {
133133
this.meta.files.splice(this.meta.files.indexOf(file), 1);
134134
this.releaseVersion.files.splice(this.releaseVersion.files.indexOf(this.releaseVersion.files.find(f => f.id === file.storage.id)), 1);
135+
this.hasFlavors = this.meta.files.filter(f => f.mimeType === 'application/x-visual-pinball-table').length > 0;
135136

136137
}, this.ApiHelper.handleErrorsInDialog('Error removing file.'));
137138
}
@@ -181,6 +182,7 @@ export default class ReleaseBaseCtrl {
181182
tableFile.flavor.lighting = 'any';
182183
tableFile.flavor.orientation = 'any';
183184
}
185+
this.hasFlavors = this.meta.files.filter(f => f.mimeType === 'application/x-visual-pinball-table').length > 0;
184186

185187
// get auth tokens for generated screenshot
186188
if (status.storage.variations && status.storage.variations.screenshot) {

0 commit comments

Comments
 (0)