Skip to content

Commit

Permalink
fix: axios and OC.appConfig usage
Browse files Browse the repository at this point in the history
Signed-off-by: skjnldsv <[email protected]>
  • Loading branch information
skjnldsv committed Mar 22, 2024
1 parent 365adde commit 0152903
Show file tree
Hide file tree
Showing 5 changed files with 20 additions and 5 deletions.
9 changes: 9 additions & 0 deletions l10n/messages.pot
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,12 @@ msgstr ""
msgid "a few seconds left"
msgstr ""

msgid "Cancel"
msgstr ""

msgid "Cancel the entire operation"
msgstr ""

msgid "Cancel uploads"
msgstr ""

Expand Down Expand Up @@ -78,6 +84,9 @@ msgstr ""
msgid "Upload progress"
msgstr ""

msgid "When an incoming folder is selected, any conflicting files within it will also be overwritten."
msgstr ""

msgid "Which files do you want to keep?"
msgstr ""

Expand Down
4 changes: 2 additions & 2 deletions lib/components/UploadPicker.vue
Original file line number Diff line number Diff line change
Expand Up @@ -81,10 +81,10 @@
import type { Entry, Node } from '@nextcloud/files'
import type { PropType } from 'vue'
import { defineComponent } from 'vue'
import { getNewFileMenuEntries, Folder } from '@nextcloud/files'
import { showError } from '@nextcloud/dialogs'
import makeEta from 'simple-eta'
import Vue from 'vue'
import NcActionButton from '@nextcloud/vue/dist/Components/NcActionButton.js'
import NcActions from '@nextcloud/vue/dist/Components/NcActions.js'
Expand All @@ -102,7 +102,7 @@ import { Status as UploadStatus } from '../upload.ts'
import { t } from '../utils/l10n.ts'
import logger from '../utils/logger.ts'
export default defineComponent({
export default Vue.extend({
name: 'UploadPicker',
components: {
Expand Down
8 changes: 7 additions & 1 deletion lib/window.d.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,12 @@ export {}

declare global {
interface Window {
OC: Nextcloud.v28.OC
OC: Nextcloud.v28.OC & {
appConfig: {
files: {
max_chunk_size: number
}
}
}
}
}
2 changes: 1 addition & 1 deletion package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@
"@nextcloud/moment": "^1.3.1",
"@nextcloud/paths": "^2.1.0",
"@nextcloud/router": "^2.2.0",
"axios": "^1.6.2",
"axios": "^1.6.8",
"buffer": "^6.0.3",
"crypto-browserify": "^3.12.0",
"p-cancelable": "^4.0.1",
Expand Down

0 comments on commit 0152903

Please sign in to comment.