Skip to content

Commit 2450289

Browse files
committed
Merge remote-tracking branch 'origin/dev' into highlight-duplicate-author
2 parents 6cae35e + e490d42 commit 2450289

10 files changed

Lines changed: 8 additions & 55 deletions

.eslintrc.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -73,6 +73,7 @@ module.exports = {
7373
rules: {
7474
'vue/v-on-style': ['error', 'longform'],
7575
'vue/v-bind-style': ['error', 'longform'],
76+
'vue/v-slot-style': ['error', 'longform'],
7677
'vue/no-unused-properties': ['error', {
7778
'groups': ['props', 'data', 'computed', 'methods', 'setup'],
7879
'deepData': true,

src/components/AuthorCardEditing.vue

Lines changed: 1 addition & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -153,22 +153,6 @@
153153
</div>
154154

155155
<q-card-actions align="right">
156-
<q-btn
157-
color="blue"
158-
dense
159-
v-bind:disable="index == 0"
160-
icon="ion-arrow-up"
161-
tabindex="-1"
162-
v-on:click="$emit('moveUp')"
163-
/>
164-
<q-btn
165-
color="blue"
166-
dense
167-
v-bind:disable="index >= numAuthors - 1"
168-
icon="ion-arrow-down"
169-
tabindex="-1"
170-
v-on:click="$emit('moveDown')"
171-
/>
172156
<q-btn
173157
color="negative"
174158
dense
@@ -227,10 +211,6 @@ export default defineComponent({
227211
orcid: {
228212
type: String,
229213
default: ''
230-
},
231-
numAuthors: {
232-
type: Number,
233-
default: 0
234214
}
235215
},
236216
setup (props) {
@@ -254,7 +234,7 @@ export default defineComponent({
254234
orcidErrors
255235
}
256236
},
257-
emits: ['closePressed', 'removePressed', 'update', 'moveUp', 'moveDown'],
237+
emits: ['closePressed', 'removePressed', 'update'],
258238
components: { SchemaGuideLink }
259239
})
260240
</script>

src/components/Footer.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
<img src="~assets/nlesc-logo.svg">
1212
</a>
1313
</div>
14-
<span class="col text-right text-white text-body1 text-bold">
14+
<span class="col text-right text-white text-body1">
1515
Version 2.0.1
1616
</span>
1717
</div>

src/components/IdentifierCardEditing.vue

Lines changed: 1 addition & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -55,22 +55,6 @@
5555
</div>
5656
</q-card-section>
5757
<q-card-actions align="right">
58-
<q-btn
59-
dense
60-
color="blue"
61-
v-bind:disable="index == 0"
62-
icon="ion-arrow-up"
63-
tabindex="-1"
64-
v-on:click="$emit('moveUp')"
65-
/>
66-
<q-btn
67-
dense
68-
color="blue"
69-
v-bind:disable="index >= numIdentifiers - 1"
70-
icon="ion-arrow-down"
71-
tabindex="-1"
72-
v-on:click="$emit('moveDown')"
73-
/>
7458
<q-btn
7559
color="negative"
7660
dense
@@ -113,10 +97,6 @@ export default defineComponent({
11397
description: {
11498
type: String,
11599
default: ''
116-
},
117-
numIdentifiers: {
118-
type: Number,
119-
default: 0
120100
}
121101
},
122102
components: {
@@ -155,9 +135,7 @@ export default defineComponent({
155135
'removePressed',
156136
'updateType',
157137
'updateValue',
158-
'updateDescription',
159-
'moveUp',
160-
'moveDown'
138+
'updateDescription'
161139
]
162140
})
163141
</script>

src/components/LayoutLanding.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@
4747
/>
4848
</div>
4949
</div>
50-
<span class="text-right text-black text-body1 text-bold">
50+
<span class="text-right text-black text-body1">
5151
Version 2.0.1
5252
</span>
5353
</div>

src/components/ScreenAuthors.vue

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -34,13 +34,10 @@
3434
<AuthorCardEditing
3535
v-else
3636
v-bind:index="index"
37-
v-bind:num-authors="authors.length"
3837
v-bind="author"
3938
v-on:update="setAuthorField"
4039
v-on:closePressed="() => (editingId = -1)"
4140
v-on:removePressed="removeAuthor"
42-
v-on:moveDown="moveAuthorDown(index)"
43-
v-on:moveUp="moveAuthorUp(index)"
4441
/>
4542
</div>
4643
</div>

src/components/ScreenIdentifiers.vue

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -35,14 +35,11 @@
3535
v-else
3636
v-bind:index="index"
3737
v-bind="identifier"
38-
v-bind:num-identifiers="identifiers.length"
3938
v-on:updateType="setIdentifierTypeField"
4039
v-on:updateValue="setIdentifierValueField"
4140
v-on:updateDescription="setIdentifierDescriptionField"
4241
v-on:closePressed="() => (editingId = -1)"
4342
v-on:removePressed="removeIdentifier"
44-
v-on:moveDown="moveIdentifierDown(index)"
45-
v-on:moveUp="moveIdentifierUp(index)"
4643
/>
4744
</div>
4845
</div>

src/components/ScreenLicense.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
v-on:filter="licenseFilterFunction"
3030
v-on:update:model-value="setLicense"
3131
>
32-
<template #no-option>
32+
<template v-slot:no-option>
3333
<q-item>
3434
<q-item-section class="text-grey">
3535
No results

src/components/ScreenStart.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@
4141
v-on:new-value="setMessage"
4242
v-on:update:modelValue="setMessage"
4343
>
44-
<template #append>
44+
<template v-slot:append>
4545
<q-btn-dropdown
4646
class="dropdown"
4747
flat

src/components/ScreenVersionSpecific.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@
5555
v-bind:error-message="dateReleasedErrors.join(', ')"
5656
v-on:update:modelValue="setDateReleased"
5757
>
58-
<template #append>
58+
<template v-slot:append>
5959
<q-icon
6060
name="event"
6161
class="cursor-pointer"

0 commit comments

Comments
 (0)