Skip to content

📈 Open source, privacy-first web analytics — a cookie-less Google Analytics alternative with built-in error tracking and performance monitoring. Self-host it or use our cloud. Get started for free!

fixed a bug with incorrect frame height

Blue Moused5deebb4ee6d
diff --git a/captcha-loader.js b/captcha-loader.js
index f15c3f6cf..38b137ddb 100644
--- a/captcha-loader.js
+++ b/captcha-loader.js
@@ -9,6 +9,13 @@ const PID_REGEX = /^(?!.*--)[a-zA-Z0-9-]{12}$/
const isValidPID = (pid) => PID_REGEX.test(pid)
+const FRAME_HEIGHT_MAPPING = {
+ default: '66px',
+ manual: '200px',
+}
+
+const getFrameID = (cid) => `${cid}-frame`
+
const ids = []
const log = (status, text) => {
@@ -74,7 +81,7 @@ const postMessageCallback = (pmEvent) => {
const inputExists = input !== null
switch (event) {
- case 'success':
+ case 'success': {
const { token } = data
if (!inputExists) {
@@ -85,8 +92,9 @@ const postMessageCallback = (pmEvent) => {
input.value = token
break
+ }
- case 'failure':
+ case 'failure': {
if (!inputExists) {
log('error', '[PM -> failure] Input element does not exist.')
return
@@ -95,8 +103,9 @@ const postMessageCallback = (pmEvent) => {
input.value = ''
break
+ }
- case 'tokenExpired':
+ case 'tokenExpired': {
if (!inputExists) {
log('error', '[PM -> failure] Input element does not exist.')
return
@@ -105,6 +114,33 @@ const postMessageCallback = (pmEvent) => {
input.value = ''
break
+ }
+
+ case 'manualStarted': {
+ const frame = document.getElementById(getFrameID(cid))
+
+ if (!frame) {
+ log('error', '[PM -> manualStarted] Frame does not exist.')
+ return
+ }
+
+ frame.style.height = FRAME_HEIGHT_MAPPING.manual
+
+ break
+ }
+
+ case 'manualFinished': {
+ const frame = document.getElementById(getFrameID(cid))
+
+ if (!frame) {
+ log('error', '[PM -> manualFinished] Frame does not exist.')
+ return
+ }
+
+ frame.style.height = FRAME_HEIGHT_MAPPING.default
+
+ break
+ }
}
}
@@ -112,13 +148,14 @@ const generateCaptchaFrame = (params) => {
const { theme } = params
const captchaFrame = document.createElement('iframe')
+ captchaFrame.id = getFrameID(params.cid)
captchaFrame.src = theme === 'dark'
? appendParamsToURL(DARK_CAPTCHA_IFRAME_URL, params)
: appendParamsToURL(LIGHT_CAPTCHA_IFRAME_URL, params)
+ captchaFrame.style.height = FRAME_HEIGHT_MAPPING.default
captchaFrame.title = 'Swetrix Captcha'
captchaFrame.style.border = 'none'
captchaFrame.style.width = '302px'
- captchaFrame.style.height = 'auto'
captchaFrame.style.overflow = 'visible'
return captchaFrame
diff --git a/captcha.js b/captcha.js
index f0f568349..17b54eb01 100644
--- a/captcha.js
+++ b/captcha.js
@@ -15,6 +15,8 @@ const IFRAME_MESSAGE_TYPES = {
SUCCESS: 'success',
FAILURE: 'failure',
TOKEN_EXPIRED: 'tokenExpired',
+ MANUAL_STARTED: 'manualStarted',
+ MANUAL_FINISHED: 'manualFinished',
}
let activeAction = 'checkbox'
@@ -83,7 +85,8 @@ const enableManualChallenge = (svg) => {
} else {
svgCaptcha.innerHTML = svg
}
-
+
+ postMessage(IFRAME_MESSAGE_TYPES.MANUAL_STARTED)
manualChallenge.classList.remove('hidden')
}
@@ -91,6 +94,7 @@ const disableManualChallenge = () => {
const manualChallenge = document.querySelector('#manual-challenge')
const svgCaptcha = document.querySelector('#svg-captcha')
+ postMessage(IFRAME_MESSAGE_TYPES.MANUAL_FINISHED)
svgCaptcha.innerHTML = ''
manualChallenge.classList.add('hidden')
}
diff --git a/test.html b/test.html
index f02788eaf..7a15734a6 100644
--- a/test.html
+++ b/test.html
@@ -25,7 +25,7 @@
<input type="text" name="name" value="name">
<input type="text" name="email" value="email">
<input type="number" name="number" value="number">
- <div class="swecaptcha" data-project-id="v0siIpVYWxhk" data-theme="light"></div>
+ <div class="swecaptcha" data-project-id="STEzHcB1rALV" data-theme="light"></div>
<input type="submit" value="Submit">
</form>
</body>