Skip to content

Commit 0a28aca

Browse files
committed
last fixes for #26
1 parent 61ebbc8 commit 0a28aca

File tree

4 files changed

+33
-7
lines changed

4 files changed

+33
-7
lines changed

src/modals/MediaDbFolderImportModal.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ export class MediaDbFolderImportModal extends Modal {
4646
const appendContentToggleElementWrapper = contentEl.createEl('div', {cls: 'media-db-plugin-list-wrapper'});
4747
const appendContentToggleTextWrapper = appendContentToggleElementWrapper.createEl('div', {cls: 'media-db-plugin-list-text-wrapper'});
4848
appendContentToggleTextWrapper.createEl('span', {
49-
text: 'If this is enabled, the plugin will override meta data fields with the same name.',
49+
text: 'If this is enabled, the plugin will override metadata fields with the same name.',
5050
cls: 'media-db-plugin-list-text',
5151
});
5252

@@ -59,7 +59,7 @@ export class MediaDbFolderImportModal extends Modal {
5959

6060

6161
contentEl.createDiv({cls: 'media-db-plugin-spacer'});
62-
contentEl.createEl('h3', {text: 'The name of the mata data field that should be used as the title to query'});
62+
contentEl.createEl('h3', {text: 'The name of the metadata field that should be used as the title to query.'});
6363

6464
const placeholder = 'title';
6565
const titleFieldNameComponent = new TextComponent(contentEl);

src/modals/SelectModal.ts

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,11 +72,13 @@ export abstract class SelectModal<T> extends Modal {
7272
contentEl.createEl('h2', {text: this.title});
7373
contentEl.createEl('p', {text: this.description});
7474

75+
contentEl.addClass('media-db-plugin-select-modal');
76+
7577
const elementWrapper = contentEl.createDiv({cls: 'media-db-plugin-select-wrapper'});
7678

7779
let i = 0;
7880
for (const element of this.elements) {
79-
const selectModalElement = new SelectModalElement(element, contentEl, i, this, false);
81+
const selectModalElement = new SelectModalElement(element, elementWrapper, i, this, false);
8082

8183
this.selectModalElements.push(selectModalElement);
8284

@@ -85,6 +87,8 @@ export abstract class SelectModal<T> extends Modal {
8587
i += 1;
8688
}
8789

90+
this.selectModalElements.first()?.element.scrollIntoView();
91+
8892
const bottomSetting = new Setting(contentEl);
8993
bottomSetting.addButton(btn => btn.setButtonText('Cancel').onClick(() => this.close()));
9094
if (this.skipButton) {

src/settings/Settings.ts

Lines changed: 19 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,11 @@ import {FileSuggest} from './suggesters/FileSuggest';
77

88
export interface MediaDbPluginSettings {
99
folder: string,
10-
sfwFilter: boolean,
1110
OMDbKey: string,
11+
sfwFilter: boolean,
12+
useCustomYamlStringifier: boolean;
13+
templates: boolean,
14+
1215

1316
movieTemplate: string,
1417
seriesTemplate: string,
@@ -28,13 +31,14 @@ export interface MediaDbPluginSettings {
2831
wikiPropertyConversionRules: string,
2932
musicReleasePropertyConversionRules: string,
3033

31-
templates: boolean,
3234
}
3335

3436
export const DEFAULT_SETTINGS: MediaDbPluginSettings = {
3537
folder: 'Media DB',
36-
sfwFilter: true,
3738
OMDbKey: '',
39+
sfwFilter: true,
40+
useCustomYamlStringifier: true,
41+
templates: true,
3842

3943
movieTemplate: '',
4044
seriesTemplate: '',
@@ -54,7 +58,7 @@ export const DEFAULT_SETTINGS: MediaDbPluginSettings = {
5458
wikiPropertyConversionRules: '',
5559
musicReleasePropertyConversionRules: '',
5660

57-
templates: true,
61+
5862
};
5963

6064
export class MediaDbSettingTab extends PluginSettingTab {
@@ -108,6 +112,17 @@ export class MediaDbSettingTab extends PluginSettingTab {
108112
});
109113
});
110114

115+
new Setting(containerEl)
116+
.setName('YAML formatter')
117+
.setDesc('Add optional quotation marks around strings in the metadata block.')
118+
.addToggle(cb => {
119+
cb.setValue(this.plugin.settings.useCustomYamlStringifier)
120+
.onChange(data => {
121+
this.plugin.settings.useCustomYamlStringifier = data;
122+
this.plugin.saveSettings();
123+
});
124+
});
125+
111126
new Setting(containerEl)
112127
.setName('Resolve {{ tags }} in templates')
113128
.setDesc('Whether to resolve {{ tags }} in templates. The spaces inside the curly braces are important.')

styles.css

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,15 @@ small.media-db-plugin-list-text{
2222
color: var(--text-muted);
2323
}
2424

25+
.media-db-plugin-select-modal {
26+
display: flex;
27+
flex-direction: column;
28+
}
29+
2530
.media-db-plugin-select-wrapper {
2631
margin: 5px;
32+
flex: 1;
33+
overflow-y: auto;
2734
}
2835

2936
.media-db-plugin-select-element {

0 commit comments

Comments
 (0)