diff --git a/customize.dist/pages.js b/customize.dist/pages.js index ff2b90b40..a966da524 100644 --- a/customize.dist/pages.js +++ b/customize.dist/pages.js @@ -62,7 +62,7 @@ define([ var imprintUrl = AppConfig.imprint && (typeof(AppConfig.imprint) === "boolean" ? '/imprint.html' : AppConfig.imprint); - Pages.versionString = "v4.3.0"; + Pages.versionString = "v4.3.1"; // used for the about menu Pages.imprintLink = AppConfig.imprint ? footLink(imprintUrl, 'imprint') : undefined; diff --git a/package-lock.json b/package-lock.json index 447f6a468..3b0286e25 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "cryptpad", - "version": "4.3.0", + "version": "4.3.1", "lockfileVersion": 1, "requires": true, "dependencies": { diff --git a/package.json b/package.json index c059c6bd0..3b540387f 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "cryptpad", "description": "realtime collaborative visual editor with zero knowlege server", - "version": "4.3.0", + "version": "4.3.1", "license": "AGPL-3.0+", "repository": { "type": "git", diff --git a/www/pad/comments.js b/www/pad/comments.js index 8f13c2c7a..6069aa1d0 100644 --- a/www/pad/comments.js +++ b/www/pad/comments.js @@ -578,7 +578,7 @@ define([ // Scroll into view if (!$last.length) { return; } - var visible = UIElements.isVisible($last[0], Env.$inner); + var visible = UIElements.isVisible($last[0], Env.$contentContainer); if (!visible) { $last[0].scrollIntoView(); } }; diff --git a/www/pad/inner.js b/www/pad/inner.js index 96ea320bc..793d57b72 100644 --- a/www/pad/inner.js +++ b/www/pad/inner.js @@ -908,7 +908,7 @@ define([ $(a).click(function (e) { e.preventDefault(); e.stopPropagation(); - if (!obj.el || UIElements.isVisible(obj.el, $inner)) { return; } + if (!obj.el || UIElements.isVisible(obj.el, $contentContainer)) { return; } obj.el.scrollIntoView(); }); a.innerHTML = title; diff --git a/www/pad/links.js b/www/pad/links.js index a79183fa6..779257dfb 100644 --- a/www/pad/links.js +++ b/www/pad/links.js @@ -7,7 +7,10 @@ define([ var onLinkClicked = function (e, inner) { var $target = $(e.target); - if (!$target.is('a')) { return; } + if (!$target.is('a')) { + $target = $target.closest('a'); + if (!$target.length) { return; } + } var href = $target.attr('href'); if (!href) { return; } var $inner = $(inner); @@ -66,7 +69,7 @@ define([ // Bubble to open the link in a new tab $inner.click(function (e) { removeClickedLink($inner); - if (e.target.nodeName.toUpperCase() === 'A') { + if (e.target.nodeName.toUpperCase() === 'A' || $(e.target).closest('a').length) { return void onLinkClicked(e, inner); } });