Fix issue with WYSIWYG editors magento/adobe-stock-integration/issues…

…/622
magento · Nov 11, 2019 · f229056 · f229056
1 parent 3efbe15
commit f229056
Showing 1 changed file with 8 additions and 9 deletions.
diff --git a/lib/web/mage/adminhtml/browser.js b/lib/web/mage/adminhtml/browser.js
@@ -51,13 +51,12 @@ define([
             var windowId = this.windowId,
                 content = '<div class="popup-window" id="' + windowId + '"></div>',
                 self = this;
-
-            if (this.modalLoaded === true &&
-                options &&
-                self.targetElementId &&
-                self.targetElementId === options.targetElementId
-            ) {
-                if (typeof options.closed !== 'undefined') {
+
+		if (this.modalLoaded === true
+                   || (self.targetElementId
+                   && self.targetElementId === options.targetElementId)) {
+
+		if (options && typeof options.closed !== 'undefined') {
                     this.modal.modal('option', 'closed', options.closed);
                 }
                 this.modal.modal('openModal');
@@ -89,9 +88,9 @@ define([
             }).done(function (data) {
                 self.modal.html(data).trigger('contentUpdated');
                 self.modalLoaded = true;
-                self.targetElementId = options.targetElementId;
+		options ? self.targetElementId = options.targetElementId : ''; 
             });
-        },
+	},
 
         /**
          * Close dialog.