Merge remote-tracking branch 'origin/develop' into magento-mpi-MC-29890

Author: bubasuma

app/code/Magento/PageBuilder/Model/Stage/Preview.php

@@ -42,6 +42,11 @@ class Preview
      */
     private $scopeConfig;
 
+    /**
+     * @var bool
+     */
+    private $isPreview = false;
+
     /**
      * Preview constructor.
      * @param \Magento\Store\Model\App\Emulation $emulation
@@ -67,11 +72,6 @@ public function __construct(
         $this->scopeConfig = $scopeConfig;
     }
 
-    /**
-     * @var bool
-     */
-    private $isPreview;
-
     /**
      * Retrieve the area in which the preview needs to be ran in
      *

app/code/Magento/PageBuilder/view/adminhtml/web/js/form/element/image-uploader.js

@@ -235,6 +235,19 @@ define([
         hasData: function () {
             // Some of the components automatically add an empty object if the value is unset.
             return this._super() && !$.isEmptyObject(this.value()[0]);
+        },
+
+        /**
+         * Stop event to prevent it from reaching any objects other than the current object.
+         *
+         * @param {Object} uploader
+         * @param {Event} event
+         * @returns {Boolean}
+         */
+        stopEvent: function (uploader, event) {
+            event.stopPropagation();
+
+            return true;
         }
     });
 });

app/code/Magento/PageBuilder/view/adminhtml/web/js/property/link.js

@@ -10,11 +10,16 @@
         <div class="pagebuilder-options-wrapper">
             <ul class="pagebuilder-options-links">
                 <li class="pagebuilder-options-link">
-                    <label class="file-uploader-button action-default" attr="for: uid" disable="disabled" translate="translations.uploadNewImage" />
+                    <label
+                        data-bind="event: {mousedown: stopEvent}"
+                        class="file-uploader-button action-default"
+                        attr="for: uid"
+                        disable="disabled"
+                        translate="translations.uploadNewImage" />
                 </li>
                 <li class="pagebuilder-options-link">
                     <label
-                        data-bind="event: {change: addFileFromMediaGallery, click: openMediaBrowserDialog}"
+                        data-bind="event: {change: addFileFromMediaGallery, click: openMediaBrowserDialog, mousedown: stopEvent}"
                         class="file-uploader-button action-default"
                         attr="id: mediaGalleryUid, 'data-id': getFileId()"
                         disable="disabled"

app/code/Magento/PageBuilder/view/adminhtml/web/template/form/element/uploader/preview/image.html

@@ -50,7 +50,7 @@ export default class Link implements PropertyReaderInterface {
         const attributeIdMatches = href.match(regexp);
 
         if (!attributeIdMatches) {
-            return "";
+            return href;
         }
 
         return attributeIdMatches[1];