Browse Source

Fixed and improved the cookie collection for localStorage cookies

Dustin Utecht 1 year ago
parent
commit
1965e260ac
1 changed files with 15 additions and 11 deletions
  1. 15 11
      src/extensions/filter-control/utils.js

+ 15 - 11
src/extensions/filter-control/utils.js

@@ -234,7 +234,8 @@ export function setValues (that) {
 
 
 export function collectBootstrapTableFilterCookies () {
 export function collectBootstrapTableFilterCookies () {
   const cookies = []
   const cookies = []
-  const foundCookies = document.cookie.match(/bs\.table\.(filterControl|searchText)/g)
+  const cookieRegex = /bs\.table\.(filterControl|searchText)/g
+  const foundCookies = document.cookie.match(cookieRegex)
   const foundLocalStorage = localStorage
   const foundLocalStorage = localStorage
 
 
   if (foundCookies) {
   if (foundCookies) {
@@ -250,19 +251,22 @@ export function collectBootstrapTableFilterCookies () {
       }
       }
     })
     })
   }
   }
-  if (foundLocalStorage) {
-    for (let i = 0; i < foundLocalStorage.length; i++) {
-      let cookie = foundLocalStorage.key(i)
 
 
-      if (/./.test(cookie)) {
-        cookie = cookie.split('.').pop()
-      }
+  if (!foundLocalStorage) {
+    return cookies
+  }
 
 
-      if (!cookies.includes(cookie)) {
-        cookies.push(cookie)
-      }
+  Object.keys(localStorage).forEach(function (cookie) {
+    if (!cookieRegex.test(cookie)) {
+      return
     }
     }
-  }
+
+    cookie = cookie.split('.').pop()
+    if (!cookies.includes(cookie)) {
+      cookies.push(cookie)
+    }
+  })
+
   return cookies
   return cookies
 }
 }