Merge branch 'soon' of github.com:xwiki-labs/cryptpad into soon

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;

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "cryptpad",
-  "version": "4.3.0",
+  "version": "4.3.1",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {

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",

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(); }
             };
 

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;

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);
                 }
             });