Skip to content

Commit

Permalink
Handle prefs callbacks by key and value
Browse files Browse the repository at this point in the history
darkdh committed Aug 5, 2016
1 parent a178b56 commit 17bbf81
Showing 2 changed files with 22 additions and 17 deletions.
35 changes: 20 additions & 15 deletions app/index.js
Original file line number Diff line number Diff line change
@@ -394,23 +394,28 @@ app.on('ready', () => {
app.quit()
})

ipcMain.on(messages.PREFS_RESTART, () => {
ipcMain.on(messages.PREFS_RESTART, (config, value) => {
var message = locale.translation('prefsRestart')

appActions.showMessageBox({
buttons: [locale.translation('yes'), locale.translation('no')],
options: {
persist: false
},
message
})
prefsRestartCallbacks[message] = (buttonIndex, persist) => {
delete prefsRestartCallbacks[message]
if (buttonIndex === 0) {
app.relaunch({args: process.argv.slice(1) + ['--relaunch']})
app.quit()
} else {
appActions.hideMessageBox(message)
if (prefsRestartCallbacks[config + value]) {
delete prefsRestartCallbacks[config + value]
appActions.hideMessageBox(message)
} else {
appActions.showMessageBox({
buttons: [locale.translation('yes'), locale.translation('no')],
options: {
persist: false
},
message
})
prefsRestartCallbacks[config + value] = (buttonIndex, persist) => {
delete prefsRestartCallbacks[config + value]
if (buttonIndex === 0) {
app.relaunch({args: process.argv.slice(1) + ['--relaunch']})
app.quit()
} else {
appActions.hideMessageBox(message)
}
}
}
})
4 changes: 2 additions & 2 deletions js/about/preferences.js
Original file line number Diff line number Diff line change
@@ -423,7 +423,7 @@ class ShieldsTab extends ImmutableComponent {
class SecurityTab extends ImmutableComponent {
onToggleFlash (e) {
aboutActions.setResourceEnabled(flash, e.target.value)
ipc.send(messages.PREFS_RESTART)
ipc.send(messages.PREFS_RESTART, flash, e.target.value)
}
render () {
return <div>
@@ -661,7 +661,7 @@ class AboutPreferences extends React.Component {
aboutActions.changeSetting(key, value)
if (key === settings.DO_NOT_TRACK || key === settings.HARDWARE_ACCELERATION_ENABLED ||
key === settings.PDFJS_ENABLED || key === settings.SMOOTH_SCROLL_ENABLED) {
ipc.send(messages.PREFS_RESTART)
ipc.send(messages.PREFS_RESTART, key, value)
}
}

0 comments on commit 17bbf81

Please sign in to comment.