浏览代码

fix compareVersion

close violentmonkey/violentmonkey#91
Gerald 8 年之前
父节点
当前提交
a2230751bd
共有 2 个文件被更改,包括 4 次插入3 次删除
  1. 3 2
      src/background/utils/options.js
  2. 1 1
      src/background/utils/script.js

+ 3 - 2
src/background/utils/options.js

@@ -1,4 +1,5 @@
 import { initHooks, debounce, normalizeKeys, object } from 'src/common';
 import { initHooks, debounce, normalizeKeys, object } from 'src/common';
+import storage from 'localStorage';
 
 
 const defaults = {
 const defaults = {
   isApplied: true,
   isApplied: true,
@@ -33,7 +34,7 @@ function callHooks() {
 export function getOption(key, def) {
 export function getOption(key, def) {
   const keys = normalizeKeys(key);
   const keys = normalizeKeys(key);
   const mainKey = keys[0];
   const mainKey = keys[0];
-  const value = localStorage.getItem(mainKey);
+  const value = storage.getItem(mainKey);
   let obj;
   let obj;
   if (value) {
   if (value) {
     try {
     try {
@@ -56,7 +57,7 @@ export function setOption(key, value) {
     if (keys.length > 1) {
     if (keys.length > 1) {
       optionValue = object.set(getOption(mainKey), keys.slice(1), value);
       optionValue = object.set(getOption(mainKey), keys.slice(1), value);
     }
     }
-    localStorage.setItem(mainKey, JSON.stringify(optionValue));
+    storage.setItem(mainKey, JSON.stringify(optionValue));
     fireChange(optionKey, value);
     fireChange(optionKey, value);
   }
   }
 }
 }

+ 1 - 1
src/background/utils/script.js

@@ -75,7 +75,7 @@ export function compareVersion(ver1, ver2) {
   const parts1 = (ver1 || '').split('.');
   const parts1 = (ver1 || '').split('.');
   const parts2 = (ver2 || '').split('.');
   const parts2 = (ver2 || '').split('.');
   for (let i = 0; i < parts1.length || i < parts2.length; i += 1) {
   for (let i = 0; i < parts1.length || i < parts2.length; i += 1) {
-    const delta = (parseInt(ver1[i], 10) || 0) - (parseInt(ver2[i], 10) || 0);
+    const delta = (parseInt(parts1[i], 10) || 0) - (parseInt(parts2[i], 10) || 0);
     if (delta) return delta < 0 ? -1 : 1;
     if (delta) return delta < 0 ? -1 : 1;
   }
   }
   return 0;
   return 0;