self-hosted/joplin
1
0
Fork 0
mirror of https://github.com/laurent22/joplin.git synced 2024-11-27 08:21:03 +02:00
Code Issues Releases Activity

Electron: Fixed option page checkboxes

Browse Source
This commit is contained in:
Laurent Cozic 2017-11-30 18:36:26 +00:00
parent 16bf0cf646
commit 9d7d469908
3 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
ElectronClient/app/app.js
View File

@ -360,11 +360,15 @@ class Application extends BaseApplication {
AlarmService.garbageCollect();
}, 1000 * 60 * 60);
reg.scheduleSync().then(() => {
// Wait for the first sync before updating the notifications, since synchronisation
// might change the notifications.
if (Setting.value('env') === 'dev') {
AlarmService.updateAllNotifications();
});
} else {
reg.scheduleSync().then(() => {
// Wait for the first sync before updating the notifications, since synchronisation
// might change the notifications.
AlarmService.updateAllNotifications();
});
}
}
}

6
ElectronClient/app/gui/ConfigScreen.jsx
View File

@ -31,6 +31,8 @@ class ConfigScreenComponent extends React.Component {
Setting.setValue(key, value);
}
// Component key needs to be key+value otherwise it doesn't update when the settings change.
const md = Setting.settingMetadata(key);
if (md.isEnum) {
@ -42,7 +44,7 @@ class ConfigScreenComponent extends React.Component {
}
return (
<div key={key} style={rowStyle}>
<div key={key+value} style={rowStyle}>
<div style={labelStyle}><label>{md.label()}</label></div>
<select value={value} style={controlStyle} onChange={(event) => { updateSettingValue(key, event.target.value) }}>
{items}
@ -51,7 +53,7 @@ class ConfigScreenComponent extends React.Component {
);
} else if (md.type === Setting.TYPE_BOOL) {
return (
<div key={key} style={rowStyle}>
<div key={key+value} style={rowStyle}>
<div style={controlStyle}>
<label><input type="checkbox" defaultChecked={!!value} onChange={(event) => { updateSettingValue(key, !!event.target.checked) }}/><span style={labelStyle}> {md.label()}</span></label>
</div>

2
ElectronClient/app/gui/Root.jsx
View File

@ -74,7 +74,7 @@ class RootComponent extends React.Component {
Main: { screen: MainScreen },
OneDriveLogin: { screen: OneDriveLoginScreen, title: () => _('OneDrive Login') },
Import: { screen: ImportScreen, title: () => _('Import') },
Config: { screen: ConfigScreen, title: () => _('Configuration') },
Config: { screen: ConfigScreen, title: () => _('Options') },
};
return (