Merge branch 'MAGETWO-35079' into PR

Author: guz-anton

app/code/Magento/Catalog/view/base/web/js/price-utils.js

@@ -3,8 +3,9 @@
  * See COPYING.txt for license details.
  */
 define([
+    'jquery',
     'underscore'
-], function (_) {
+], function ($, _) {
     'use strict';
 
     var globalPriceFormat = {

app/code/Magento/Catalog/view/frontend/templates/product/view/options/type/text.phtml

@@ -33,9 +33,9 @@ $class = ($_option->getIsRequire()) ? ' required' : '';
             <input type="text"
                    id="options_<?php echo $_option->getId() ?>_text"
                    class="input-text product-custom-option"
-                   <?php if (!empty($_textValidate)) {
-    echo 'data-validate=' . json_encode($_textValidate);
-} ?>
+                   <?php if (!empty($_textValidate)) {?>
+                   data-validate='<?php echo json_encode($_textValidate);?>'
+                   <?php } ?>
                    name="options[<?php echo $_option->getId() ?>]"
                    value="<?php echo $block->escapeHtml($block->getDefaultValue()) ?>"/>
         <?php elseif ($_option->getType() == \Magento\Catalog\Model\Product\Option::OPTION_TYPE_AREA): ?>
@@ -49,9 +49,9 @@ $class = ($_option->getIsRequire()) ? ' required' : '';
             ?>
             <textarea id="options_<?php echo $_option->getId() ?>_text"
                       class="product-custom-option"
-                      <?php if (!empty($_textAreaValidate)) {
-    echo 'data-validate=' . json_encode($_textAreaValidate);
-} ?>
+                    <?php if (!empty($_textAreaValidate)) {?>
+                        data-validate='<?php echo json_encode($_textAreaValidate);?>'
+                    <?php } ?>
                       name="options[<?php echo $_option->getId() ?>]"
                       rows="5"
                       cols="25"><?php echo $block->escapeHtml($block->getDefaultValue()) ?></textarea>