Mirrors/Stirling-PDF
Mirrors/Stirling-PDF
1
0
Fork 0
mirror of https://github.com/Frooodle/Stirling-PDF.git synced 2024-12-31 00:08:08 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'main' into german__17_12

Browse Source
This commit is contained in:
Ludy 2024-12-17 11:47:44 +01:00 committed by GitHub
commit 3a0d89bd7c
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 8 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/main/resources/static/3rdPartyLicenses.json
View File

@ -434,7 +434,7 @@
{ {
"moduleName": "io.github.pixee:java-security-toolkit", "moduleName": "io.github.pixee:java-security-toolkit",
"moduleUrl": "https://github.com/pixee/java-security-toolkit", "moduleUrl": "https://github.com/pixee/java-security-toolkit",
"moduleVersion": "1.2.0", "moduleVersion": "1.2.1",
"moduleLicense": "MIT License", "moduleLicense": "MIT License",
"moduleLicenseUrl": "http://www.opensource.org/licenses/mit-license.php" "moduleLicenseUrl": "http://www.opensource.org/licenses/mit-license.php"
}, },
@ -448,7 +448,7 @@
{ {
"moduleName": "io.micrometer:micrometer-core", "moduleName": "io.micrometer:micrometer-core",
"moduleUrl": "https://github.com/micrometer-metrics/micrometer", "moduleUrl": "https://github.com/micrometer-metrics/micrometer",
"moduleVersion": "1.14.1", "moduleVersion": "1.14.2",
"moduleLicense": "The Apache Software License, Version 2.0", "moduleLicense": "The Apache Software License, Version 2.0",
"moduleLicenseUrl": "http://www.apache.org/licenses/LICENSE-2.0.txt" "moduleLicenseUrl": "http://www.apache.org/licenses/LICENSE-2.0.txt"
}, },
@ -1441,7 +1441,7 @@
{ {
"moduleName": "org.springframework.security:spring-security-saml2-service-provider", "moduleName": "org.springframework.security:spring-security-saml2-service-provider",
"moduleUrl": "https://spring.io/projects/spring-security", "moduleUrl": "https://spring.io/projects/spring-security",
"moduleVersion": "6.4.1", "moduleVersion": "6.4.2",
"moduleLicense": "Apache License, Version 2.0", "moduleLicense": "Apache License, Version 2.0",
"moduleLicenseUrl": "https://www.apache.org/licenses/LICENSE-2.0" "moduleLicenseUrl": "https://www.apache.org/licenses/LICENSE-2.0"
}, },
@ -1539,7 +1539,7 @@
{ {
"moduleName": "org.springframework:spring-webmvc", "moduleName": "org.springframework:spring-webmvc",
"moduleUrl": "https://github.com/spring-projects/spring-framework", "moduleUrl": "https://github.com/spring-projects/spring-framework",
"moduleVersion": "6.2.0", "moduleVersion": "6.2.1",
"moduleLicense": "Apache License, Version 2.0", "moduleLicense": "Apache License, Version 2.0",
"moduleLicenseUrl": "https://www.apache.org/licenses/LICENSE-2.0" "moduleLicenseUrl": "https://www.apache.org/licenses/LICENSE-2.0"
}, },

3
src/main/resources/static/js/downloader.js
View File

@ -75,9 +75,10 @@
// Check if any PDF files are encrypted and handle decryption if necessary // Check if any PDF files are encrypted and handle decryption if necessary
const decryptedFiles = await checkAndDecryptFiles(url, files); const decryptedFiles = await checkAndDecryptFiles(url, files);
files = decryptedFiles; files = decryptedFiles;
formData.delete('fileInput'); // Reset fileInput and Append
// Append decrypted files to formData // Append decrypted files to formData
decryptedFiles.forEach((file, index) => { decryptedFiles.forEach((file, index) => {
formData.set(`fileInput`, file); formData.append(`fileInput`, file);
}); });
} }

8
src/main/resources/templates/convert/img-to-pdf.html
View File

@ -51,15 +51,11 @@
<br> <br>
<button type="submit" id="submitBtn" class="btn btn-primary" th:text="#{imageToPDF.submit}"></button> <button type="submit" id="submitBtn" class="btn btn-primary" th:text="#{imageToPDF.submit}"></button>
<script> <script>
$('#fileInput-input').on('change', function() { $('#fileInput-input').on('file-input-change', () => {
var files = document.getElementById("fileInput-input").files; var files = document.getElementById("fileInput-input").files;
var conversionType = document.getElementById("conversionType"); var conversionType = document.getElementById("conversionType");
console.log("files.length=" + files.length) console.log("files.length=" + files.length)
if (files.length > 1) { conversionType.disabled = files.length <= 1;
conversionType.disabled = false;
} else {
conversionType.disabled = true;
}
}); });
$('#conversionType').change(function() { $('#conversionType').change(function() {