Merge branch 'MAGETWO-54186' of github.com:magento-frontend/magento2ce into PR

Conflicts:
	app/code/Magento/Catalog/view/frontend/templates/product/view/addtocart.phtml

Author: Karpenko, Oleksandr

app/code/Magento/Catalog/view/frontend/templates/product/view/addtocart.phtml

@@ -40,6 +40,7 @@
     </div>
 </div>
 <?php endif; ?>
+<?php if ($block->isRedirectToCartEnabled()) : ?>
 <script type="text/x-magento-init">
     {
         "#product_addtocart_form": {
@@ -49,11 +50,11 @@
         }
     }
 </script>
-<?php if (!$block->isRedirectToCartEnabled()) : ?>
+<?php else : ?>
 <script type="text/x-magento-init">
     {
         "#product_addtocart_form": {
-            "catalogAddToCart": {}
+            "Magento_Catalog/js/validate-product": {}
         }
     }
 </script>

app/code/Magento/Catalog/view/frontend/web/js/validate-product.js

@@ -0,0 +1,48 @@
+/**
+ * Copyright © 2016 Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+define([
+    'jquery',
+    'mage/mage',
+    'Magento_Catalog/product/view/validation',
+    'catalogAddToCart'
+], function ($) {
+    'use strict';
+
+    $.widget('mage.productValidate', {
+        options: {
+            bindSubmit: false,
+            radioCheckboxClosest: '.nested'
+        },
+
+        /**
+         * Uses Magento's validation widget for the form object.
+         * @private
+         */
+        _create: function () {
+            var bindSubmit = this.options.bindSubmit;
+
+            this.element.validation({
+                radioCheckboxClosest: this.options.radioCheckboxClosest,
+
+                /**
+                 * Uses catalogAddToCart widget as submit handler.
+                 * @param {Object} form
+                 * @returns {Boolean}
+                 */
+                submitHandler: function (form) {
+                    var jqForm = $(form).catalogAddToCart({
+                        bindSubmit: bindSubmit
+                    });
+
+                    jqForm.catalogAddToCart('submitForm', jqForm);
+
+                    return false;
+                }
+            });
+        }
+    });
+
+    return $.mage.productValidate;
+});