Skip to content

Commit 0307db6

Browse files
committed
new build
1 parent 5c32b2a commit 0307db6

2 files changed

Lines changed: 3 additions & 20 deletions

File tree

dist/index.js

Lines changed: 3 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/server/public/app.js

Lines changed: 0 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -130,7 +130,6 @@ function initializeExportTabs() {
130130
// File upload handling
131131
function initializeUpload() {
132132
const uploadArea = document.getElementById('uploadArea')
133-
<<<<<<< HEAD
134133

135134
// Check if running in Electron
136135
const isElectron = window.electronAPI !== undefined
@@ -173,27 +172,11 @@ function initializeUpload() {
173172
document.body.removeChild(fileInput)
174173
})
175174
document.body.appendChild(fileInput)
176-
=======
177-
const fileInput = document.getElementById('fileInput')
178-
179-
// Click to select files
180-
uploadArea.addEventListener('click', (e) => {
181-
if (e.target !== fileInput) {
182-
>>>>>>> 8f9acf39b4f105ba5845dbd5f01b4c03cc8a3b7c
183175
fileInput.click()
184176
}
185177
})
186178

187-
<<<<<<< HEAD
188179
// Drag and drop (works in both Electron and browser)
189-
=======
190-
// File selection
191-
fileInput.addEventListener('change', (e) => {
192-
handleFiles(e.target.files)
193-
})
194-
195-
// Drag and drop
196-
>>>>>>> 8f9acf39b4f105ba5845dbd5f01b4c03cc8a3b7c
197180
uploadArea.addEventListener('dragover', (e) => {
198181
e.preventDefault()
199182
uploadArea.classList.add('drag-over')

0 commit comments

Comments
 (0)