tuijs-util 1.3.8 → 1.4.1

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "tuijs-util",
-    "version": "1.3.8",
+    "version": "1.4.1",
     "module": "src/esm/index.js",
     "main": "src/cjs/index.cjs",
     "exports": {

package/src/cjs/index.cjs

@@ -393,9 +393,6 @@ async function reqGet(url) {
     const res = await fetch(url, {
       method: 'GET'
     });
-    if (!res.ok) {
-      throw new Error(res);
-    }
     return res;
   } catch (er) {
     throw new Error(er.message);
@@ -414,9 +411,6 @@ async function reqGetJson(url) {
     const res = await fetch(url, {
       method: 'GET'
     });
-    if (!res.ok) {
-      throw new Error(res);
-    }
     const data = await res.json();
     return data;
   } catch (er) {
@@ -436,9 +430,6 @@ async function reqGetText(url) {
     const res = await fetch(url, {
       method: 'GET'
     });
-    if (!res.ok) {
-      throw new Error(res);
-    }
     const data = await res.text();
     return data;
   } catch (er) {
@@ -469,12 +460,9 @@ async function reqPostJson(url, dataJson) {
       },
       body: dataJson
     });
-    if (!res.ok) {
-      throw new Error(res);
-    }
     return res;
   } catch (er) {
-    throw new Error(er.message);
+    throw new Error(er);
   }
 }
 
@@ -494,12 +482,9 @@ async function reqPostForm(url, dataForm) {
       method: 'POST',
       body: dataForm
     });
-    if (!res.ok) {
-      return res;
-    }
     return res;
   } catch (er) {
-    throw new Error(er.message);
+    throw new Error(er);
   }
 }
 
@@ -577,29 +562,45 @@ function sleep(ms) {
 }
 
 /**
- * Adds and intersectionObserver for a list of target elements, that calls a function when 
- * @param {Array} targets - An array of elements that will be attached to the observer.
- * @param {Function} callback - The callback function that will run when the observer is triggered.
- * @param {Object} observerOptions - An Object containing the observer options. By default only threshold is set.
- * @returns {Function} - Returns a cleanup function that will disconnect the observer. This is not required to use.
- */
-function scrollIntoView(targets, callback, observerOptions = {
-  threshold: 0.5
-}) {
-  const observer = new IntersectionObserver(entries => {
-    entries.forEach(entry => {
-      if (entry.isIntersecting) {
-        // Only trigger when the element is intersecting
-        callback(entry.target);
+ *
+ */
+function scrollIntoView() {
+  let allObservers = [];
+  function addObserver(targets, callback, observerOptions = {
+    threshold: 0.5
+  }) {
+    const observer = new IntersectionObserver(entries => {
+      entries.forEach(entry => {
+        if (entry.isIntersecting) {
+          // Only trigger when the element is intersecting
+          callback(entry.target);
+        }
+      });
+    }, observerOptions);
+    for (let i = 0; i < targets.length; i++) {
+      observer.observe(targets[i]);
+    }
+    allObservers.push(observer);
+  }
+  function removeNamedObserver(name) {
+    for (let i = 0; i < allObservers.length; i++) {
+      if (allObservers[i].name === name) {
+        allObservers[i].disconnect();
+        allObservers.splice(i, 1);
+        i--;
       }
-    });
-  }, observerOptions);
-  targets.forEach(target => {
-    observer.observe(target);
-  });
-  // Return a cleanup function to disconnect the observer
-  return () => {
-    observer.disconnect();
+    }
+  }
+  function removeAllObservers() {
+    for (let i = 0; i < allObservers.length; i++) {
+      allObservers[i].disconnect();
+    }
+    allObservers = [];
+  }
+  return {
+    addObserver,
+    removeNamedObserver,
+    removeAllObservers
   };
 }
 

package/src/esm/lib/util.http.js

@@ -50,9 +50,6 @@ export function urlAddHttps(url) {
 export async function reqGet(url) {
     try {
         const res = await fetch(url, { method: 'GET' });
-        if (!res.ok) {
-            throw new Error(res);
-        }
         return res;
     } catch (er) {
         throw new Error(er.message);
@@ -69,9 +66,6 @@ export async function reqGet(url) {
 export async function reqGetJson(url) {
     try {
         const res = await fetch(url, { method: 'GET' });
-        if (!res.ok) {
-            throw new Error(res);
-        }
         const data = await res.json();
         return data;
     } catch (er) {
@@ -89,9 +83,6 @@ export async function reqGetJson(url) {
 export async function reqGetText(url) {
     try {
         const res = await fetch(url, { method: 'GET' });
-        if (!res.ok) {
-            throw new Error(res);
-        }
         const data = await res.text();
         return data;
     } catch (er) {
@@ -122,12 +113,9 @@ export async function reqPostJson(url, dataJson) {
             },
             body: dataJson
         });
-        if (!res.ok) {
-            throw new Error(res);
-        }
         return res;
     } catch (er) {
-        throw new Error(er.message);
+        throw new Error(er);
     }
 }
 
@@ -147,11 +135,8 @@ export async function reqPostForm(url, dataForm) {
             method: 'POST',
             body: dataForm
         });
-        if (!res.ok) {
-            return res;
-        }
         return res;
     } catch (er) {
-        throw new Error(er.message);
+        throw new Error(er);
     }
 }

package/src/esm/lib/util.misc.js

@@ -68,25 +68,46 @@ export function sleep(ms) {
 }
 
 /**
- * Adds and intersectionObserver for a list of target elements, that calls a function when 
- * @param {Array} targets - An array of elements that will be attached to the observer.
- * @param {Function} callback - The callback function that will run when the observer is triggered.
- * @param {Object} observerOptions - An Object containing the observer options. By default only threshold is set.
- * @returns {Function} - Returns a cleanup function that will disconnect the observer. This is not required to use.
+ *
  */
-export function scrollIntoView(targets, callback, observerOptions = { threshold: 0.5}) {
-    const observer = new IntersectionObserver((entries) => {
-        entries.forEach(entry => {
-            if (entry.isIntersecting) {  // Only trigger when the element is intersecting
-                callback(entry.target);
+export function scrollIntoView() {
+    let allObservers = [];
+
+    function addObserver(targets, callback, observerOptions = { threshold: 0.5 }) {
+        const observer = new IntersectionObserver((entries) => {
+            entries.forEach(entry => {
+                if (entry.isIntersecting) {  // Only trigger when the element is intersecting
+                    callback(entry.target);
+                }
+            });
+        }, observerOptions);
+        for (let i = 0; i < targets.length; i++) {
+            observer.observe(targets[i])
+            
+        }
+        allObservers.push(observer);
+    }
+
+    function removeNamedObserver(name) {
+        for (let i = 0; i < allObservers.length; i++) {
+            if (allObservers[i].name === name) {
+                allObservers[i].disconnect();
+                allObservers.splice(i, 1);
+                i--;
             }
-        });
-    }, observerOptions);
-    targets.forEach(target => {
-        observer.observe(target);
-    });
-    // Return a cleanup function to disconnect the observer
-    return () => {
-        observer.disconnect();
-    };
+        }
+    }
+
+    function removeAllObservers() {
+        for (let i = 0; i < allObservers.length; i++) {
+            allObservers[i].disconnect();
+        }
+        allObservers = [];
+    }
+
+    return {
+        addObserver,
+        removeNamedObserver,
+        removeAllObservers
+    }
 }