diff --git a/dofusTravel.user.js b/dofusTravel.user.js index 303bc8f..2d13de7 100644 --- a/dofusTravel.user.js +++ b/dofusTravel.user.js @@ -57,20 +57,21 @@ const copyTextToClipboard = (text, status) => { } const getPositionArray = chaine => { - const rule = /[-]{0,1}[0-9]{1,2}/g + const rule = /[-]?[0-9]{1,2}/g return chaine.match(rule) } if (!window.location.href.includes('dofus-map')) { (() => { - const match = /[\[]{0,1}(\s)*(-){0,1}([0-9]+)[\s]*,[\s]*(-){0,1}([0-9]+)[\s]*[\]]{0,1}/g + // const match = /(?$1[$2$3,$4$5]"); const allGotos = document.getElementsByTagName('goto'); for (let i = 0; i < allGotos.length; i++) { allGotos[i].addEventListener('click', event => { - if (event.srcElement.getAttribute('data-x') !== null && event.srcElement.getAttribute('data-y') !== null && !isNaN(event.srcElement.getAttribute('data-x').replace('-', '')) && !isNaN(event.srcElement.getAttribute('data-y').replace('-', ''))) { - copyTextToClipboard(travelCommand + event.srcElement.getAttribute('data-x') + ',' + event.srcElement.getAttribute('data-y')) + if (event.target.getAttribute('data-x') !== null && event.target.getAttribute('data-y') !== null && !isNaN(event.target.getAttribute('data-x').replace('-', '')) && !isNaN(event.target.getAttribute('data-y').replace('-', ''))) { + copyTextToClipboard(travelCommand + event.target.getAttribute('data-x') + ',' + event.target.getAttribute('data-y')) } else { displayPopup('Cette coordonnée n\'est pas compatible :(', 'error') } @@ -78,8 +79,8 @@ if (!window.location.href.includes('dofus-map')) { }) allGotos[i].addEventListener('contextmenu', event => { event.preventDefault() - if (event.srcElement.getAttribute('data-x') !== null && event.srcElement.getAttribute('data-y') !== null && !isNaN(event.srcElement.getAttribute('data-x').replace('-', '')) && !isNaN(event.srcElement.getAttribute('data-y').replace('-', ''))) { - copyTextToClipboard((parameters.has('noob') ? '/p ' : '') + '[' + event.srcElement.getAttribute('data-x') + ',' + event.srcElement.getAttribute('data-y') + ']') + if (event.target.getAttribute('data-x') !== null && event.target.getAttribute('data-y') !== null && !isNaN(event.target.getAttribute('data-x').replace('-', '')) && !isNaN(event.target.getAttribute('data-y').replace('-', ''))) { + copyTextToClipboard((parameters.has('noob') ? '/p ' : '') + '[' + event.target.getAttribute('data-x') + ',' + event.target.getAttribute('data-y') + ']') } else { displayPopup('Cette coordonnée n\'est pas compatible :(', 'error') }