Merge pull request #23 from mageplaza/2.3-develop

2.3 develop

Author: Victor-Mageplaza

composer.json

@@ -5,7 +5,7 @@
     "mageplaza/module-core": "^1.4.5"
   },
   "type": "magento2-module",
-  "version": "1.0.6",
+  "version": "1.0.7",
   "license": "proprietary",
   "authors": [
     {

view/frontend/templates/layer/view.phtml

@@ -79,7 +79,7 @@
             <script type="text/x-magento-init">
                 {
                      ".block-content.filter-content":{
-                         "mpAjax": <?= /** @noEscape */ $block->escapeJs($layerConfig) ?>
+                         "mpAjax": <?= /** @noEscape */ $layerConfig ?>
                      }
                 }
             </script>

view/frontend/web/js/action/submit-filter.js

@@ -1,91 +1,85 @@
-/**
- * Mageplaza
- *
- * NOTICE OF LICENSE
- *
- * This source file is subject to the Mageplaza.com license that is
- * available through the world-wide-web at this URL:
- * https://www.mageplaza.com/LICENSE.txt
- *
- * DISCLAIMER
- *
- * Do not edit or add to this file if you wish to upgrade this extension to newer
- * version in the future.
- *
- * @category    Mageplaza
- * @package     Mageplaza_AjaxLayer
- * @copyright   Copyright (c) Mageplaza (http://www.mageplaza.com/)
- * @license     https://www.mageplaza.com/LICENSE.txt
- */
-
-define(
-    [
-        'jquery',
-        'mage/storage',
-        'Mageplaza_AjaxLayer/js/model/loader',
-        'mage/apply/main'
-    ],
-    function ($, storage, loader, mage) {
-        'use strict';
-
-        var productContainer = $('#layer-product-list'),
-            layerContainer = $('.layered-filter-block-container'),
-            quickViewContainer = $('#mpquickview-popup');
-
-        return function (submitUrl, isChangeUrl) {
-            /** save active state */
-            var actives = [],
-                data;
-            $('.filter-options-item').each(function (index) {
-                if ($(this).hasClass('active')) {
-                    actives.push($(this).attr('attribute'));
-                }
-            });
-            window.layerActiveTabs = actives;
-
-            /** start loader */
-            loader.startLoader();
-
-            /** change browser url */
-            if (typeof window.history.pushState === 'function' && (typeof isChangeUrl === 'undefined')) {
-                window.history.pushState({url: submitUrl}, '', submitUrl);
-            }
-
-            if (isChangeUrl){
-                data = '{}';
-            }else{
-                data = JSON.stringify({'mp_layer': 1});
-            }
-
-            return storage.post(submitUrl, data).done(
-                function (response) {
-                    if (response.backUrl) {
-                        window.location = response.backUrl;
-                        return;
-                    }
-                    if (response.navigation) {
-                        layerContainer.html(response.navigation);
-                    }
-                    if (response.products) {
-                        productContainer.html(response.products);
-                    }
-                    if (response.quickview) {
-                        quickViewContainer.html(response.quickview);
-                    }
-
-                    if (mage) {
-                        mage.apply();
-                    }
-                }
-            ).fail(
-                function () {
-                    window.location.reload();
-                }
-            ).always(
-                function () {
-                    loader.stopLoader();
-                }
-            );
-        };
-    }
-);
+/**
+ * Mageplaza
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Mageplaza.com license that is
+ * available through the world-wide-web at this URL:
+ * https://www.mageplaza.com/LICENSE.txt
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade this extension to newer
+ * version in the future.
+ *
+ * @category    Mageplaza
+ * @package     Mageplaza_AjaxLayer
+ * @copyright   Copyright (c) Mageplaza (http://www.mageplaza.com/)
+ * @license     https://www.mageplaza.com/LICENSE.txt
+ */
+
+define(
+    [
+        'jquery',
+        'mage/storage',
+        'Mageplaza_AjaxLayer/js/model/loader',
+        'mage/apply/main'
+    ],
+    function ($, storage, loader, mage) {
+        'use strict';
+
+        var productContainer = $('#layer-product-list'),
+            layerContainer = $('.layered-filter-block-container'),
+            quickViewContainer = $('#mpquickview-popup');
+
+        return function (submitUrl, isChangeUrl) {
+            /** save active state */
+            var actives = [],
+                data;
+            $('.filter-options-item').each(function (index) {
+                if ($(this).hasClass('active')) {
+                    actives.push($(this).attr('attribute'));
+                }
+            });
+            window.layerActiveTabs = actives;
+
+            /** start loader */
+            loader.startLoader();
+
+            /** change browser url */
+            if (typeof window.history.pushState === 'function' && (typeof isChangeUrl === 'undefined')) {
+                window.history.pushState({url: submitUrl}, '', submitUrl);
+            }
+
+            return storage.get(submitUrl).done(
+                function (response) {
+                    if (response.backUrl) {
+                        window.location = response.backUrl;
+                        return;
+                    }
+                    if (response.navigation) {
+                        layerContainer.html(response.navigation);
+                    }
+                    if (response.products) {
+                        productContainer.html(response.products);
+                    }
+                    if (response.quickview) {
+                        quickViewContainer.html(response.quickview);
+                    }
+
+                    if (mage) {
+                        mage.apply();
+                    }
+                }
+            ).fail(
+                function () {
+                    window.location.reload();
+                }
+            ).always(
+                function () {
+                    loader.stopLoader();
+                }
+            );
+        };
+    }
+);