diff --git a/core/modules/outside_in/js/outside_in.js b/core/modules/outside_in/js/outside_in.js index 1fa192d..b6b47e5 100644 --- a/core/modules/outside_in/js/outside_in.js +++ b/core/modules/outside_in/js/outside_in.js @@ -37,6 +37,13 @@ editLink.click(); } else { + // If not inside an Outside In editable check to see if inside another + // contextual region with a link from the quick-edit module. + var contextualRegion = $(e.target).closest('.contextual-region'); + if (contextualRegion) { + var quickEditLink = contextualRegion.find('li.quickedit a'); + quickEditLink.click(); + } // Otherwise do not allow other links to leave the page. e.preventDefault(); } @@ -111,6 +118,13 @@ $('*').removeAttr('data-outside-in-disabled'); }; + /** + * Disable the QuickEdit module editor if open. + */ + var disableQuickEdit = function () { + $('.quickedit-toolbar button.action-cancel').click(); + }; + var setToggleActiveMode = function setToggleActiveMode(forceActive) { forceActive = forceActive || false; if (forceActive || !isActiveMode()) { @@ -122,6 +136,7 @@ getItemsToToggle().addClass('js-outside-in-edit-mode'); $('.edit-mode-inactive').addClass('visually-hidden'); disableForms(); + disableQuickEdit(); } else { $('#toolbar-bar .contextual-toolbar-tab button').text(Drupal.t('Edit'));