didadmin/docuseal
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix js errors

Browse Source
This commit is contained in:
Alex Turchyn
2024-05-30 00:35:35 +03:00
committed by Pete Matsyburka
parent c56f8cb38f
commit 7080e8ea33
4 changed files with 31 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/controllers/template_documents_controller.rb
+3 -1
View File
@@ -4,7 +4,9 @@ class TemplateDocumentsController < ApplicationController
load_and_authorize_resource :template load_and_authorize_resource :template
def create def create
return head :unprocessable_entity if params[:blobs].blank? && params[:files].blank? if params[:blobs].blank? && params[:files].blank?
return render json: { error: 'File is missing' }, status: :unprocessable_entity
end
old_fields_hash = @template.fields.hash old_fields_hash = @template.fields.hash
app/javascript/elements/download_button.js
+10 -5
View File
@@ -17,13 +17,18 @@ export default targetable(class extends HTMLElement {
this.toggleState() this.toggleState()
fetch(this.dataset.src).then((response) => response.json()).then((urls) => { fetch(this.dataset.src).then(async (response) => {
const isSafariIos = /iPhone|iPad|iPod/i.test(navigator.userAgent) if (response.ok) {
const urls = await response.json()
const isSafariIos = /iPhone|iPad|iPod/i.test(navigator.userAgent)
if (isSafariIos && urls.length > 1) { if (isSafariIos && urls.length > 1) {
this.downloadSafariIos(urls) this.downloadSafariIos(urls)
} else {
this.downloadUrls(urls)
}
} else { } else {
this.downloadUrls(urls) alert('Failed to download files')
} }
}) })
} }
app/javascript/submission_form/completed.vue
+10 -5
View File
@@ -197,13 +197,18 @@ export default {
download () { download () {
this.isDownloading = true this.isDownloading = true
fetch(this.baseUrl + `/submitters/${this.submitterSlug}/download`).then((response) => response.json()).then((urls) => { fetch(this.baseUrl + `/submitters/${this.submitterSlug}/download`).then(async (response) => {
const isSafariIos = /iPhone|iPad|iPod/i.test(navigator.userAgent) if (response.ok) {
const urls = await response.json()
const isSafariIos = /iPhone|iPad|iPod/i.test(navigator.userAgent)
if (isSafariIos && urls.length > 1) { if (isSafariIos && urls.length > 1) {
this.downloadSafariIos(urls) this.downloadSafariIos(urls)
} else {
this.downloadUrls(urls)
}
} else { } else {
this.downloadUrls(urls) alert('Failed to download files')
} }
}) })
}, },
app/javascript/submission_form/form.vue
+8 -6
View File
@@ -972,14 +972,16 @@ export default {
this.$nextTick(() => { this.$nextTick(() => {
this.recalculateButtonDisabledKey = Math.random() this.recalculateButtonDisabledKey = Math.random()
if (scrollToArea) { if (!this.isCompleted) {
this.scrollIntoField(step[0]) if (scrollToArea) {
this.scrollIntoField(step[0])
this.$refs.form.querySelector('input[type="date"], input[type="number"], input[type="text"], select')?.focus() this.$refs.form.querySelector('input[type="date"], input[type="number"], input[type="text"], select')?.focus()
} }
if (clickUpload && !this.values[this.currentField.uuid] && ['file', 'image'].includes(this.currentField.type)) { if (clickUpload && !this.values[this.currentField.uuid] && ['file', 'image'].includes(this.currentField.type)) {
this.$refs.form.querySelector('input[type="file"]')?.click() this.$refs.form.querySelector('input[type="file"]')?.click()
}
} }
}) })
}, },