Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix: cannot upload GCODE files on iOS #1152

Merged
merged 7 commits into from
Nov 14, 2022
Merged

fix: cannot upload GCODE files on iOS #1152

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
18f4f8e
fix: add mimetypes for input file accept
meteyou Oct 24, 2022
de629c2
Merge branch 'develop' into fix/safari-fileupload
meteyou Nov 2, 2022
8e894ee
refactor: check for iPhone/iPad/iPod and use mime instead of extensio…
meteyou Nov 2, 2022
a34ed37
fix: allow all uploads when agent is IOS
meteyou Nov 6, 2022
75c2d66
refactor: update isIOS getter
meteyou Nov 10, 2022
1a74794
refactor: add debug output
meteyou Nov 10, 2022
92a6567
refactor: remove debug output
meteyou Nov 14, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 7 additions & 5 deletions src/components/TheTopbar.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
<input
ref="fileUploadAndStart"
type="file"
:accept="validGcodeExtensions.join(', ')"
:accept="gcodeInputFileAccept.join(', ')"
style="display: none"
@change="uploadAndStart" />
<v-btn
Expand Down Expand Up @@ -174,6 +174,12 @@ export default class TheTopbar extends Mixins(BaseMixin) {
fileUploadAndStart: HTMLFormElement
}

get gcodeInputFileAccept() {
if (this.isIOS) return []

return validGcodeExtensions
}

get naviDrawer() {
return this.$store.state.naviDrawer
}
Expand All @@ -182,10 +188,6 @@ export default class TheTopbar extends Mixins(BaseMixin) {
this.$store.dispatch('setNaviDrawer', newVal)
}

get validGcodeExtensions() {
return validGcodeExtensions
}

get currentPage() {
return this.$route.fullPath
}
Expand Down
8 changes: 8 additions & 0 deletions src/components/mixins/base.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,6 +79,14 @@ export default class BaseMixin extends Vue {
return 'ontouchstart' in window || (navigator.maxTouchPoints > 0 && navigator.maxTouchPoints !== 256)
}

get isIOS() {
return !!(
navigator.userAgent.match(/(iPad|iPhone|iPod)/) ||
// @ts-ignore
(navigator.platform === 'MacIntel' && typeof navigator.standalone !== 'undefined')
)
}

get moonrakerComponents() {
return this.$store.state.server?.components ?? []
}
Expand Down
9 changes: 7 additions & 2 deletions src/components/panels/GcodefilesPanel.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
<input
ref="fileUpload"
type="file"
:accept="validGcodeExtensions.join(', ')"
:accept="gcodeInputFileAccept.join(', ')"
style="display: none"
multiple
@change="uploadFile" />
Expand Down Expand Up @@ -585,7 +585,6 @@ export default class GcodefilesPanel extends Mixins(BaseMixin, ControlMixin) {
mdiCheckboxMarked = mdiCheckboxMarked
mdiDragVertical = mdiDragVertical

validGcodeExtensions = validGcodeExtensions
formatFilesize = formatFilesize
formatPrintTime = formatPrintTime
sortFiles = sortFiles
Expand Down Expand Up @@ -668,6 +667,12 @@ export default class GcodefilesPanel extends Mixins(BaseMixin, ControlMixin) {
return this.files.findIndex((file) => file.filename === name) >= 0
}

get gcodeInputFileAccept() {
if (this.isIOS) return []

return validGcodeExtensions
}

get currentPath() {
const path = this.$store.state.gui.view.gcodefiles.currentPath
if (path === 'gcodes') return ''
Expand Down