rytm-webflow 2.0.3 → 2.0.4

package/package.json

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

package/scripts/aswap/ASwapDispatcher.js

@@ -384,7 +384,7 @@ class ASwapDispatcher extends EventDispatcher {
   isFormElementValid(f) {
     let result = false
     if (f) {
-      if (!f.classList.contains(this.noSwapClassName)) { 
+      if (f.matches(this.formsSelector) && !f.classList.contains(this.noSwapClassName)) { 
         result = true
       }
     }
@@ -424,25 +424,23 @@ class ASwapDispatcher extends EventDispatcher {
     }
   }
   onDocumentSubmit(e) {
-    e.preventDefault();
-    if (e.target.tagName !== 'FORM') {
-      return;
-    }
-    const f = e.target
-    if (this.isFormElementValid(f)) {
-      const useCache = !f.classList.contains(this.noCacheClassName);
-      const url = f.getAttribute("action");
-      if (url.indexOf('://') < 0) {
-        e.preventDefault()
-        this.currentTrigger = f
-        const method = f.getAttribute('method') ? f.getAttribute('method') : 'get'
-        const dataStr = new URLSearchParams(new FormData(f)).toString()
-        const requestUrl = method == 'get' ? (url + '?' + dataStr) : url
-        this.submit(requestUrl, dataStr, method, false, useCache)
-      }
+    if (e.target.tagName == 'FORM') {
+      const f = e.target
+      if (this.isFormElementValid(f)) {
+        e.preventDefault();
+        const useCache = !f.classList.contains(this.noCacheClassName);
+        const url = f.getAttribute("action");
+        if (url.indexOf('://') < 0) {
+          e.preventDefault()
+          this.currentTrigger = f
+          const method = f.getAttribute('method') ? f.getAttribute('method') : 'get'
+          const dataStr = new URLSearchParams(new FormData(f)).toString()
+          const requestUrl = method == 'get' ? (url + '?' + dataStr) : url
+          this.submit(requestUrl, dataStr, method, false, useCache)
+        }
 
+      }
     }
-
   }
   /**
   * add event listeners