Skip to content

Commit f0c4347

Browse files
magento-engcom-teammagento-engcom-team
authored
🔃 [EngCom] Public Pull Requests - 2.3-develop
Accepted Public Pull Requests: - #17293: Fixed a couple of typos (by @dverkade) - #17209: [Forwardport] Resolved : Mobile device style groups incorrect order (by @torhoehn) - #17201: [Forwardport] Update template.js (by @mage2pratik) - #17206: [Forwardport] Remove spaces around amount span. (by @torhoehn) - #17198: [Forwardport] Disable autocomplete for captcha inputs (by @mage2pratik) - #17228: Fix minor css issues (by @arnoudhgz) - #17266: [Forwardport] Replaced deprecated methods. (by @mageprince) Fixed GitHub Issues: - #14476: Mobile device style groups incorrect order in _responsive.less (reported by @damiandawber) has been fixed in #17209 by @torhoehn in 2.3-develop branch Related commits: 1. 647f2fa
2 parents 48f1e41 + a6efa4b commit f0c4347

File tree

15 files changed

+38
-36
lines changed

15 files changed

+38
-36
lines changed

‎app/code/Magento/Captcha/view/frontend/templates/default.phtml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ $captcha = $block->getCaptchaModel();
1414
<div class="field captcha required" role="<?= $block->escapeHtmlAttr($block->getFormId()) ?>">
1515
<label for="captcha_<?= $block->escapeHtmlAttr($block->getFormId()) ?>" class="label"><span><?= $block->escapeHtml(__('Please type the letters and numbers below')) ?></span></label>
1616
<div class="control captcha">
17-
<input name="<?= $block->escapeHtmlAttr(\Magento\Captcha\Helper\Data::INPUT_NAME_FIELD_VALUE) ?>[<?= $block->escapeHtmlAttr($block->getFormId()) ?>]" type="text" class="input-text required-entry" data-validate="{required:true}" id="captcha_<?= $block->escapeHtmlAttr($block->getFormId()) ?>" />
17+
<input name="<?= $block->escapeHtmlAttr(\Magento\Captcha\Helper\Data::INPUT_NAME_FIELD_VALUE) ?>[<?= $block->escapeHtmlAttr($block->getFormId()) ?>]" type="text" class="input-text required-entry" data-validate="{required:true}" id="captcha_<?= $block->escapeHtmlAttr($block->getFormId()) ?>" autocomplete="off"/>
1818
<div class="nested">
1919
<div class="field captcha no-label"
2020
data-captcha="<?= $block->escapeHtmlAttr($block->getFormId()) ?>"

‎app/code/Magento/Captcha/view/frontend/web/template/checkout/captcha.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
<div class="field captcha required" data-bind="blockLoader: getIsLoading()">
99
<label data-bind="attr: {for: 'captcha_' + formId}" class="label"><span data-bind="i18n: 'Please type the letters and numbers below'"></span></label>
1010
<div class="control captcha">
11-
<input name="captcha_string" type="text" class="input-text required-entry" data-bind="value: captchaValue(), attr: {id: 'captcha_' + formId, 'data-scope': dataScope}" />
11+
<input name="captcha_string" type="text" class="input-text required-entry" data-bind="value: captchaValue(), attr: {id: 'captcha_' + formId, 'data-scope': dataScope}" autocomplete="off"/>
1212
<input name="captcha_form_id" type="hidden" data-bind="value: formId, attr: {'data-scope': dataScope}" />
1313
<div class="nested">
1414
<div class="field captcha no-label">

‎app/code/Magento/Catalog/view/base/templates/product/price/amount/default.phtml

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,8 @@
1919
<?= ($block->getPriceDisplayLabel()) ? 'data-label="' . $block->getPriceDisplayLabel() . $block->getPriceDisplayInclExclTaxes() . '"' : '' ?>
2020
data-price-amount="<?= /* @escapeNotVerified */ $block->getDisplayValue() ?>"
2121
data-price-type="<?= /* @escapeNotVerified */ $block->getPriceType() ?>"
22-
class="price-wrapper <?= /* @escapeNotVerified */ $block->getPriceWrapperCss() ?>">
23-
<?= /* @escapeNotVerified */ $block->formatCurrency($block->getDisplayValue(), (bool)$block->getIncludeContainer()) ?>
24-
</span>
22+
class="price-wrapper <?= /* @escapeNotVerified */ $block->getPriceWrapperCss() ?>"
23+
><?= /* @escapeNotVerified */ $block->formatCurrency($block->getDisplayValue(), (bool)$block->getIncludeContainer()) ?></span>
2524
<?php if ($block->hasAdjustmentsHtml()): ?>
2625
<?= $block->getAdjustmentsHtml() ?>
2726
<?php endif; ?>

‎app/code/Magento/CatalogRule/Controller/Adminhtml/Promo/Catalog/ApplyRules.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,14 +25,14 @@ public function execute()
2525
$ruleJob->applyAll();
2626

2727
if ($ruleJob->hasSuccess()) {
28-
$this->messageManager->addSuccess($ruleJob->getSuccess());
28+
$this->messageManager->addSuccessMessage($ruleJob->getSuccess());
2929
$this->_objectManager->create(\Magento\CatalogRule\Model\Flag::class)->loadSelf()->setState(0)->save();
3030
} elseif ($ruleJob->hasError()) {
31-
$this->messageManager->addError($errorMessage . ' ' . $ruleJob->getError());
31+
$this->messageManager->addErrorMessage($errorMessage . ' ' . $ruleJob->getError());
3232
}
3333
} catch (\Exception $e) {
3434
$this->_objectManager->create(\Psr\Log\LoggerInterface::class)->critical($e);
35-
$this->messageManager->addError($errorMessage);
35+
$this->messageManager->addErrorMessage($errorMessage);
3636
}
3737

3838
/** @var \Magento\Backend\Model\View\Result\Redirect $resultRedirect */

‎app/code/Magento/CatalogRule/Controller/Adminhtml/Promo/Catalog/Delete.php

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -25,21 +25,21 @@ public function execute()
2525
$ruleRepository->deleteById($id);
2626

2727
$this->_objectManager->create(\Magento\CatalogRule\Model\Flag::class)->loadSelf()->setState(1)->save();
28-
$this->messageManager->addSuccess(__('You deleted the rule.'));
28+
$this->messageManager->addSuccessMessage(__('You deleted the rule.'));
2929
$this->_redirect('catalog_rule/*/');
3030
return;
3131
} catch (LocalizedException $e) {
32-
$this->messageManager->addError($e->getMessage());
32+
$this->messageManager->addErrorMessage($e->getMessage());
3333
} catch (\Exception $e) {
34-
$this->messageManager->addError(
34+
$this->messageManager->addErrorMessage(
3535
__('We can\'t delete this rule right now. Please review the log and try again.')
3636
);
3737
$this->_objectManager->get(\Psr\Log\LoggerInterface::class)->critical($e);
3838
$this->_redirect('catalog_rule/*/edit', ['id' => $this->getRequest()->getParam('id')]);
3939
return;
4040
}
4141
}
42-
$this->messageManager->addError(__('We can\'t find a rule to delete.'));
42+
$this->messageManager->addErrorMessage(__('We can\'t find a rule to delete.'));
4343
$this->_redirect('catalog_rule/*/');
4444
}
4545
}

‎app/code/Magento/CatalogRule/Controller/Adminhtml/Promo/Catalog/Edit.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ public function execute()
2424
try {
2525
$model = $ruleRepository->get($id);
2626
} catch (\Magento\Framework\Exception\NoSuchEntityException $exception) {
27-
$this->messageManager->addError(__('This rule no longer exists.'));
27+
$this->messageManager->addErrorMessage(__('This rule no longer exists.'));
2828
$this->_redirect('catalog_rule/*');
2929
return;
3030
}

‎app/code/Magento/CatalogRule/Controller/Adminhtml/Promo/Catalog/Save.php

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ public function execute()
6868
$validateResult = $model->validateData(new \Magento\Framework\DataObject($data));
6969
if ($validateResult !== true) {
7070
foreach ($validateResult as $errorMessage) {
71-
$this->messageManager->addError($errorMessage);
71+
$this->messageManager->addErrorMessage($errorMessage);
7272
}
7373
$this->_getSession()->setPageData($data);
7474
$this->dataPersistor->set('catalog_rule', $data);
@@ -88,7 +88,7 @@ public function execute()
8888

8989
$ruleRepository->save($model);
9090

91-
$this->messageManager->addSuccess(__('You saved the rule.'));
91+
$this->messageManager->addSuccessMessage(__('You saved the rule.'));
9292
$this->_objectManager->get(\Magento\Backend\Model\Session::class)->setPageData(false);
9393
$this->dataPersistor->clear('catalog_rule');
9494

@@ -111,9 +111,9 @@ public function execute()
111111
}
112112
return;
113113
} catch (LocalizedException $e) {
114-
$this->messageManager->addError($e->getMessage());
114+
$this->messageManager->addErrorMessage($e->getMessage());
115115
} catch (\Exception $e) {
116-
$this->messageManager->addError(
116+
$this->messageManager->addErrorMessage(
117117
__('Something went wrong while saving the rule data. Please review the error log.')
118118
);
119119
$this->_objectManager->get(\Psr\Log\LoggerInterface::class)->critical($e);

‎app/code/Magento/CatalogRule/Plugin/Indexer/Product/Attribute.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,7 @@ protected function checkCatalogRulesAvailability($attributeCode)
103103

104104
if ($disabledRulesCount) {
105105
$this->ruleProductProcessor->markIndexerAsInvalid();
106-
$this->messageManager->addWarning(
106+
$this->messageManager->addWarningMessage(
107107
__(
108108
'You disabled %1 Catalog Price Rules based on "%2" attribute.',
109109
$disabledRulesCount,

‎app/code/Magento/Ui/view/base/web/js/grid/columns/multiselect.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -259,7 +259,7 @@ define([
259259
* Returns identifier of a record.
260260
*
261261
* @param {*} id - Id of a record or its' index in a rows array.
262-
* @param {Boolean} [isIndex=false] - Flag that specifies whith what
262+
* @param {Boolean} [isIndex=false] - Flag that specifies with what
263263
* kind of identifier we are dealing with.
264264
* @returns {*}
265265
*/

‎app/code/Magento/Ui/view/base/web/js/grid/filters/filters.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -257,7 +257,7 @@ define([
257257
/**
258258
* Creates filter component configuration associated with the provided column.
259259
*
260-
* @param {Column} column - Column component whith a basic filter declaration.
260+
* @param {Column} column - Column component with a basic filter declaration.
261261
* @returns {Object} Filters' configuration.
262262
*/
263263
buildFilter: function (column) {
@@ -331,7 +331,7 @@ define([
331331
},
332332

333333
/**
334-
* Finds filters whith a not empty data
334+
* Finds filters with a not empty data
335335
* and sets them to the 'active' filters array.
336336
*
337337
* @returns {Filters} Chainable.

‎dev/tests/integration/testsuite/Magento/Tax/Model/TaxRuleRepositoryTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,7 @@ public function testSave()
109109
* @expectedExceptionMessage No such entity with taxRuleId = 9999
110110
* @magentoDbIsolation enabled
111111
*/
112-
public function testSaveThrowsExceptionIdTargetTaxRulDoesNotExist()
112+
public function testSaveThrowsExceptionIdIfTargetTaxRuleDoesNotExist()
113113
{
114114
$taxRuleDataObject = $this->taxRuleFactory->create();
115115
$taxRuleDataObject->setId(9999)

‎lib/internal/Magento/Framework/View/Test/Unit/Url/_files/sourceImport.css

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22
* Copyright © Magento, Inc. All rights reserved.
33
* See COPYING.txt for license details.
44
*/
5-
body {background: url(body.gif);}
65
@import url(../recursive.css);
7-
p {background: url(1.gif?param);}
86
@import url("deep/recursive.css");
7+
body {background: url(body.gif);}
8+
p {background: url(1.gif?param);}
99
h1 {background: url('../h1.gif#param');} h2 {background: url(../images/h2.gif?test);}

‎lib/web/css/docs/docs.css

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎lib/web/css/source/lib/_responsive.less

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -27,24 +27,24 @@
2727

2828
& when (@media-target = 'mobile'), (@media-target = 'all') {
2929

30-
@media only screen and (max-width: (@screen__xxs - 1)) {
31-
.media-width('max', @screen__xxs);
30+
@media only screen and (max-width: @screen__m) {
31+
.media-width('max', (@screen__m + 1));
3232
}
3333

34-
@media only screen and (max-width: (@screen__xs - 1)) {
35-
.media-width('max', @screen__xs);
34+
@media only screen and (max-width: (@screen__m - 1)) {
35+
.media-width('max', @screen__m);
3636
}
3737

3838
@media only screen and (max-width: (@screen__s - 1)) {
3939
.media-width('max', @screen__s);
4040
}
4141

42-
@media only screen and (max-width: (@screen__m - 1)) {
43-
.media-width('max', @screen__m);
42+
@media only screen and (max-width: (@screen__xs - 1)) {
43+
.media-width('max', @screen__xs);
4444
}
4545

46-
@media only screen and (max-width: @screen__m) {
47-
.media-width('max', (@screen__m + 1));
46+
@media only screen and (max-width: (@screen__xxs - 1)) {
47+
.media-width('max', @screen__xxs);
4848
}
4949

5050
@media all and (min-width: @screen__s) {

‎lib/web/mage/utils/template.js

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,15 @@
22
* Copyright © Magento, Inc. All rights reserved.
33
* See COPYING.txt for license details.
44
*/
5+
6+
/* eslint-disable no-shadow */
7+
58
define([
69
'jquery',
710
'underscore',
811
'mage/utils/objects',
912
'mage/utils/strings'
10-
], function (jQuery, _, utils, stringUtils) {
13+
], function ($, _, utils, stringUtils) {
1114
'use strict';
1215

1316
var tmplSettings = _.templateSettings,
@@ -176,7 +179,7 @@ define([
176179

177180
if (isTemplate(value)) {
178181
list[key] = render(value, tmpl, castString);
179-
} else if (jQuery.isPlainObject(value) || Array.isArray(value)) {
182+
} else if ($.isPlainObject(value) || Array.isArray(value)) {
180183
_.each(value, iterate);
181184
}
182185
});

0 commit comments

Comments
 (0)