jeans/arduino-ide
jeans/arduino-ide
1
0
Fork 0
mirror of https://github.com/arduino/arduino-ide.git synced 2025-07-09 12:26:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixed bug when no 3rd party URLs are defined.

Browse Source 
Instead of adding an empty string URL, we add nothing.

Signed-off-by: Akos Kitta <kittaakos@typefox.io>
This commit is contained in:
Akos Kitta 2021-03-29 13:07:27 +02:00 committed by Akos Kitta
parent 369a8f4307
commit f106c97f1e
1 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
arduino-ide-extension/src/browser/settings.tsx
View File

@ -24,7 +24,7 @@ export interface Settings extends Index {
editorFontSize: number; // `editor.fontSize` editorFontSize: number; // `editor.fontSize`
themeId: string; // `workbench.colorTheme` themeId: string; // `workbench.colorTheme`
autoSave: 'on' | 'off'; // `editor.autoSave` autoSave: 'on' | 'off'; // `editor.autoSave`
quickSuggestions: Record<'other'|'comments'|'strings', boolean>; // `editor.quickSuggestions` quickSuggestions: Record<'other' | 'comments' | 'strings', boolean>; // `editor.quickSuggestions`
autoScaleInterface: boolean; // `arduino.window.autoScale` autoScaleInterface: boolean; // `arduino.window.autoScale`
interfaceScale: number; // `arduino.window.zoomLevel` https://github.com/eclipse-theia/theia/issues/8751 interfaceScale: number; // `arduino.window.zoomLevel` https://github.com/eclipse-theia/theia/issues/8751
@ -100,9 +100,9 @@ export class SettingsService {
this.preferenceService.get<string>('workbench.colorTheme', 'arduino-theme'), this.preferenceService.get<string>('workbench.colorTheme', 'arduino-theme'),
this.preferenceService.get<'on' | 'off'>('editor.autoSave', 'on'), this.preferenceService.get<'on' | 'off'>('editor.autoSave', 'on'),
this.preferenceService.get<object>('editor.quickSuggestion', { this.preferenceService.get<object>('editor.quickSuggestion', {
'other': false, 'other': false,
'comments': false, 'comments': false,
'strings': false 'strings': false
}), }),
this.preferenceService.get<boolean>('arduino.window.autoScale', true), this.preferenceService.get<boolean>('arduino.window.autoScale', true),
this.preferenceService.get<number>('arduino.window.zoomLevel', 0), this.preferenceService.get<number>('arduino.window.zoomLevel', 0),
@ -569,18 +569,18 @@ export class SettingsComponent extends React.Component<SettingsComponent.Props,
}; };
protected quickSuggestionsOtherDidChange = (event: React.ChangeEvent<HTMLInputElement>) => { protected quickSuggestionsOtherDidChange = (event: React.ChangeEvent<HTMLInputElement>) => {
// need to persist react events through lifecycle https://reactjs.org/docs/events.html#event-pooling // need to persist react events through lifecycle https://reactjs.org/docs/events.html#event-pooling
const newVal = event.target.checked ? true : false const newVal = event.target.checked ? true : false
this.setState(prevState => { this.setState(prevState => {
return { return {
quickSuggestions: { quickSuggestions: {
...prevState.quickSuggestions, ...prevState.quickSuggestions,
other: newVal other: newVal
} }
} }
}); });
}; };
protected themeDidChange = (event: React.ChangeEvent<HTMLSelectElement>) => { protected themeDidChange = (event: React.ChangeEvent<HTMLSelectElement>) => {
@ -823,7 +823,7 @@ export class AdditionalUrlsDialog extends AbstractDialog<string[]> {
} }
get value(): string[] { get value(): string[] {
return this.textArea.value.split('\n').map(url => url.trim()); return this.textArea.value.split('\n').map(url => url.trim()).filter(url => !!url);
} }
protected onAfterAttach(message: Message): void { protected onAfterAttach(message: Message): void {