diff --git a/app/code/Magento/Catalog/view/base/web/template/product/list/listing.html b/app/code/Magento/Catalog/view/base/web/template/product/list/listing.html
index c80f591bd6590..ea0124f1c7c4d 100644
--- a/app/code/Magento/Catalog/view/base/web/template/product/list/listing.html
+++ b/app/code/Magento/Catalog/view/base/web/template/product/list/listing.html
@@ -25,15 +25,15 @@
-
-
\ No newline at end of file
+
diff --git a/app/code/Magento/Checkout/view/frontend/web/js/view/minicart.js b/app/code/Magento/Checkout/view/frontend/web/js/view/minicart.js
index 4adc1cd88c0ae..c77e72e38107a 100644
--- a/app/code/Magento/Checkout/view/frontend/web/js/view/minicart.js
+++ b/app/code/Magento/Checkout/view/frontend/web/js/view/minicart.js
@@ -162,10 +162,11 @@ define([
/**
* Get cart param by name.
+ *
* @param {String} name
* @returns {*}
*/
- getCartParam: function (name) {
+ getCartParamUnsanitizedHtml: function (name) {
if (!_.isUndefined(name)) {
if (!this.cart.hasOwnProperty(name)) {
this.cart[name] = ko.observable();
@@ -175,12 +176,21 @@ define([
return this.cart[name]();
},
+ /**
+ * @deprecated please use getCartParamUnsanitizedHtml.
+ * @param {String} name
+ * @returns {*}
+ */
+ getCartParam: function (name) {
+ return this.getCartParamUnsanitizedHtml(name);
+ },
+
/**
* Returns array of cart items, limited by 'maxItemsToDisplay' setting
* @returns []
*/
getCartItems: function () {
- var items = this.getCartParam('items') || [];
+ var items = this.getCartParamUnsanitizedHtml('items') || [];
items = items.slice(parseInt(-this.maxItemsToDisplay, 10));
@@ -192,7 +202,7 @@ define([
* @returns {Number}
*/
getCartLineItemsCount: function () {
- var items = this.getCartParam('items') || [];
+ var items = this.getCartParamUnsanitizedHtml('items') || [];
return parseInt(items.length, 10);
}
diff --git a/app/code/Magento/Checkout/view/frontend/web/js/view/payment/list.js b/app/code/Magento/Checkout/view/frontend/web/js/view/payment/list.js
index 15ae5d68534b8..17ccf3863a875 100644
--- a/app/code/Magento/Checkout/view/frontend/web/js/view/payment/list.js
+++ b/app/code/Magento/Checkout/view/frontend/web/js/view/payment/list.js
@@ -203,7 +203,7 @@ define([
*/
isPaymentMethodsAvailable: function () {
return _.some(this.paymentGroupsList(), function (group) {
- return this.getRegion(group.displayArea)().length;
+ return this.regionHasElements(group.displayArea);
}, this);
},
diff --git a/app/code/Magento/Checkout/view/frontend/web/template/minicart/content.html b/app/code/Magento/Checkout/view/frontend/web/template/minicart/content.html
index 0719a7d01ec70..c5fd6d545702b 100644
--- a/app/code/Magento/Checkout/view/frontend/web/template/minicart/content.html
+++ b/app/code/Magento/Checkout/view/frontend/web/template/minicart/content.html
@@ -56,7 +56,7 @@
"
translate="'Proceed to Checkout'"
/>
-
+
@@ -97,7 +97,7 @@
-
diff --git a/app/code/Magento/Checkout/view/frontend/web/template/payment-methods/list.html b/app/code/Magento/Checkout/view/frontend/web/template/payment-methods/list.html
index b7be5efee383e..77b801ec0e826 100644
--- a/app/code/Magento/Checkout/view/frontend/web/template/payment-methods/list.html
+++ b/app/code/Magento/Checkout/view/frontend/web/template/payment-methods/list.html
@@ -8,7 +8,7 @@
class="items payment-methods">
-
diff --git a/app/code/Magento/Ui/view/base/web/js/lib/core/collection.js b/app/code/Magento/Ui/view/base/web/js/lib/core/collection.js
index 0491390d2b6c2..33acba6103b10 100644
--- a/app/code/Magento/Ui/view/base/web/js/lib/core/collection.js
+++ b/app/code/Magento/Ui/view/base/web/js/lib/core/collection.js
@@ -214,6 +214,19 @@ define([
return regions[name];
},
+ /**
+ * Checks if the specified region has any elements
+ * associated with it.
+ *
+ * @param {String} name
+ * @returns {Boolean}
+ */
+ regionHasElements: function (name) {
+ var region = this.getRegion(name);
+
+ return region().length > 0;
+ },
+
/**
* Replaces specified regions' data with a provided one.
* Creates region if it was not created yet.