Merge pull request #137 from magento-webdev/PR-1

[WebDev + Vanilla] Bugfixes

Author: Korshenko, Olexii(okorshenko)

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

@@ -386,9 +386,12 @@ define([
                 var priceType = $('#' + this.options.fieldId + '_' + data.id + '_select_' + data.select_id + '_price_type');
                 priceType.val(data.price_type).attr('data-store-label', data.price_type);
             }
+
             this._bindUseDefault(this.options.fieldId + '_' + data.id + '_select_' + data.select_id, data);
             this.refreshSortableElements();
             this.options.selectionItemCount[data.id] = parseInt(this.options.selectionItemCount[data.id], 10) + 1;
+
+            $('#' + this.options.fieldId + '_' + data.id + '_select_' + data.select_id + '_title').focus();
         },
 
         /**

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/adminhtml/Magento/backend/Magento_Catalog/web/css/source/_module.less

@@ -3,6 +3,18 @@
 //  * See COPYING.txt for license details.
 //  */
 
+//
+//  Catalog product grid
+//  ---------------------------------------------
+
+.catalog-product-index {
+    .admin__data-grid-wrap {
+        .data-row {
+            cursor: pointer;
+        }
+    }
+}
+
 .product-composite-configure-inner {
     .admin__control-text {
         &.qty {

app/design/adminhtml/Magento/backend/web/css/styles-old.less

@@ -795,6 +795,7 @@
         height: 33px;
         &:focus {
             border-color: #007bdb;
+            box-shadow: none;
             outline: 0;
         }
     }
@@ -874,6 +875,7 @@
         transition: all 0.1s ease-in;
         &:focus {
             border-color: #007bdb;
+            box-shadow: none;
             outline: 0;
         }
         &[disabled] {

app/design/frontend/Magento/blank/Magento_Catalog/web/css/source/_module.less

@@ -604,6 +604,8 @@
 
     .table-wrapper.comparison {
         clear: both;
+        max-width: 100%;
+        overflow-x: auto;
     }
 
     .table-comparison {

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/blank/web/css/source/components/_modals_extend.less

@@ -26,6 +26,8 @@
 @modal-action-close__font-size: 32px;
 @modal-action-close__hover__color: darken(@primary__color, 10%);
 
+@modal-slide-action-close__padding: @modal-slide-header__padding-vertical - 1rem @modal-popup__padding - 1rem;
+
 //
 //  Common
 //  _____________________________________________
@@ -75,7 +77,7 @@
 
     .modal-slide {
         .action-close {
-            padding: @modal-slide-header__padding-vertical @modal-slide__padding;
+            padding: @modal-slide-action-close__padding;
         }
         .page-main-actions {
             margin-top: @modal-slide-header__padding-vertical;