From 8eb87e85b0b7186261ba9ad8c3e6b089735b9afc Mon Sep 17 00:00:00 2001 From: wanxp <977741432@qq.com> Date: Mon, 31 Oct 2022 01:22:52 +0800 Subject: [PATCH] hotfix v1.5.1 --- main.ts | 6 ++++-- src/douban/data/handler/DoubanAbstractLoadHandler.ts | 2 +- src/douban/data/search/DoubanSearchModal.ts | 1 - src/utils/Logutil.ts | 2 +- 4 files changed, 6 insertions(+), 5 deletions(-) diff --git a/main.ts b/main.ts index 6eccce5..b032977 100644 --- a/main.ts +++ b/main.ts @@ -50,7 +50,6 @@ export default class DoubanPlugin extends Plugin { } async getDoubanTextForActiveFile(editor: Editor) { - this.doubanStatusBar = this.addStatusBarItem(); const activeFile = await this.app.workspace.getActiveFile(); if (activeFile) { const searchTerm = activeFile.basename; @@ -67,7 +66,9 @@ export default class DoubanPlugin extends Plugin { async onload() { await this.loadSettings(); - this.addCommand({ + this.doubanStatusBar = this.addStatusBarItem(); + + this.addCommand({ id: "search-douban-by-current-file-name", name: i18nHelper.getMessage("110001"), editorCallback: (editor: Editor) => @@ -102,6 +103,7 @@ export default class DoubanPlugin extends Plugin { } showStatus(origin:string, message:string) { + this.doubanStatusBar.empty(); // @ts-ignore this.doubanStatusBar.setText(i18nHelper.getMessage(origin).replace('{0}', message)); diff --git a/src/douban/data/handler/DoubanAbstractLoadHandler.ts b/src/douban/data/handler/DoubanAbstractLoadHandler.ts index 9c96887..290f6c6 100644 --- a/src/douban/data/handler/DoubanAbstractLoadHandler.ts +++ b/src/douban/data/handler/DoubanAbstractLoadHandler.ts @@ -114,7 +114,7 @@ export default abstract class DoubanAbstractLoadHandler .then(this.parseSubjectFromHtml) .then(content => this.toEditor(editor, content)) // .then(content => content ? editor.replaceSelection(content) : content) - .catch(log.error(i18nHelper.getMessage('130101'))) + .catch(e => log.error(i18nHelper.getMessage('130101'))) ; } diff --git a/src/douban/data/search/DoubanSearchModal.ts b/src/douban/data/search/DoubanSearchModal.ts index 4d29867..4bdcd44 100644 --- a/src/douban/data/search/DoubanSearchModal.ts +++ b/src/douban/data/search/DoubanSearchModal.ts @@ -53,7 +53,6 @@ export class DoubanSearchModal extends Modal { async onClose() { let {contentEl} = this; - contentEl.empty(); if (this.searchTerm) { await this.plugin.search(this.searchTerm, this.editor); diff --git a/src/utils/Logutil.ts b/src/utils/Logutil.ts index 45cd5c0..3ad25e4 100644 --- a/src/utils/Logutil.ts +++ b/src/utils/Logutil.ts @@ -14,7 +14,7 @@ class Logger { } public info(e: any): any { - console.log(`Douban Plugin info:` + `${typeof e == 'string' ? e : JSON.stringify(e)}`); + // console.log(`Douban Plugin info:` + `${typeof e == 'string' ? e : JSON.stringify(e)}`); return e; }