rytm-webflow 2.2.0 → 2.2.2

package/README.md

@@ -149,6 +149,7 @@ RytmWebflow.aswap.init({
 | ```historyFallback``` | ```true``` | Fallback if browser dosn't support history push state |
 | ```cacheOn``` | ```true``` | By default all requests are being cached. Set to ```false``` to turn cache off |
 | ```noCacheClassName``` | ```'no-as-cache'``` | By default all requests are being cached. Links with this class name don't use ajax cache |
+| ```resetScrollOn``` | ```true``` | By default on each view swap the window is scrolled back up. This should be disabled if using ```lenis``` |
 | ```noScrollClassName``` | ```'no-as-scroll'``` | By default each page transformation is reseting the window scroll. Links with this class don't scroll window back up |
 | ```noSwapClassName``` | ```'no-as'``` | Links with this class or ```target=_blank``` don't load using ASwap |
 | ```oldschoolBrowserFallback``` | ```true``` | If set to ```true``` IE 11 or lower is not supported |

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "rytm-webflow",
-  "version": "2.2.0",
+  "version": "2.2.2",
   "description": "rytm webflow pack - ASwap, ShowUp",
   "main": "scripts/index.js",
   "scripts": {

package/scripts/aswap/ASwap.js

@@ -19,6 +19,7 @@ class ASwap {
       historyFallback: true, // fallback of browser dosn't support history push state
       cacheOn: true, // use Aswap Cache?
       noCacheClassName: 'no-as-cache', // links with this class don't use ajax cache
+      resetScrollOn: true, // reset scroll position on view swap
       noScrollClassName: 'no-as-scroll', // links with this class don't scroll window back up
       noSwapClassName: 'no-as', // links with this class or target=_blank don't use ajax swap
       oldschoolBrowserFallback: true, // IE11 or lower is not supported

package/scripts/aswap/ASwapDispatcher.js

@@ -197,7 +197,7 @@ class ASwapDispatcher extends EventDispatcher {
         this.swapBodyToHtmlClasses(result);
       }, 10)
       // scroll up
-      if (!this.currentTrigger || !this.currentTrigger.classList.contains(this.noScrollClassName)) {
+      if (this.resetScrollOn && (!this.currentTrigger || !this.currentTrigger.classList.contains(this.noScrollClassName))) {
         this.resetScrollPosition();
       }
       // dispatch swap event
@@ -302,15 +302,18 @@ class ASwapDispatcher extends EventDispatcher {
    */
   formSubmit(form) {
     const useCache = !form.classList.contains(this.noCacheClassName);
-    const url = form.getAttribute("action");
+    let url = form.getAttribute("action");
     if (url.indexOf('://') < 0) {
       this.currentTrigger = form
-      const method = form.getAttribute('method') ? form.getAttribute('method') : 'get'
+      const method = form.getAttribute('method') ? form.getAttribute('method').toLowerCase() : 'get'
       const formData = new FormData(form);
+      if (method == 'get') {
+        // for GET add data string to URL
+        const dataStr = new URLSearchParams(formData).toString();
+        const dataSep = url.indexOf('?') > -1 ? '&' : '?';
+        url = dataStr && method == 'get' ? (url + dataSep + dataStr) : url;
+      }
       this.submit(url, formData, method, false, useCache);
-      // const dataStr = new URLSearchParams(formData).toString();
-      // const requestUrl = method == 'get' ? (url + '?' + dataStr) : url;
-      // this.submit(requestUrl, formData, method, false, useCache);
     }
   }
   /**
@@ -335,9 +338,7 @@ class ASwapDispatcher extends EventDispatcher {
         this.loadURL(url, formData, method, false);
         break;
       default:
-        // GET
-        const dataStr = new URLSearchParams(formData).toString();
-        url = method == 'get' ? (url + '?' + dataStr) : url;
+        // GET / PUT / PATCH / DELETE
         let result = useCache ? this.getStoredResult(url) : null;
         if (result) {
           this.handleResult(result);