Only adding a slash to destUri if folderName does not already have it

megoth · megoth · commit 63e2b4654b9f · 2019-08-14T15:23:28.000+02:00
This should fix SolidOS/solid-panes#143
diff --git a/src/widgets/dragAndDrop.js b/src/widgets/dragAndDrop.js
@@ -195,7 +195,7 @@ function uploadFiles (fetcher, files, fileBase, imageBase, successHandler) {
           }
         }
         var folderName = theFile.type.startsWith('image/') ? imageBase || fileBase : fileBase
-        var destURI = folderName + '/' + encodeURIComponent(theFile.name) + suffix
+        var destURI = folderName + (folderName.endsWith('/') ? '' : '/') + encodeURIComponent(theFile.name) + suffix
 
         fetcher.webOperation('PUT', destURI, { data: data, contentType: contentType })
           .then(response => {

Original file line number	Diff line number	Diff line change
`@@ -195,7 +195,7 @@ function uploadFiles (fetcher, files, fileBase, imageBase, successHandler) {`
`195`	`195`	`}`
`196`	`196`	`}`
`197`	`197`	`var folderName = theFile.type.startsWith('image/') ? imageBase \|\| fileBase : fileBase`
`198`		`- var destURI = folderName + '/' + encodeURIComponent(theFile.name) + suffix`
	`198`	`+ var destURI = folderName + (folderName.endsWith('/') ? '' : '/') + encodeURIComponent(theFile.name) + suffix`
`199`	`199`
`200`	`200`	`fetcher.webOperation('PUT', destURI, { data: data, contentType: contentType })`
`201`	`201`	`.then(response => {`