fix: cannot upload GCODE files on iOS (#1152)

fix #1117
mainsail-crew · Nov 14, 2022 · 2aa181c · 2aa181c
1 parent c9ab078
commit 2aa181c
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 7 deletions.
diff --git a/src/components/TheTopbar.vue b/src/components/TheTopbar.vue
@@ -26,7 +26,7 @@
             <input
                 ref="fileUploadAndStart"
                 type="file"
-                :accept="validGcodeExtensions.join(', ')"
+                :accept="gcodeInputFileAccept.join(', ')"
                 style="display: none"
                 @change="uploadAndStart" />
             <v-btn
@@ -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
     }
@@ -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
     }

diff --git a/src/components/mixins/base.ts b/src/components/mixins/base.ts
@@ -83,6 +83,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 ?? []
     }

diff --git a/src/components/panels/GcodefilesPanel.vue b/src/components/panels/GcodefilesPanel.vue
@@ -29,7 +29,7 @@
                         <input
                             ref="fileUpload"
                             type="file"
-                            :accept="validGcodeExtensions.join(', ')"
+                            :accept="gcodeInputFileAccept.join(', ')"
                             style="display: none"
                             multiple
                             @change="uploadFile" />
@@ -585,7 +585,6 @@ export default class GcodefilesPanel extends Mixins(BaseMixin, ControlMixin) {
     mdiCheckboxMarked = mdiCheckboxMarked
     mdiDragVertical = mdiDragVertical
 
-    validGcodeExtensions = validGcodeExtensions
     formatFilesize = formatFilesize
     formatPrintTime = formatPrintTime
     sortFiles = sortFiles
@@ -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 ''