fix

Author: HoangTran0410

popup/index.js

@@ -36,6 +36,7 @@ import {
   isTitle,
   viewScriptSource,
 } from "./helpers/utils.js";
+import { checkPass } from "../scripts/auto_lockWebsite.js";
 // import _ from "../md/exportScriptsToMd.js";
 
 const settingsBtn = document.querySelector(".settings");
@@ -609,16 +610,14 @@ function initSettings() {
     // smooth scroll row
     const smoothScrollRow = document.createElement("div");
     smoothScrollRow.classList.add("row");
-    smoothScrollRow.setAttribute(
-      "data-tooltip",
-      t({
-        vi: "Tắt nếu bạn đã cài app SmoothScroll",
-        en: "Turn off if installed SmoothScroll app",
-      })
-    );
-    smoothScrollRow.setAttribute("data-flow", "bottom");
     smoothScrollRow.innerHTML = `
-      <div class="label">${t({
+      <div class="label"
+        data-tooltip="${t({
+          vi: "Tắt nếu bạn đã cài app SmoothScroll",
+          en: "Turn off if installed SmoothScroll app",
+        })}"
+        data-flow="bottom"
+      >${t({
         vi: "Cuôn chuột siêu mượt",
         en: "Super smooth scroll",
       })}</div>
@@ -715,10 +714,19 @@ async function backup() {
   UfsGlobal.Utils.downloadData(JSON.stringify(data), name);
 }
 
-function restore() {
+async function restore() {
+  if (
+    !(await checkPass(
+      t({
+        vi: " chức năng Tự động khoá trang web",
+        en: " feature Auto lock websites",
+      })
+    ))
+  )
+    return;
   Swal.fire({
     title: t({ en: "Restore data", vi: "Khôi phục dữ liệu" }),
-    text: t({ en: "Select backup file", vi: "Chọn file đã sao lưu" }),
+    text: t({ en: "Select file to restore", vi: "Chọn file để khôi phục" }),
     input: "file",
     inputAttributes: {
       accept: ".json",
@@ -747,12 +755,14 @@ function restore() {
         const { localStorage: l, chromeStorage } = json;
 
         if (l) {
+          localStorage.clear();
           Object.keys(l).forEach((key) => {
             localStorage[key] = l[key];
           });
         }
 
         if (chromeStorage) {
+          await chrome.storage.local.clear();
           for (let key in chromeStorage) {
             await chrome.storage.local.set({ [key]: chromeStorage[key] });
           }
@@ -777,7 +787,16 @@ function restore() {
   });
 }
 
-function reset() {
+async function reset() {
+  if (
+    !(await checkPass(
+      t({
+        vi: " chức năng Tự động khoá trang web",
+        en: " feature Auto lock websites",
+      })
+    ))
+  )
+    return;
   Swal.fire({
     icon: "warning",
     title: t({ en: "Reset", vi: "Đặt lại" }),

popup/themes/default.less

@@ -360,7 +360,7 @@ option {
         display: flex;
         justify-content: center;
         align-items: center;
-        margin-bottom: 5px;
+        min-height: 50px;
 
         .label {
             flex-grow: 1;

scripts/auto_lockWebsite.js

@@ -1,5 +1,6 @@
 import { BADGES } from "./helpers/badge.js";
 import { md5 } from "./libs/crypto/md5.js";
+import { Storage } from "./helpers/utils.js";
 
 const managerBtn = '<i class="fa-solid fa-unlock-keyhole"></i>';
 
@@ -82,7 +83,7 @@ export default {
   contentScript: {
     onDocumentStart: async () => {
       const pass = await locker.password.get();
-      if (pass != null) {
+      if (pass) {
         const sites = await locker.sites.get();
         if (sites.length > 0) {
           let hostname = location.hostname;
@@ -94,7 +95,7 @@ export default {
     onClick: async () => {
       try {
         const pass = await locker.password.get();
-        if (pass == null) return;
+        if (!pass) return;
 
         lockCurrentWebsite(pass);
         locker.sites.add(location.hostname);
@@ -105,63 +106,47 @@ export default {
   },
 };
 
-export const _storage = {
-  async get(key, defaultValue) {
-    let data = await chrome.storage.local.get([key]);
-    let pass = data?.[key];
-    return pass ?? defaultValue;
-  },
-  async set(key, value) {
-    await chrome.storage.local.set({ [key]: value });
-    return true;
-  },
-  async remove(key) {
-    await chrome.storage.local.remove(key);
-    return true;
-  },
-};
-
 export const locker = {
   password: {
     storageKey: "auto_lock_website_manager_password",
     async compare(pass) {
-      return md5(pass) === (await _storage.get(this.storageKey));
+      return pass && md5(pass) === (await Storage.get(this.storageKey));
     },
     async has() {
-      return (await _storage.get(this.storageKey)) != null;
+      return (await Storage.get(this.storageKey)) != null;
     },
     get() {
-      return _storage.get(this.storageKey);
+      return Storage.get(this.storageKey);
     },
     set(pass) {
-      return _storage.set(this.storageKey, md5(pass));
+      return Storage.set(this.storageKey, md5(pass));
     },
     remove() {
-      return _storage.remove(this.storageKey);
+      return Storage.remove(this.storageKey);
     },
   },
   sites: {
     storageKey: "auto_lock_website_lockedWebsites",
     get() {
-      return _storage.get(this.storageKey, []);
+      return Storage.get(this.storageKey, []);
     },
     async add(site) {
       let currentSites = await this.get();
       if (currentSites.includes(site)) return false;
       currentSites.unshift(site);
-      await _storage.set(this.storageKey, currentSites);
+      await Storage.set(this.storageKey, currentSites);
       return true;
     },
     async remove(site) {
       let key = this.storageKey;
       let currentSites = await this.get();
       if (!currentSites.includes(site)) return false;
       currentSites = currentSites.filter((s) => s !== site);
-      await _storage.set(key, currentSites);
+      await Storage.set(key, currentSites);
       return true;
     },
     async clear() {
-      await _storage.remove(this.storageKey);
+      await Storage.remove(this.storageKey);
     },
   },
 };

scripts/content-scripts/ufs_global.js

@@ -326,7 +326,7 @@ function enableDragAndZoom(element, container, onUpdateCallback) {
       const targetValue = animTarget[prop];
       let del = Math.abs(targetValue - currentValue);
 
-      if (del > 0) {
+      if (del > 0.1) {
         const newValue =
           del < 1 ? targetValue : lerp(currentValue, targetValue, lerpSpeed);
         element.style[prop] = newValue + "px";

scripts/helpers/utils.js

@@ -173,7 +173,7 @@ export const Storage = {
     await chrome.storage.local.set({ [key]: value });
     return value;
   },
-  get: async (key, defaultValue = "") => {
+  get: async (key, defaultValue) => {
     let result = await chrome.storage.local.get([key]);
     return result[key] || defaultValue;
   },

scripts/magnify_image.js

@@ -797,7 +797,7 @@ function createPreview(
       case BgState.none:
         break;
       case BgState.transparent:
-        var gradientValue =
+        const gradientValue =
           "linear-gradient(45deg, rgba(255, 255, 255, 0.4) 25%, transparent 25%, transparent 75%, rgba(255, 255, 255, 0.4) 75%, rgba(255, 255, 255, 0.4) 100%) 0 0 / 20px 20px, linear-gradient(45deg, rgba(255, 255, 255, 0.4) 25%, transparent 25%, transparent 75%, rgba(255, 255, 255, 0.4) 75%, rgba(255, 255, 255, 0.4) 100%) 10px 10px / 20px 20px";
         img.style.cssText += "background: " + gradientValue + " !important;";
         break;
@@ -867,10 +867,10 @@ function createPreview(
   toolbar.onmousemove = (e) => {
     if (
       e.target != toolbar &&
-      e.target?.ufs_title &&
-      e.target?.ufs_title != desc.textContent
+      e.target.attributes.ufs_title &&
+      e.target.attributes.ufs_title.textContent != desc.textContent
     ) {
-      desc.textContent = e.target.ufs_title;
+      desc.textContent = e.target.attributes.ufs_title.textContent;
       let x =
         e.target.offsetLeft + e.target.offsetWidth / 2 - desc.offsetWidth / 2;
       desc.style.cssText = `left: ${x}px`;