Update usercss API

background/background.js

@@ -1,5 +1,4 @@
 /*
-global dbExec getStyles saveStyle deleteStyle
 global handleCssTransitionBug detectSloppyRegexps
 global openEditor
 global styleViaAPI
@@ -15,6 +14,7 @@ window.API_METHODS = Object.assign(window.API_METHODS || {}, {
   toggleStyle: styleManager.toggleStyle,
   deleteStyle: styleManager.deleteStyle,
   getStylesInfoByUrl: styleManager.getStylesInfoByUrl,
+  installStyle: styleManager.installStyle,
 
   getStyleFromDB: id =>
     db.exec('get', id).then(event => event.target.result),
@@ -306,7 +306,7 @@ function webNavUsercssInstallerFF(data) {
     getTab(tabId),
   ]).then(([pong, tab]) => {
     if (pong !== true && tab.url !== 'about:blank') {
-      window.API_METHODS.installUsercss({direct: true}, {tab});
+      window.API_METHODS.openUsercssInstallPage({direct: true}, {tab});
     }
   });
 }

background/storage.js

@@ -149,11 +149,6 @@ function filterStylesInternal({
     : filtered;
 }
 
-
-function saveStyle(style) {
-}
-
-
 function deleteStyle({id, notify = true}) {
   id = Number(id);
   return dbExec('delete', id).then(() => {

background/update.js

@@ -1,5 +1,5 @@
 /*
-global getStyles saveStyle styleSectionsEqual
+global styleSectionsEqual
 global calcStyleDigest cachedStyles getStyleWithNoCode
 global usercss semverCompare
 global API_METHODS styleManager
@@ -173,7 +173,7 @@ global API_METHODS styleManager
 
       json.id = style.id;
       json.updateDate = Date.now();
-      json.reason = 'update';
+      // json.reason = 'update';
 
       // keep current state
       delete json.enabled;
@@ -185,10 +185,11 @@ global API_METHODS styleManager
         json.originalName = json.name;
       }
 
+      const newStyle = Object.assign({}, style, json);
       if (styleSectionsEqual(json, style, {checkSource: true})) {
         // update digest even if save === false as there might be just a space added etc.
-        json.reason = 'update-digest';
+        // json.reason = 'update-digest';
-        return saveStyle(json)
+        return styleManager.installStyle(newStyle)
           .then(saved => {
             style.originalDigest = saved.originalDigest;
             return Promise.reject(STATES.SAME_CODE);
@@ -200,8 +201,8 @@ global API_METHODS styleManager
       }
 
       return save ?
-        API_METHODS[json.usercssData ? 'saveUsercss' : 'saveStyle'](json) :
+        API_METHODS[json.usercssData ? 'installUsercss' : 'installStyle'](newStyle) :
-        json;
+        newStyle;
     }
 
     function styleJSONseemsValid(json) {

background/usercss-helper.js

@@ -1,12 +1,17 @@
-/* global API_METHODS usercss saveStyle getStyles chromeLocal cachedStyles */
+/* global API_METHODS usercss chromeLocal */
 'use strict';
 
 (() => {
 
-  API_METHODS.saveUsercss = style => save(style, false);
+  // API_METHODS.saveUsercss = style => save(style, false);
-  API_METHODS.saveUsercssUnsafe = style => save(style, true);
+  // API_METHODS.saveUsercssUnsafe = style => save(style, true);
+  API_METHODS.installUsercss
+  API_METHODS.editSaveUsercss
+  API_METHODS.configUsercssVars = (id, vars) => newVars
+
   API_METHODS.buildUsercss = build;
-  API_METHODS.installUsercss = install;
+  API_METHODS.openUsercssInstallPage
+  // API_METHODS.installUsercss = install;
   API_METHODS.parseUsercss = parse;
   API_METHODS.findUsercss = find;
 

content/install-hook-openusercss.js

@@ -128,8 +128,7 @@
     && event.data.type === 'ouc-install-usercss'
     && allowedOrigins.includes(event.origin)
     ) {
-      API.saveUsercss({
+      API.installUsercss({
-        reason: 'install',
         name: event.data.title,
         sourceCode: event.data.code,
       }).then(style => {

content/install-hook-usercss.js

@@ -16,7 +16,7 @@
   let sourceCode, port, timer;
 
   chrome.runtime.onConnect.addListener(onConnected);
-  API.installUsercss({url})
+  API.openUsercssInstallPage({url})
     .catch(err => alert(err));
 
   function onConnected(newPort) {

edit/source-editor.js

@@ -224,17 +224,13 @@ function createSourceEditor(style) {
       exclusionList
     });
     return ensureUniqueStyle(code)
-      .then(() => API.saveUsercssUnsafe({
+      .then(() => API.editSaveUsercss({
         id: style.id,
-        reason: 'editSave',
         enabled: style.enabled,
         sourceCode: code,
         exclusions: exclusionList
       }))
-      .then(({style, errors}) => {
+      .then(replaceStyle)
-        replaceStyle(style);
-        if (errors) return Promise.reject(errors);
-      })
       .catch(err => {
         if (err.handled) return;
         if (err.message === t('styleMissingMeta', 'name')) {

install-usercss/install-usercss.js

@@ -86,13 +86,12 @@
       cm.setCursor(cursor);
       cm.scrollTo(scrollInfo.left, scrollInfo.top);
 
-      API.saveUsercssUnsafe({
+      API.installUsercss({
         id: (installed || installedDup).id,
         reason: 'update',
         sourceCode
-      }).then(({style, errors}) => {
+      }).then(style => {
         updateMeta(style);
-        if (errors) return Promise.reject(errors);
       }).catch(showError);
     });
   }
@@ -301,7 +300,7 @@
           data.version,
         ]))
       ).then(ok => ok &&
-        API.saveUsercss(Object.assign(style, dup && {reason: 'update'}))
+        API.installUsercss(style)
           .then(install)
           .catch(err => messageBox.alert(t('styleInstallFailed', err), 'pre'))
       );

manage/config-dialog.js

@@ -171,9 +171,9 @@ function configDialog(style) {
       return;
     }
     saving = true;
-    return API.saveUsercss(style)
+    return API.configUsercssVar(style.id, style.usercssData.vars)
-      .then(saved => {
+      .then(newVars => {
-        varsInitial = getInitialValues(saved.usercssData.vars);
+        varsInitial = getInitialValues(newVars);
         vars.forEach(va => onchange({target: va.input, justSaved: true}));
         renderValues();
         updateButtons();

manage/import-export.js

@@ -41,7 +41,7 @@ function importFromFile({fileTypeFilter, file} = {}) {
             importFromString(text) :
             getOwnTab().then(tab => {
               tab.url = URL.createObjectURL(new Blob([text], {type: 'text/css'}));
-              return API.installUsercss({direct: true, tab})
+              return API.openUsercssInstallPage({direct: true, tab})
                 .then(() => URL.revokeObjectURL(tab.url));
             })
           ).then(numStyles => {

manage/manage.js

@@ -415,8 +415,8 @@ Object.assign(handleEvent, {
     event.preventDefault();
     const json = entry.updatedCode;
     json.id = entry.styleId;
-    json.reason = 'update';
+    // json.reason = 'update';
-    API[json.usercssData ? 'saveUsercss' : 'saveStyle'](json);
+    API[json.usercssData ? 'installUsercss' : 'installStyle'](json);
   },
 
   delete(event, entry) {