ENGCOM-6272: WYSIWYG-Editor Insert Image-Popup is not working correctly with multiple WYSIWYG-Editors on page #25556

Author: VladimirZaets

lib/web/mage/adminhtml/browser.js

@@ -11,11 +11,12 @@ define([
     'Magento_Ui/js/modal/prompt',
     'Magento_Ui/js/modal/confirm',
     'Magento_Ui/js/modal/alert',
+    'underscore',
     'Magento_Ui/js/modal/modal',
     'jquery/ui',
     'jquery/jstree/jquery.jstree',
     'mage/mage'
-], function ($, wysiwyg, prompt, confirm, alert) {
+], function ($, wysiwyg, prompt, confirm, alert, _) {
     window.MediabrowserUtility = {
         windowId: 'modal_dialog_message',
         modalLoaded: false,
@@ -52,16 +53,21 @@ define([
                 content = '<div class="popup-window" id="' + windowId + '"></div>',
                 self = this;
 
-            if (this.modalLoaded === true &&
-                options &&
+            if (options &&
                 self.targetElementId &&
-                self.targetElementId === options.targetElementId
-            ) {
+                self.targetElementId === options.targetElementId) {
                 if (typeof options.closed !== 'undefined') {
                     this.modal.modal('option', 'closed', options.closed);
                 }
                 this.modal.modal('openModal');
 
+                return;
+            } else if (_.isUndefined(options) &&
+                    self.modalLoaded === true &&
+                    self.targetElementId === url
+            ) {
+                this.modal.modal('openModal');
+
                 return;
             }
 
@@ -89,8 +95,11 @@ define([
             }).done(function (data) {
                 self.modal.html(data).trigger('contentUpdated');
                 self.modalLoaded = true;
-                self.targetElementId = options.targetElementId;
+                self.targetElementId = options ?
+                           options.targetElementId
+                           : url;
             });
+
         },
 
         /**
@@ -487,7 +496,7 @@ define([
                 var nodeData = $(element).data('node');
 
                 if (index > 0) {
-                    breadcrumbs.append($('<li>\/</li>'));
+                    breadcrumbs.append($('<li>\/</li>')); //eslint-disable-line
                 }
                 breadcrumbs.append($('<li />')
                     .data('node', nodeData).attr('data-row', 'breadcrumb').text(nodeData.text));

lib/web/mage/adminhtml/wysiwyg/tiny_mce/tinymce4Adapter.js

@@ -375,7 +375,7 @@ define([
          */
         openFileBrowser: function (o) {
             var typeTitle = this.translate('Select Images'),
-                storeId = this.config['store_id'] !== null ? this.config['store_id'] : 0,
+                storeId = this.config['store_id'] ? this.config['store_id'] : 0,
                 frameDialog = jQuery('div.mce-container[role="dialog"]'),
                 self = this,
                 wUrl = this.config['files_browser_window_url'] +