Skip to content

Commit 1b6d536

Browse files
Merge pull request #1496 from magento-engcom/develop-prs
[EngCom] Public Pull Requests - MAGETWO-75310 Fixed Typo Mistake in comment. #10905 - MAGETWO-75309 Add escaping of js translation version #10904 - MAGETWO-72341 enable universal use of modal and tab_group #10789
2 parents e649b4c + 5502bce commit 1b6d536

File tree

4 files changed

+8
-4
lines changed

4 files changed

+8
-4
lines changed

app/code/Magento/ConfigurableProduct/Model/Product/Type/Configurable/Attribute.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,7 @@ public function afterSave()
111111
}
112112

113113
/**
114-
* Load counfigurable attribute by product and product's attribute
114+
* Load configurable attribute by product and product's attribute
115115
*
116116
* @param \Magento\Catalog\Model\Product $product
117117
* @param \Magento\Catalog\Model\ResourceModel\Eav\Attribute $attribute

app/code/Magento/Translation/view/base/templates/translate.phtml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828

2929
<?php $version = $block->getTranslationFileVersion(); ?>
3030

31-
if (versionObj.version !== '<?= /* @noEscape */ $version ?>') {
31+
if (versionObj.version !== '<?php $block->escapeJsQuote($version) ?>') {
3232
dependencies.push(
3333
'text!<?= /* @noEscape */ Magento\Translation\Model\Js\Config::DICTIONARY_FILE_NAME ?>'
3434
);
@@ -44,7 +44,7 @@
4444
$.localStorage.set(
4545
'mage-translation-file-version',
4646
{
47-
version: '<?= /* @noEscape */ $version ?>'
47+
version: '<?php $block->escapeJsQuote($version) ?>'
4848
}
4949
);
5050
} else {

app/code/Magento/Ui/view/base/web/js/form/components/tab_group.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ define([
6565
invalid;
6666

6767
invalid = _.find(result, function (item) {
68-
return !item.valid;
68+
return typeof item !== 'undefined' && !item.valid;
6969
});
7070

7171
if (invalid) {

app/code/Magento/Ui/view/base/web/js/modal/modal-component.js

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -229,6 +229,10 @@ define([
229229
* Validate everything validatable in modal
230230
*/
231231
validate: function (elem) {
232+
if (typeof elem === 'undefined') {
233+
return;
234+
}
235+
232236
if (typeof elem.validate === 'function') {
233237
this.valid = this.valid & elem.validate().valid;
234238
} else if (elem.elems) {

0 commit comments

Comments
 (0)