Address paste fix + closeConfirmationModal fix
This commit is contained in:
parent
126f850f9f
commit
a620272dd9
@ -76,7 +76,7 @@ export default class Routing {
|
||||
window.onclick = (event) => {
|
||||
const modal = document.getElementById('modal');
|
||||
if (event.target === modal) {
|
||||
this.confirmPairing();
|
||||
this.closeConfirmationModal();
|
||||
}
|
||||
}
|
||||
}
|
||||
@ -109,6 +109,8 @@ export default class Routing {
|
||||
}
|
||||
|
||||
async closeConfirmationModal() {
|
||||
const service = await Services.getInstance()
|
||||
await service.unpairDevice()
|
||||
const modal = document.getElementById('modal')
|
||||
if (modal) modal.style.display = 'none';
|
||||
}
|
||||
|
@ -101,7 +101,7 @@ export default class Services {
|
||||
}
|
||||
const copyBtn = document.getElementById('copyBtn');
|
||||
if (copyBtn) {
|
||||
copyBtn.addEventListener('click', () => this.copyToClipboard(text));
|
||||
copyBtn.addEventListener('click', () => this.copyToClipboard(currentUrl + "?sp_address=" + text));
|
||||
}
|
||||
} catch (err) {
|
||||
console.error(err);
|
||||
@ -209,8 +209,23 @@ export default class Services {
|
||||
const okButton = document.getElementById('okButton');
|
||||
|
||||
addressInput.addEventListener('input', async () => {
|
||||
const address = addressInput.value;
|
||||
let address = addressInput.value;
|
||||
|
||||
// Vérifie si l'adresse est une URL
|
||||
try {
|
||||
const url = new URL(address);
|
||||
// Si c'est une URL valide, extraire le paramètre sp_address
|
||||
const urlParams = new URLSearchParams(url.search);
|
||||
const extractedAddress = urlParams.get('sp_address') || ''; // Prend sp_address ou une chaîne vide
|
||||
|
||||
if (extractedAddress) {
|
||||
address = extractedAddress;
|
||||
addressInput.value = address; // Met à jour l'input pour afficher uniquement l'adresse extraite
|
||||
}
|
||||
} catch (e) {
|
||||
// Si ce n'est pas une URL valide, on garde l'adresse originale
|
||||
console.log("Ce n'est pas une URL valide, on garde l'adresse originale.");
|
||||
}
|
||||
|
||||
if (address) {
|
||||
const emojis = await this.addressToEmoji(address);
|
||||
|
Loading…
x
Reference in New Issue
Block a user