Skip to content

Offline, privacy-first grammar checker. Fast, open-source, Rust-powered

refactor: cleaner, smoother operation

hippietrail39a9ef74ab61
diff --git a/packages/obsidian-plugin/src/HarperSettingTab.ts b/packages/obsidian-plugin/src/HarperSettingTab.ts
index 15d386328..36f9b23f8 100644
--- a/packages/obsidian-plugin/src/HarperSettingTab.ts
+++ b/packages/obsidian-plugin/src/HarperSettingTab.ts
@@ -49,9 +49,10 @@ export class HarperSettingTab extends PluginSettingTab {
.addOption(Dialect.Australian.toString(), 'Australian')
.setValue((this.settings.dialect ?? Dialect.American).toString())
.onChange(async (value) => {
- this.settings.dialect = Number.parseInt(value);
+ const dialect = Number.parseInt(value);
+ this.settings.dialect = dialect;
await this.plugin.initializeFromSettings(this.settings);
- this.plugin.updateStatusBar();
+ this.plugin.updateStatusBar(dialect);
});
});
diff --git a/packages/obsidian-plugin/src/index.ts b/packages/obsidian-plugin/src/index.ts
index 360a3b076..67d43766b 100644
--- a/packages/obsidian-plugin/src/index.ts
+++ b/packages/obsidian-plugin/src/index.ts
@@ -39,7 +39,7 @@ export default class HarperPlugin extends Plugin {
private harper: Linter;
private editorExtensions: Extension[];
private delay: number;
- private statusBarItem: HTMLElement | null = null;
+ private dialectSpan: HTMLSpanElement | null = null;
constructor(app: App, manifest: PluginManifest) {
super(app, manifest);
@@ -128,16 +128,26 @@ export default class HarperPlugin extends Plugin {
return await this.harper.getLintDescriptions();
}
- private setupStatusBar() {
- // Remove the old status bar item
- if (this.statusBarItem) {
- this.statusBarItem.remove();
+ private getDialectStatus(dialectNum: Dialect): string {
+ const code = {
+ American: 'US',
+ British: 'GB',
+ Australian: 'AU',
+ Canadian: 'CA',
+ }[Dialect[dialectNum]];
+ if (code === undefined) {
+ return '';
}
+ return `${code
+ .split('')
+ .map((c) => String.fromCodePoint(c.charCodeAt(0) + 127397))
+ .join('')}${code}`;
+ }
+ private setupStatusBar() {
/** @type HTMLElement */
const statusBarItem = this.addStatusBarItem();
statusBarItem.className += ' mod-clickable';
- this.statusBarItem = statusBarItem;
const button = document.createElement('span');
button.style.display = 'flex';
@@ -146,26 +156,14 @@ export default class HarperPlugin extends Plugin {
const logo = document.createElement('span');
logo.style.width = '24px';
logo.innerHTML = logoSvg;
-
button.appendChild(logo);
+ const dialect = document.createElement('span');
+ this.dialectSpan = dialect;
+
this.harper.getDialect().then((dialectNum) => {
- if (dialectNum !== undefined) {
- const code = {
- American: 'US',
- Australian: 'AU',
- British: 'GB',
- Canadian: 'CA',
- }[Dialect[dialectNum]];
- if (code !== undefined) {
- const dialect = document.createElement('span');
- dialect.innerHTML += `${code
- .split('')
- .map((c) => String.fromCodePoint(c.charCodeAt(0) + 127397))
- .join('')}${code}`;
- button.appendChild(dialect);
- }
- }
+ dialect.innerHTML = this.getDialectStatus(dialectNum);
+ button.appendChild(dialect);
});
button.addEventListener('click', (event) => {
@@ -302,9 +300,10 @@ export default class HarperPlugin extends Plugin {
);
}
- updateStatusBar() {
- console.log('Updating status bar');
- this.setupStatusBar();
+ updateStatusBar(dialect: Dialect) {
+ if (this.dialectSpan != null) {
+ this.dialectSpan.innerHTML = this.getDialectStatus(dialect);
+ }
}
}