Browse Source

fix: remove useless code

Gerald 8 years ago
parent
commit
2b4a5c3fd1

+ 0 - 1
src/background/app.js

@@ -1,4 +1,3 @@
-import 'src/common/polyfills';
 import 'src/common/browser';
 import { i18n, defaultImage } from 'src/common';
 import { objectGet } from 'src/common/object';

+ 0 - 7
src/background/sync/base.js

@@ -42,13 +42,6 @@ function initConfig() {
       config = {
         services: {},
       };
-
-      // XXX Migrate from old data
-      ['dropbox', 'onedrive']
-      .forEach(key => {
-        config.services[key] = getOption(key);
-      });
-
       set([], config);
     }
   }

+ 5 - 3
src/common/browser.js

@@ -1,5 +1,7 @@
+import 'src/common/polyfills';
+
 /* global chrome */
-const global = window;
+const globalObj = typeof global !== 'undefined' ? global : window;
 
 function wrapAsync(func, thisObj) {
   return (...args) => {
@@ -120,6 +122,6 @@ const meta = {
   webRequest: true,
 };
 if (typeof browser === 'undefined' && typeof chrome !== 'undefined') {
-  global.browser = wrapAPIs(chrome, meta);
-  global.browser.__patched = true;
+  globalObj.browser = wrapAPIs(chrome, meta);
+  globalObj.browser.__patched = true;
 }

+ 3 - 0
src/common/polyfills.js

@@ -7,6 +7,9 @@ import 'core-js/fn/string/includes';
 import 'core-js/fn/string/starts-with';
 import 'core-js/fn/string/ends-with';
 
+// Must use native Promise for Firefox to work
+// import 'core-js/fn/promise';
+
 // function polyfill(obj, name, value) {
 //   if (!obj[name]) {
 //     Object.defineProperty(obj, name, { value });

+ 0 - 1
src/confirm/app.js

@@ -1,4 +1,3 @@
-import 'src/common/polyfills';
 import 'src/common/browser';
 import Vue from 'vue';
 import { i18n } from 'src/common';

+ 1 - 23
src/injected/utils.js

@@ -1,8 +1,7 @@
 export { sendMessage, request, throttle } from 'src/common';
-export Promise from 'core-js/library/fn/promise';
 
 // cache native properties to avoid being overridden, see violentmonkey/violentmonkey#151
-export const { console, CustomEvent } = window;
+export const { console, CustomEvent, Promise } = window;
 
 export function postData(destId, data) {
   // Firefox issue: data must be stringified to avoid cross-origin problem
@@ -22,27 +21,6 @@ export function inject(code) {
   }
 }
 
-// export function encodeObject(obj) {
-//   if (Array.isArray(obj)) {
-//     return obj.map(encodeObject).join(',');
-//   }
-//   if (typeof obj === 'function') {
-//     let str = obj.toString();
-//     const prefix = str.slice(0, str.indexOf('{'));
-//     if (prefix.indexOf('=>') < 0 && prefix.indexOf('function ') < 0) {
-//       // method definition
-//       str = `function ${str}`;
-//     }
-//     return str;
-//   }
-//   if (obj && typeof obj === 'object') {
-//     const pairs = Object.keys(obj)
-//     .map(key => `${JSON.stringify(key)}:${encodeObject(obj[key])}`);
-//     return `{${pairs.join(',')}}`;
-//   }
-//   return JSON.stringify(obj);
-// }
-
 export function getUniqId() {
   return Date.now().toString(36) + Math.random().toString(36).slice(2, 6);
 }

+ 4 - 4
src/injected/web/requests.js

@@ -36,15 +36,15 @@ function parseData(req, details) {
     // blob or arraybuffer
     const { response } = req.data;
     if (response) {
-      let data = response.split(',');
+      const data = response.split(',');
       const matches = data[0].match(/^data:(.*?);base64$/);
       if (!matches) {
         // invalid
         req.data.response = null;
       } else {
-        data = window.atob(data[1]);
-        const arr = new window.Uint8Array(data.length);
-        for (let i = 0; i < data.length; i += 1) arr[i] = data.charCodeAt(i);
+        const raw = window.atob(data[1]);
+        const arr = new window.Uint8Array(raw.length);
+        for (let i = 0; i < raw.length; i += 1) arr[i] = raw.charCodeAt(i);
         if (details.responseType === 'blob') {
           // blob
           return new Blob([arr], { type: matches[1] });

+ 0 - 1
src/options/app.js

@@ -1,4 +1,3 @@
-import 'src/common/polyfills';
 import 'src/common/browser';
 import 'src/common/sprite';
 import Vue from 'vue';

+ 0 - 1
src/popup/app.js

@@ -1,4 +1,3 @@
-import 'src/common/polyfills';
 import 'src/common/browser';
 import 'src/common/sprite';
 import Vue from 'vue';

+ 0 - 1
test/polyfill.js

@@ -1,4 +1,3 @@
-global.localStorage = {};
 global.browser = {
   storage: {
     local: {