MC/moe/stag-popups - fix ESC handling

public/js/mc.js

@@ -605,11 +605,13 @@ window.initSegmentMoes = function(_parent) {
         .off('keydown.visit-moe-escape')
         .on('keydown.visit-moe-escape', function (e) {
             if(e.which === 27) {
-                let visibleMoes = $('[visit-moe] [url]:not([show]):visible');
-                if (visibleMoes.length) {
-                    visibleMoes.hide();
-                    markEventAsConsumed(e);
-                    return false;
+                if(!isEventConsumed(e)) {
+                    let visibleMoes = $('[visit-moe] [url]:not([show]):visible');
+                    if (visibleMoes.length) {
+                        visibleMoes.hide();
+                        markEventAsConsumed(e);
+                        return false;
+                    }
                 }
             }
         });

public/js/stag-popup.js

@@ -205,6 +205,9 @@ function hasResponseError(_data) {
                 if(e.which === 27) {
                     if(!isEventConsumed(e)) {
                         if(stagPopupsQueue.length) {
+                            if($('.stag-popup.show [moe] [url]:visible').length || $('.stag-popup.show [visit-moe] [url]:visible').length) {
+                                return;
+                            }
                             closeStagPopup();
                             markEventAsConsumed(e);
                             return false;

yemi.js

@@ -1115,6 +1115,7 @@ $(document).ready(function () {
         .off('keydown.moe-escape')
         .on('keydown.moe-escape', function (e) {
             if(e.which === 27) {
+                if(isEventConsumed(e)) return;
                 let visibleMoes = $('[moe] [url]:not([show]):visible');
                 if (visibleMoes.length) {
                     hideMoeFormMask();