Skip to content

Commit 056a332

Browse files
committed
Add catch for feature errors, fix inline feature and alias
1 parent 08110c2 commit 056a332

File tree

5 files changed

+14
-7
lines changed

5 files changed

+14
-7
lines changed

main.ts

+8-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import "reflect-metadata";
22

3-
import { AppExt, CachedMetadata, Modal, Plugin } from "obsidian";
3+
import { AppExt, CachedMetadata, Modal, Notice, Plugin } from "obsidian";
44
import { SettingsEvent, SettingsType } from "@src/Settings/SettingsType";
55
import SettingsTab from "@src/Settings/SettingsTab";
66
import Storage from "@src/Storage/Storage";
@@ -152,7 +152,13 @@ export default class MetaTitlePlugin extends Plugin implements PluginInterface {
152152
}
153153

154154
for (const [id, state] of states) {
155-
this.fc.toggle(id, state as boolean);
155+
try {
156+
this.fc.toggle(id, state as boolean);
157+
} catch (e) {
158+
//TODO: refactor
159+
this.fc.toggle(id, false);
160+
new Notice(e);
161+
}
156162
}
157163
}
158164

src/Feature/Alias/Alias.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ export default class Alias {
4747
}
4848

4949
private getPossibleKeys(): string[] {
50-
return ["alias", "aliases"];
50+
return ["aliases", "alias"];
5151
}
5252

5353
private modify(alias: string | string[]): void {

src/Feature/InlineTitle/InlineTitleManager.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@ export class InlineTitleManager extends AbstractManager {
9898
const id = this.getTitleElId(view);
9999
const original = view.inlineTitleEl;
100100
const { created } = this.fakeTitleElementService.getOrCreate({ original, title, id, events: ["click"] });
101-
if (created) {
101+
if (created && !original.isActiveElement()) {
102102
this.fakeTitleElementService.setVisible(id, true);
103103
}
104104
return id;

src/Utils/FakeTitleElementService.ts

+1
Original file line numberDiff line numberDiff line change
@@ -88,6 +88,7 @@ export default class FakeTitleElementService {
8888
}
8989

9090
container.insertBefore(element, original);
91+
element.hidden = true;
9192

9293
return { created: true, element };
9394
}

test/unit/Feature/Alias/Alias.spec.ts

+3-3
Original file line numberDiff line numberDiff line change
@@ -66,15 +66,15 @@ describe("Test mutation", () => {
6666
});
6767
});
6868
describe("Test mutation of empty object", () => {
69-
const data: { alias?: any } = {};
69+
const data: { aliases?: any } = {};
7070
const alias = new Alias(data);
7171
test("Should set `foo` as a value and createNamed new key", () => {
7272
expect(alias.getKey()).toBeNull();
7373
expect(alias.getValue()).toBeNull();
7474
alias.setValue("foo");
75-
expect(alias.getKey()).toEqual("alias");
75+
expect(alias.getKey()).toEqual("aliases");
7676
expect(alias.getValue()).toEqual("foo");
77-
expect(data.alias).toEqual("foo");
77+
expect(data.aliases).toEqual("foo");
7878
});
7979
test("Should restore data", () => {
8080
alias.restore();

0 commit comments

Comments
 (0)