4nk/ihm_client
5
0
Fork 0
Code Issues 6 Pull Requests Actions Packages Projects Releases Wiki Activity

Address paste fix + closeConfirmationModal fix

Browse Source
This commit is contained in:
NicolasCantu 2024-10-24 15:19:55 +02:00
parent 126f850f9f
commit a620272dd9
3 changed files with 779 additions and 762 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/services/routing.service.ts
View File

@ -76,7 +76,7 @@ export default class Routing {
window.onclick = (event) => { window.onclick = (event) => {
const modal = document.getElementById('modal'); const modal = document.getElementById('modal');
if (event.target === modal) { if (event.target === modal) {
this.confirmPairing(); this.closeConfirmationModal();
} }
} }
} }
@ -109,6 +109,8 @@ export default class Routing {
} }
async closeConfirmationModal() { async closeConfirmationModal() {
const service = await Services.getInstance()
await service.unpairDevice()
const modal = document.getElementById('modal') const modal = document.getElementById('modal')
if (modal) modal.style.display = 'none'; if (modal) modal.style.display = 'none';
} }

19
src/services/service.ts
View File

@ -101,7 +101,7 @@ export default class Services {
} }
const copyBtn = document.getElementById('copyBtn'); const copyBtn = document.getElementById('copyBtn');
if (copyBtn) { if (copyBtn) {
copyBtn.addEventListener('click', () => this.copyToClipboard(text)); copyBtn.addEventListener('click', () => this.copyToClipboard(currentUrl + "?sp_address=" + text));
} }
} catch (err) { } catch (err) {
console.error(err); console.error(err);
@ -209,8 +209,23 @@ export default class Services {
const okButton = document.getElementById('okButton'); const okButton = document.getElementById('okButton');
addressInput.addEventListener('input', async () => { 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) { if (address) {
const emojis = await this.addressToEmoji(address); const emojis = await this.addressToEmoji(address);