diff --git a/core/modules/contextual/js/contextual.js b/core/modules/contextual/js/contextual.js index 7f93a15..d73da6a 100644 --- a/core/modules/contextual/js/contextual.js +++ b/core/modules/contextual/js/contextual.js @@ -108,7 +108,7 @@ .find('.contextual'); // Early-return when there's no nesting. - if ($contextuals.length === 1) { + if ($contextuals.length <= 1) { return; } diff --git a/core/modules/quickedit/js/quickedit.js b/core/modules/quickedit/js/quickedit.js index 40bdd3e..ee8c93d 100644 --- a/core/modules/quickedit/js/quickedit.js +++ b/core/modules/quickedit/js/quickedit.js @@ -375,6 +375,12 @@ var $lowestCommonParent = $(entityElementSelector).parents().has(fieldElement).first(); entityElement = $lowestCommonParent.find(entityElementSelector); } + + // Prevent errors if the necessary entity markup is missing. + if (entityElement.length === 0) { + return; + } + var entityInstanceID = entityElement .get(0) .getAttribute('data-quickedit-entity-instance-id');