Skip to content

Make sure the theme exists #444

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
LianaHus merged 4 commits into from
Sep 23, 2020
Merged

Make sure the theme exists #444

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
417c13c
make sure the theme exists
yann300 Sep 22, 2020
8068af6
fix checking the current theme
yann300 Sep 22, 2020
ee45007
checking query them for being from our theme list
LianaHus Sep 23, 2020
43884a8
made not constant to modify
LianaHus Sep 23, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 6 additions & 3 deletions apps/remix-ide/src/app/tabs/theme-module.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,9 +34,12 @@ export class ThemeModule extends Plugin {
config: registry.get('config').api
}
this.themes = themes.reduce((acc, theme) => ({ ...acc, [theme.name]: theme }), {})
const theme = (new QueryParams()).get().theme
this.active = theme || this._deps.config.get('settings/theme') || 'Dark'
this.forced = theme !== undefined
let queryTheme = (new QueryParams()).get().theme
queryTheme = this.themes[queryTheme] ? queryTheme : null
let currentTheme = this._deps.config.get('settings/theme')
currentTheme = this.themes[currentTheme] ? currentTheme : null
this.active = queryTheme || currentTheme || 'Dark'
this.forced = queryTheme !== undefined
}

/** Return the active theme */
Expand Down