mirror of
https://github.com/Start9Labs/start-os.git
synced 2026-03-26 18:31:52 +00:00
ui: no mutations, less hacky
This commit is contained in:
committed by
Aiden McClelland
parent
55179e3ead
commit
d3dbdebbcf
@@ -28,6 +28,8 @@ export class OSWelcomePage {
|
||||
.then(() => this.apiService.acknowledgeOSWelcome(this.config.version))
|
||||
.catch(console.error)
|
||||
|
||||
return this.modalCtrl.dismiss({ autoCheckUpdates: this.autoCheckUpdates })
|
||||
// return false to skip subsequent alert modals
|
||||
// return true to show subsequent alert modals
|
||||
return this.modalCtrl.dismiss(this.autoCheckUpdates)
|
||||
}
|
||||
}
|
||||
|
||||
@@ -39,7 +39,7 @@ export class StartupAlertsNotifier {
|
||||
c.hasRun = true
|
||||
if (!checkRes) return
|
||||
const displayRes = await previousDisplay
|
||||
if (c.shouldRun(server) && !!displayRes) return c.display(checkRes)
|
||||
if (displayRes) return c.display(checkRes)
|
||||
}, Promise.resolve(true))
|
||||
}
|
||||
|
||||
@@ -103,8 +103,7 @@ export class StartupAlertsNotifier {
|
||||
|
||||
await modal.present()
|
||||
modal.onWillDismiss().then(res => {
|
||||
s = Object.assign(s, res.data)
|
||||
return resolve(true)
|
||||
return resolve(res.data)
|
||||
})
|
||||
})
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user