extern/easydiffusion
1
0
Fork 1
mirror of https://github.com/easydiffusion/easydiffusion.git synced 2025-05-31 23:25:39 +02:00
Code Issues Packages Projects Releases Wiki Activity

Don't change the page when something other than an image or text file is dropped into the page (or an image is dropped outside the init image box)

Browse Source
This commit is contained in:
cmdr2 2022-11-09 15:21:41 +05:30
parent ad1fc8f3d8
commit 6c1dda47c0
2 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ui/index.html
View File

@ -297,7 +297,7 @@
<script src="media/js/auto-save.js?v=6"></script> <script src="media/js/auto-save.js?v=6"></script>
<script src="media/js/main.js?v=9"></script> <script src="media/js/main.js?v=9"></script>
<script src="media/js/themes.js?v=4"></script> <script src="media/js/themes.js?v=4"></script>
<script src="media/js/dnd.js?v=7"></script> <script src="media/js/dnd.js?v=8"></script>
<script> <script>
async function init() { async function init() {
await initSettings() await initSettings()

18
ui/media/js/dnd.js
View File

@ -1,5 +1,9 @@
"use strict" // Opt in to a restricted variant of JavaScript "use strict" // Opt in to a restricted variant of JavaScript
const EXT_REGEX = /(?:\.([^.]+))?$/
const TEXT_EXTENSIONS = ['txt', 'json']
const IMAGE_EXTENSIONS = ['jpg', 'jpeg', 'png', 'bmp', 'tiff', 'tif', 'tga']
function parseBoolean(stringValue) { function parseBoolean(stringValue) {
if (typeof stringValue === 'boolean') { if (typeof stringValue === 'boolean') {
return stringValue return stringValue
@ -301,7 +305,6 @@ function parseTaskFromText(str) {
const reName = new RegExp(`${name}\\ *:\\ *(.*)(?:\\r\\n|\\r|\\n)*`, 'igm') const reName = new RegExp(`${name}\\ *:\\ *(.*)(?:\\r\\n|\\r|\\n)*`, 'igm')
const match = reName.exec(str); const match = reName.exec(str);
if (match) { if (match) {
console.log(match)
str = str.slice(0, match.index) + str.slice(match.index + match[0].length) str = str.slice(0, match.index) + str.slice(match.index + match[0].length)
val = match[1] val = match[1]
} }
@ -358,12 +361,17 @@ function dropHandler(ev) {
items = Array.from(ev.dataTransfer.files) items = Array.from(ev.dataTransfer.files)
} }
items = items.filter(item => item.name.toLowerCase().endsWith('.txt') || item.name.toLowerCase().endsWith('.json')) items.forEach(item => {item.file_ext = EXT_REGEX.exec(item.name.toLowerCase())[1]})
if (items.length > 0) { let text_items = items.filter(item => TEXT_EXTENSIONS.includes(item.file_ext))
ev.preventDefault() // Prevent default behavior (Prevent file/content from being opened) let image_items = items.filter(item => IMAGE_EXTENSIONS.includes(item.file_ext))
items.forEach(readFile)
if (image_items.length > 0 && ev.target == initImageSelector) {
return // let the event bubble up, so that the Init Image filepicker can receive this
} }
ev.preventDefault() // Prevent default behavior (Prevent file/content from being opened)
text_items.forEach(readFile)
} }
function dragOverHandler(ev) { function dragOverHandler(ev) {
console.log('Content in drop zone') console.log('Content in drop zone')