Skip to content

Commit 0152903

Browse files
committed
fix: axios and OC.appConfig usage
Signed-off-by: skjnldsv <skjnldsv@protonmail.com>
1 parent 365adde commit 0152903

File tree

5 files changed

+20
-5
lines changed

5 files changed

+20
-5
lines changed

l10n/messages.pot

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,12 @@ msgstr ""
2222
msgid "a few seconds left"
2323
msgstr ""
2424

25+
msgid "Cancel"
26+
msgstr ""
27+
28+
msgid "Cancel the entire operation"
29+
msgstr ""
30+
2531
msgid "Cancel uploads"
2632
msgstr ""
2733

@@ -78,6 +84,9 @@ msgstr ""
7884
msgid "Upload progress"
7985
msgstr ""
8086

87+
msgid "When an incoming folder is selected, any conflicting files within it will also be overwritten."
88+
msgstr ""
89+
8190
msgid "Which files do you want to keep?"
8291
msgstr ""
8392

lib/components/UploadPicker.vue

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -81,10 +81,10 @@
8181
import type { Entry, Node } from '@nextcloud/files'
8282
import type { PropType } from 'vue'
8383
84-
import { defineComponent } from 'vue'
8584
import { getNewFileMenuEntries, Folder } from '@nextcloud/files'
8685
import { showError } from '@nextcloud/dialogs'
8786
import makeEta from 'simple-eta'
87+
import Vue from 'vue'
8888
8989
import NcActionButton from '@nextcloud/vue/dist/Components/NcActionButton.js'
9090
import NcActions from '@nextcloud/vue/dist/Components/NcActions.js'
@@ -102,7 +102,7 @@ import { Status as UploadStatus } from '../upload.ts'
102102
import { t } from '../utils/l10n.ts'
103103
import logger from '../utils/logger.ts'
104104
105-
export default defineComponent({
105+
export default Vue.extend({
106106
name: 'UploadPicker',
107107
108108
components: {

lib/window.d.ts

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,12 @@ export {}
33

44
declare global {
55
interface Window {
6-
OC: Nextcloud.v28.OC
6+
OC: Nextcloud.v28.OC & {
7+
appConfig: {
8+
files: {
9+
max_chunk_size: number
10+
}
11+
}
12+
}
713
}
814
}

package-lock.json

Lines changed: 1 addition & 1 deletion
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
@@ -79,7 +79,7 @@
7979
"@nextcloud/moment": "^1.3.1",
8080
"@nextcloud/paths": "^2.1.0",
8181
"@nextcloud/router": "^2.2.0",
82-
"axios": "^1.6.2",
82+
"axios": "^1.6.8",
8383
"buffer": "^6.0.3",
8484
"crypto-browserify": "^3.12.0",
8585
"p-cancelable": "^4.0.1",

0 commit comments

Comments
 (0)