@@ -122,7 +122,7 @@
@@ -268,8 +268,8 @@
diff --git a/client/js/libs/handlebars/firstLetterUppercase.js b/client/js/libs/handlebars/firstLetterUppercase.js
deleted file mode 100644
index d36bff54..00000000
--- a/client/js/libs/handlebars/firstLetterUppercase.js
+++ /dev/null
@@ -1,5 +0,0 @@
-"use strict";
-
-module.exports = function(string) {
- return string.charAt(0).toUpperCase() + string.slice(1);
-};
diff --git a/client/js/libs/handlebars/index.js b/client/js/libs/handlebars/index.js
deleted file mode 100644
index fe485b47..00000000
--- a/client/js/libs/handlebars/index.js
+++ /dev/null
@@ -1,18 +0,0 @@
-"use strict";
-
-module.exports = {
- colorClass: require("./colorClass"),
- diff: require("./diff"),
- equal: require("./equal"),
- firstLetterUppercase: require("./firstLetterUppercase"),
- localedate: require("./localedate"),
- localetime: require("./localetime"),
- modes: require("./modes"),
- parse: require("./parse"),
- roundBadgeNumber: require("./roundBadgeNumber"),
- slugify: require("./slugify"),
- ternary: require("./ternary"),
- tojson: require("./tojson"),
- tz: require("./tz"),
- users: require("./users"),
-};
diff --git a/client/js/libs/handlebars/ternary.js b/client/js/libs/handlebars/ternary.js
deleted file mode 100644
index 4dfa2995..00000000
--- a/client/js/libs/handlebars/ternary.js
+++ /dev/null
@@ -1,5 +0,0 @@
-"use strict";
-
-module.exports = function(test, yes, no) {
- return test ? yes : no;
-};
diff --git a/package.json b/package.json
index 3628e2b3..98754da7 100644
--- a/package.json
+++ b/package.json
@@ -46,7 +46,7 @@
"commander": "2.9.0",
"event-stream": "3.3.4",
"express": "4.15.2",
- "express-handlebars": "^3.0.0",
+ "express-handlebars": "3.0.0",
"fs-extra": "2.1.2",
"irc-framework": "2.6.1",
"ldapjs": "1.0.1",
diff --git a/src/server.js b/src/server.js
index 082ef98f..db92efe7 100644
--- a/src/server.js
+++ b/src/server.js
@@ -32,7 +32,7 @@ module.exports = function() {
.use(allRequests)
.use(index)
.use(express.static("client"))
- .engine("html", expressHandlebars({extname: ".html", helpers: require("../client/js/libs/handlebars")}))
+ .engine("html", expressHandlebars({extname: ".html"}))
.set("view engine", "html")
.set("views", path.join(__dirname, "..", "client"));
@@ -138,7 +138,11 @@ function index(req, res, next) {
data.themes = fs.readdirSync("client/themes/").filter(function(themeFile) {
return themeFile.endsWith(".css");
}).map(function(css) {
- return css.slice(0, -4);
+ const filename = css.slice(0, -4);
+ return {
+ name: filename.charAt(0).toUpperCase() + filename.slice(1),
+ filename: filename
+ };
});
res.setHeader("Content-Security-Policy", "default-src *; connect-src 'self' ws: wss:; style-src * 'unsafe-inline'; script-src 'self'; child-src 'self'; object-src 'none'; form-action 'none';");
res.setHeader("Referrer-Policy", "no-referrer");