From 6479923482a08efe3b66925cf720dcc00b18c060 Mon Sep 17 00:00:00 2001
From: HF
- {t`Top-left corner`} (X_Y): + {t`Top-left corner`}: { - const co = evt.target.value.trim(); + let co = evt.target.value.trim(); + co = coordsFromUrl(co) || co; + evt.target.value = co; keptState.tlcoords = co; }} />
- {t`Bottom-right corner`} (X_Y): + {t`Bottom-right corner`}: { - const co = evt.target.value.trim(); + let co = evt.target.value.trim(); + co = coordsFromUrl(co) || co; + evt.target.value = co; keptState.brcoords = co; }} /> @@ -401,7 +408,7 @@ function ModCanvastools() { }} />
- {t`Top-left corner`} (X_Y): + {t`Top-left corner`}: { - const co = evt.target.value.trim(); + let co = evt.target.value.trim(); + co = coordsFromUrl(co) || co; + evt.target.value = co; keptState.tlrcoords = co; }} />
- {t`Bottom-right corner`} (X_Y): + {t`Bottom-right corner`}: { - const co = evt.target.value.trim(); + let co = evt.target.value.trim(); + co = coordsFromUrl(co) || co; + evt.target.value = co; keptState.brrcoords = co; }} /> @@ -484,7 +495,7 @@ function ModCanvastools() { {cleanerStatusString}
- {t`Top-left corner`} (X_Y): + {t`Top-left corner`}: { - const co = evt.target.value.trim(); + let co = evt.target.value.trim(); + co = coordsFromUrl(co) || co; + evt.target.value = co; keptState.tlccoords = co; }} />
- {t`Bottom-right corner`} (X_Y): + {t`Bottom-right corner`}: { - const co = evt.target.value.trim(); + let co = evt.target.value.trim(); + co = coordsFromUrl(co) || co; + evt.target.value = co; keptState.brccoords = co; }} /> diff --git a/src/components/ModWatchtools.jsx b/src/components/ModWatchtools.jsx index 18c2a4d2..7f242bb6 100644 --- a/src/components/ModWatchtools.jsx +++ b/src/components/ModWatchtools.jsx @@ -8,7 +8,7 @@ import { useSelector, shallowEqual } from 'react-redux'; import { t } from 'ttag'; import copyTextToClipboard from '../utils/clipboard'; -import { parseInterval } from '../core/utils'; +import { parseInterval, coordsFromUrl } from '../core/utils'; import { shardOrigin } from '../store/actions/fetch'; const keepState = { @@ -173,7 +173,7 @@ function ModWatchtools() { />
- {t`Top-left corner`} (X_Y): + {t`Top-left corner`}: { - const co = evt.target.value.trim(); + let co = evt.target.value.trim(); + co = coordsFromUrl(co) || co; + evt.target.value = co; keepState.tlcoords = co; }} />
- {t`Bottom-right corner`} (X_Y): + {t`Bottom-right corner`}: { - const co = evt.target.value.trim(); + let co = evt.target.value.trim(); + co = coordsFromUrl(co) || co; + evt.target.value = co; keepState.brcoords = co; }} /> @@ -312,11 +316,13 @@ function ModWatchtools() { switch (type) { case 'ts': { const date = new Date(val); - let minutes = date.getMinutes(); - if (minutes < 10) minutes = `0${minutes}`; + const hours = date.getHours(); + const minutes = `0${date.getMinutes()}`.slice(-2); + const seconds = `0${date.getSeconds()}`.slice(-2); + const ms = `00${date.getMilliseconds()}`.slice(-3); return (