self merge conflicts are fun

This commit is contained in:
Jason Jordan
2026-03-05 14:40:53 -05:00
parent b5a1517330
commit 8ecabf60ff
4 changed files with 8 additions and 9 deletions
@@ -4,7 +4,7 @@ export default class extends Controller {
static values = {
logoType: String,
employerName: String
}
}
static targets = ["preview", "previewContainer", "logoSelect", "logofield", "initialLogoFile"];
async connect() {
@@ -39,12 +39,10 @@ export default class extends Controller {
newFileName = this.determineEmployerFilename(file)
file.name = newFileName
}
this.previewFile(file);
this.uploadLogoToServer(file);
this.logofieldTarget.value = newFileName;
}
@@ -122,4 +120,3 @@ export default class extends Controller {
});
}
}