From 0c74be7ae2dddfcddf933480331186394d5bb50e Mon Sep 17 00:00:00 2001
From: Alex Pott <alex.a.pott@googlemail.com>
Date: Sun, 31 May 2020 12:21:06 +0100
Subject: Issue #2891603 by eiriksm, alexpott, charlietoleary, Grayle, drclaw,
 fgm: Contextual links can't handle multiple occurrences of the same
 contextual links (again)

---
 core/modules/contextual/js/contextual.es6.js | 4 +++-
 core/modules/contextual/js/contextual.js     | 2 +-
 2 files changed, 4 insertions(+), 2 deletions(-)

(limited to 'core/modules/contextual/js')

diff --git a/core/modules/contextual/js/contextual.es6.js b/core/modules/contextual/js/contextual.es6.js
index 2b26ee2a837..86f76980e25 100644
--- a/core/modules/contextual/js/contextual.es6.js
+++ b/core/modules/contextual/js/contextual.es6.js
@@ -186,7 +186,9 @@
           // Drupal.contextual.collection.
           window.setTimeout(() => {
             initContextual(
-              $context.find(`[data-contextual-id="${contextualID.id}"]`),
+              $context
+                .find(`[data-contextual-id="${contextualID.id}"]:empty`)
+                .eq(0),
               html,
             );
           });
diff --git a/core/modules/contextual/js/contextual.js b/core/modules/contextual/js/contextual.js
index 97a7453d3f6..62c9e2c3215 100644
--- a/core/modules/contextual/js/contextual.js
+++ b/core/modules/contextual/js/contextual.js
@@ -108,7 +108,7 @@
 
         if (html && html.length) {
           window.setTimeout(function () {
-            initContextual($context.find("[data-contextual-id=\"".concat(contextualID.id, "\"]")), html);
+            initContextual($context.find("[data-contextual-id=\"".concat(contextualID.id, "\"]:empty")).eq(0), html);
           });
           return;
         }
-- 
cgit v1.2.3