Merge branch 'MC-2294' into team3-delivery

Author: irenelagno

app/code/Magento/Cms/Test/Mftf/Section/TinyMCESection.xml

@@ -36,7 +36,7 @@
         <element name="Browse" type="button" selector=".mce-i-browse"/>
         <element name="BrowseUploadImage" type="file" selector=".fileupload" />
         <element name="image" type="text" selector="//small[text()='{{var1}}']" parameterized="true"/>
-        <element name="imageOrImageCopy" type="text" selector="//img[contains(@alt, '{{arg1}}.{{arg2}}')]|//img[contains(@alt,'{{arg1}}_') and contains(@alt,'.{{arg2}}')]" parameterized="true"/>
+        <element name="imageOrImageCopy" type="text" selector="//div[contains(@class,'media-gallery-modal')]//img[contains(@alt, '{{arg1}}.{{arg2}}')]|//img[contains(@alt,'{{arg1}}_') and contains(@alt,'.{{arg2}}')]" parameterized="true"/>
         <element name="imageSelected" type="text" selector="//small[text()='{{var1}}']/parent::*[@class='filecnt selected']" parameterized="true"/>
         <element name="ImageSource" type="input" selector=".mce-combobox.mce-abs-layout-item.mce-last.mce-has-open" />
         <element name="ImageDescription" type="input" selector=".mce-textbox.mce-abs-layout-item.mce-last" />

app/code/Magento/Ui/view/base/web/js/form/element/abstract.js

@@ -407,7 +407,7 @@ define([
             this.bubble('error', message);
 
             //TODO: Implement proper result propagation for form
-            if (!isValid) {
+            if (this.source && !isValid) {
                 this.source.set('params.invalid', true);
             }
 

app/code/Magento/Ui/view/base/web/js/form/element/file-uploader.js

@@ -6,6 +6,7 @@
 /**
  * @api
  */
+/* global Base64 */
 define([
     'jquery',
     'underscore',
@@ -168,6 +169,10 @@ define([
         processFile: function (file) {
             file.previewType = this.getFilePreviewType(file);
 
+            if (!file.id && file.name) {
+                file.id = Base64.mageEncode(file.name).replace(/g/);
+            }
+
             this.observe.call(file, true, [
                 'previewWidth',
                 'previewHeight'

app/code/Magento/Ui/view/base/web/js/form/element/image-uploader.js

@@ -17,6 +17,15 @@ define([
     'use strict';
 
     return Element.extend({
+        /**
+         * {@inheritDoc}
+         */
+        initialize: function () {
+            this._super();
+
+            // Listen for file deletions from the media browser
+            $(window).on('fileDeleted.mediabrowser', this.onDeleteFile.bind(this));
+        },
 
         /**
          * Assign uid for media gallery
@@ -76,6 +85,40 @@ define([
             browser.openDialog(openDialogUrl, null, null, this.mediaGallery.openDialogTitle);
         },
 
+        /**
+         * @param {jQuery.event} e
+         * @param {Object} data
+         * @returns {Object} Chainables
+         */
+        onDeleteFile: function (e, data) {
+            var fileId = this.getFileId(),
+                deletedFileIds = data.ids;
+
+            if (fileId && $.inArray(fileId, deletedFileIds) > -1) {
+                this.clear();
+            }
+
+            return this;
+        },
+
+        /**
+         * {@inheritDoc}
+         */
+        clear: function () {
+            this.value([]);
+
+            return this;
+        },
+
+        /**
+         * Gets the ID of the file used if set
+         *
+         * @return {String|Null} ID
+         */
+        getFileId: function () {
+            return this.hasData() ? this.value()[0].id : null;
+        },
+
         /**
          * Trigger native browser file upload UI via clicking on 'Upload' button
          *

lib/web/mage/adminhtml/browser.js

@@ -435,6 +435,10 @@ define([
                         }).done($.proxy(function () {
                             self.reload();
                             self.element.find('#delete_files').toggleClass(self.options.hidden, true);
+
+                            $(window).trigger('fileDeleted.mediabrowser', {
+                                ids: ids
+                            });
                         }, this));
                     },