Merge remote-tracking branch 'tsg-csl3/2.3-develop-pr15' into pr

Author: Joan He

app/code/Magento/Msrp/view/base/web/js/msrp.js

@@ -73,6 +73,7 @@ define([
                 this.initTierPopup();
             }
             $(this.options.cartButtonId).on('click', this._addToCartSubmit.bind(this));
+            $(this.options.cartForm).on('submit', this._onSubmitForm.bind(this));
         },
 
         /**
@@ -249,8 +250,10 @@ define([
 
         /**
          * Handler for addToCart action
+         *
+         * @param {Object} e
          */
-        _addToCartSubmit: function () {
+        _addToCartSubmit: function (e) {
             this.element.trigger('addToCart', this.element);
 
             if (this.element.data('stop-processing')) {
@@ -266,8 +269,20 @@ define([
             if (this.options.addToCartUrl) {
                 $('.mage-dropdown-dialog > .ui-dialog-content').dropdownDialog('close');
             }
+
+            e.preventDefault();
             $(this.options.cartForm).submit();
+        },
 
+        /**
+         * Handler for submit form
+         *
+         * @private
+         */
+        _onSubmitForm: function () {
+            if ($(this.options.cartForm).valid()) {
+                $(this.options.cartButtonId).prop('disabled', true);
+            }
         }
     });
 

app/code/Magento/ProductVideo/view/frontend/web/js/fotorama-add-video-events.js

@@ -177,12 +177,14 @@ define([
          * @private
          */
         clearEvents: function () {
-            this.fotoramaItem.off(
-                'fotorama:show.' + this.PV +
-                ' fotorama:showend.' + this.PV +
-                ' fotorama:fullscreenenter.' + this.PV +
-                ' fotorama:fullscreenexit.' + this.PV
-            );
+            if (this.fotoramaItem !== undefined) {
+                this.fotoramaItem.off(
+                    'fotorama:show.' + this.PV +
+                    ' fotorama:showend.' + this.PV +
+                    ' fotorama:fullscreenenter.' + this.PV +
+                    ' fotorama:fullscreenexit.' + this.PV
+                );
+            }
         },
 
         /**

app/code/Magento/Swatches/view/frontend/web/js/swatch-renderer.js

@@ -1229,7 +1229,10 @@ define([
                 }
 
                 imagesToUpdate = this._setImageIndex(imagesToUpdate);
-                gallery.updateData(imagesToUpdate);
+
+                if (!_.isUndefined(gallery)) {
+                    gallery.updateData(imagesToUpdate);
+                }
 
                 if (isInitial) {
                     $(this.options.mediaGallerySelector).AddFotoramaVideoEvents();

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

@@ -18,6 +18,7 @@ define([
     'use strict';
 
     return Abstract.extend({
+        currentWysiwyg: undefined,
         defaults: {
             elementSelector: 'textarea',
             suffixRegExpPattern: '${ $.wysiwygUniqueSuffix }',
@@ -53,6 +54,10 @@ define([
 
             // disable editor completely after initialization is field is disabled
             varienGlobalEvents.attachEventHandler('wysiwygEditorInitialized', function () {
+                if (!_.isUndefined(window.tinyMceEditors)) {
+                    this.currentWysiwyg = window.tinyMceEditors[this.wysiwygId];
+                }
+
                 if (this.disabled()) {
                     this.setDisabled(true);
                 }
@@ -136,14 +141,9 @@ define([
             }
 
             /* eslint-disable no-undef */
-            if (typeof wysiwyg !== 'undefined' && wysiwyg.activeEditor()) {
-                if (wysiwyg && disabled) {
-                    wysiwyg.setEnabledStatus(false);
-                    wysiwyg.getPluginButtons().prop('disabled', 'disabled');
-                } else if (wysiwyg) {
-                    wysiwyg.setEnabledStatus(true);
-                    wysiwyg.getPluginButtons().removeProp('disabled');
-                }
+            if (!_.isUndefined(this.currentWysiwyg) && this.currentWysiwyg.activeEditor()) {
+                this.currentWysiwyg.setEnabledStatus(!disabled);
+                this.currentWysiwyg.getPluginButtons().prop('disabled', disabled);
             }
         }
     });