Minor fix

gulpfile.js

@@ -6,7 +6,6 @@ const cssnano = require('gulp-cssnano');
 const gulpFilter = require('gulp-filter');
 const order = require('gulp-order');
 const eslint = require('gulp-eslint');
-const del = require('del');
 const templateCache = require('./scripts/templateCache');
 const i18n = require('./scripts/i18n');
 const pkg = require('./package.json');

src/background/db.js

@@ -90,7 +90,8 @@ VMDB.prototype.getScriptInfos = function (ids) {
   return Promise.all(ids.map(function (id) {
     return _this.getScript(id, tx);
   })).then(function (scripts) {
-    return scripts.filter(function (x) {return x;}).map(scriptUtils.getScriptInfo);
+    return scripts.filter(function (x) {return x;})
+    .map(scriptUtils.getScriptInfo);
   });
 };
 

src/background/main.js

@@ -2,7 +2,7 @@ var vmdb = new VMDB;
 var VM_VER = chrome.app.getDetails().version;
 var commands = {
   NewScript: function (data, src) {
-    return Promise.resolve(scriptUtils.newScript());
+    return scriptUtils.newScript();
   },
   RemoveScript: function (id, src) {
     return vmdb.removeScript(id)
@@ -32,7 +32,7 @@ var commands = {
     return data.isApplied
     ? vmdb.getScriptsByURL(url).then(function (res) {
       return _.assign(data, res);
-    }) : Promise.resolve(data);
+    }) : data;
   },
   UpdateScriptInfo: function (data, src) {
     return vmdb.updateScriptInfo(data.id, data, {
@@ -100,11 +100,11 @@ var commands = {
     return false;
   },
   ParseMeta: function (code, src) {
-    return Promise.resolve(scriptUtils.parseMeta(code));
+    return scriptUtils.parseMeta(code);
   },
   AutoUpdate: autoUpdate,
   GetRequestId: function (data, src) {
-    return Promise.resolve(requests.getRequestId());
+    return requests.getRequestId();
   },
   HttpRequest: function (details, src) {
     requests.httpRequest(details, function (res) {
@@ -116,7 +116,7 @@ var commands = {
     return false;
   },
   AbortRequest: function (id, src) {
-    return Promise.resolve(requests.abortRequest(id));
+    return requests.abortRequest(id);
   },
   SetBadge: function (num, src) {
     setBadge(num, src);
@@ -146,7 +146,7 @@ vmdb.initialized.then(function () {
           // callback fails if not given in content page
         }
       };
-      res.then(function (data) {
+      Promise.resolve(res).then(function (data) {
         finish({
           data: data,
           error: null,

src/background/sync/index.js

@@ -104,7 +104,6 @@ var sync = function () {
     });
   }
   function syncOne(service) {
-    console.log(service);
     if (service.syncState.is(['ready', 'syncing'])) return;
     if (service.authState.is(['idle', 'error'])) return service.checkSync();
     if (service.authState.is('authorized')) return service.startSync();