Introduce redirect pattern during change of limit

magento · Feb 28, 2020 · f25de7b · f25de7b
1 parent 05f1a2b
commit f25de7b
Showing 1 changed file with 17 additions and 13 deletions.
diff --git a/app/code/Magento/Catalog/view/frontend/web/js/product/list/toolbar.js b/app/code/Magento/Catalog/view/frontend/web/js/product/list/toolbar.js
@@ -23,6 +23,7 @@ define([
             direction: 'product_list_dir',
             order: 'product_list_order',
             limit: 'product_list_limit',
+            page: 'p',
             modeDefault: 'grid',
             directionDefault: 'asc',
             orderDefault: 'position',
@@ -80,7 +81,7 @@ define([
             );
         },
 
-        getUrlParams: function() {
+        getUrlParams: function () {
             var decode = window.decodeURIComponent,
                 urlPaths = this.options.url.split('?'),
                 urlParams = urlPaths[1] ? urlPaths[1].split('&') : [],
@@ -96,17 +97,13 @@ define([
             return params;
         },
 
-        getCurrentLimit: function()
-        {
-            var currentLimit = this.getUrlParams()[this.options.limit];
-
-            if (currentLimit === undefined) {
-                currentLimit = this.options.limitDefault;
-            }
-
-            return currentLimit;
+        getCurrentLimit: function () {
+            return this.getUrlParams()[this.options.limit] || this.options.limitDefault;
         },
 
+        getCurrentPage: function () {
+            return this.getUrlParams()[this.options.page] || 1;
+        },
 
         /**
          * @param {String} paramName
@@ -117,10 +114,17 @@ define([
             var urlPaths = this.options.url.split('?'),
                 baseUrl = urlPaths[0],
                 paramData = this.getUrlParams(),
-                form, params, key, input, formKey;
+                currentPage = this.getCurrentPage(),
+                form, params, key, input, formKey, newPage;
+
+            if (currentPage > 1 && paramName === this.options.limit) {
+                newPage = Math.floor(this.getCurrentLimit() * this.getCurrentPage() / paramValue);
 
-            if (paramName === this.options.limit && paramValue > this.getCurrentLimit()) {
-                delete paramData['p'];
+                if (newPage > 1) {
+                    paramData[this.options.page] = newPage;
+                } else {
+                    delete paramData[this.options.page];
+                }
             }
 
             paramData[paramName] = paramValue;