Merge remote-tracking branch 'vanilla/PR' into PR-1

Author: Evgeniy Kolesov

app/code/Magento/Catalog/view/adminhtml/web/js/options.js

@@ -41,6 +41,10 @@ define([
                     if (!data.intype) {
                         data.intype = optionDefaultInputType;
                     }
+
+                    if (!this.totalItems) {
+                        data.checked = 'checked';
+                    }
                     element = this.template({
                         data: data
                     });

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

@@ -506,7 +506,7 @@ define([
             var self = this;
 
             $image.find('.magnify-lens').remove();
-            $image.on('click', function () {
+            $image.on('click tap', function () {
                 if ($(this).hasClass('video-unplayed') && $(this).find('iframe').length === 0) {
                     $('.fotorama__arr--next').hide();
                     $('.fotorama__arr--prev').hide();

app/code/Magento/Swatches/view/adminhtml/web/js/text.js

@@ -40,6 +40,9 @@ define([
                         data.intype = swatchOptionTextDefaultInputType;
                     }
 
+                    if (!this.totalItems) {
+                        data.checked = 'checked';
+                    }
                     element = this.template({
                         data: data
                     });
@@ -110,7 +113,6 @@ define([
 
                     if (from === arrayLength) {
                         this.updateItemsCountField();
-                        this.bindRemoveButtons();
                         this.rendered = 1;
                         jQuery('body').trigger('processStop');
 

app/code/Magento/Swatches/view/adminhtml/web/js/visual.js

@@ -42,6 +42,10 @@ define([
                     if (!data.intype) {
                         data.intype = swatchOptionVisualDefaultInputType;
                     }
+
+                    if (!this.totalItems) {
+                        data.checked = 'checked';
+                    }
                     element = this.template({
                         data: data
                     });

app/design/frontend/Magento/blank/etc/view.xml

@@ -221,7 +221,7 @@
             <var name="width"></var> <!-- Width of magnifier block -->
             <var name="height"></var> <!-- Height of magnifier block -->
             <var name="eventType">hover</var> <!-- Action that atcivates zoom (hover/click) -->
-            <var name="enabled">true</var> <!-- Turn on/off magnifier (true/false) -->
+            <var name="enabled">false</var> <!-- Turn on/off magnifier (true/false) -->
         </var>
 
         <var name="breakpoints">
@@ -233,9 +233,6 @@
                     <var name="options">
                         <var name="navigation">dots</var>
                     </var>
-                    <var name="magnifierOpts">
-                        <var name="enabled">false</var>
-                    </var>
                 </var>
             </var>
         </var>

app/design/frontend/Magento/luma/etc/view.xml

@@ -225,7 +225,7 @@
             <var name="width"></var> <!-- Width of magnifier block -->
             <var name="height"></var> <!-- Height of magnifier block -->
             <var name="eventType">hover</var> <!-- Action that atcivates zoom (hover/click) -->
-            <var name="enabled">true</var> <!-- Turn on/off magnifier (true/false) -->
+            <var name="enabled">false</var> <!-- Turn on/off magnifier (true/false) -->
         </var>
 
         <var name="breakpoints">
@@ -237,9 +237,6 @@
                     <var name="options">
                         <var name="nav">dots</var>
                     </var>
-                    <var name="magnifierOpts">
-                        <var name="enabled">false</var>
-                    </var>
                 </var>
             </var>
         </var>

lib/web/mage/validation.js

@@ -1242,7 +1242,7 @@
         'required-swatch-entry': [
             function (value, element) {
                 var empty = $(element).closest('table')
-                    .find('input.required-option')
+                    .find('input.required-option:visible')
                     .filter(function(i, el){
                         return $.mage.isEmpty(el.value);
                     })

lib/web/magnifier/magnifier.js

@@ -488,15 +488,21 @@
                 } else {
                     var top = options.top + 'px';
                 }
-                largeWrapper[0].style.top = top.replace("%px", "%");
+
+                if (largeWrapper.length) {
+                    largeWrapper[0].style.top = top.replace("%px", "%");
+                }
             }
             if (options.left) {
                 if (typeof options.left == 'function') {
                     var left = options.left() + 'px';
                 } else {
                     var left = options.left + 'px';
                 }
-                largeWrapper[0].style.left = left.replace("%px", "%");
+
+                if (largeWrapper.length) {
+                    largeWrapper[0].style.left = left.replace("%px", "%");
+                }
             }
 
             data[idx] = {