supernets/hardlounge
supernets/hardlounge
4
Fork 0
Code Issues 1 Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #1542 from thelounge/xpaw/move-theme-warning

Browse Source 
Print compatibility theme setting only once warning on startup
This commit is contained in:
Jérémie Astori 2017-09-19 21:14:29 -04:00 committed by GitHub
commit a181d79544
2 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/helper.js
View File

@ -84,6 +84,14 @@ function setHome(homePath) {
log.warn("debug option is now an object, see defaults file for more information.");
this.config.debug = {ircFramework: true};
}
// TODO: Remove in future release
// Backwards compatibility for old way of specifying themes in settings
if (this.config.theme.includes(".css")) {
log.warn(`Referring to CSS files in the ${colors.green("theme")} setting of ${colors.green(Helper.CONFIG_PATH)} is ${colors.bold("deprecated")} and will be removed in a future version.`);
} else {
this.config.theme = `themes/${this.config.theme}.css`;
}
}
function getUserConfigPath(name) {

5
src/server.js
View File

@ -201,11 +201,6 @@ function index(req, res, next) {
pkg,
Helper.config
);
if (!data.theme.includes(".css")) { // Backwards compatibility for old way of specifying themes in settings
data.theme = `themes/${data.theme}.css`;
} else {
log.warn(`Referring to CSS files in the ${colors.green("theme")} setting of ${colors.green(Helper.CONFIG_PATH)} is ${colors.bold("deprecated")} and will be removed in a future version.`);
}
data.gitCommit = Helper.getGitCommit();
data.themes = themes.getAll();