From 5cbe8a8d780a6eb9fce11d5846e92bf244c3a3f3 Mon Sep 17 00:00:00 2001 From: eight Date: Tue, 2 Oct 2018 20:22:18 +0800 Subject: [PATCH] Add: fetch style object from DB directly in the editor (#507) --- background/background.js | 3 +++ edit/edit.js | 13 ++++++++++--- 2 files changed, 13 insertions(+), 3 deletions(-) diff --git a/background/background.js b/background/background.js index 80f3f13a..bbcd2954 100644 --- a/background/background.js +++ b/background/background.js @@ -14,6 +14,9 @@ window.API_METHODS = Object.assign(window.API_METHODS || {}, { saveStyle, deleteStyle, + getStyleFromDB: id => + dbExec('get', id).then(event => event.target.result), + download(msg) { delete msg.method; return download(msg.url, msg); diff --git a/edit/edit.js b/edit/edit.js index 796af1db..7ee8e21b 100644 --- a/edit/edit.js +++ b/edit/edit.js @@ -226,7 +226,7 @@ function isUsercss(style) { function initStyleData() { // TODO: remove .replace(/^\?/, '') when minimum_chrome_version >= 52 (https://crbug.com/601425) const params = new URLSearchParams(location.search.replace(/^\?/, '')); - const id = params.get('id'); + const id = Number(params.get('id')); const createEmptyStyle = () => ({ id: null, name: params.get('domain') || @@ -242,8 +242,8 @@ function initStyleData() { ) ], }); - return API.getStyles({id: id || -1}) - .then(([style = createEmptyStyle()]) => { + return fetchStyle() + .then(style => { styleId = style.id; if (styleId) sessionStorage.justEditedStyleId = styleId; // we set "usercss" class on when is empty @@ -257,6 +257,13 @@ function initStyleData() { } return style; }); + + function fetchStyle() { + if (id) { + return API.getStyleFromDB(id); + } + return Promise.resolve(createEmptyStyle()); + } } function initHooks() {