frodovdr/node-red
1
0
Fork 0
mirror of https://github.com/node-red/node-red.git synced 2023-10-10 13:36:53 +02:00
Code Issues Releases Wiki Activity

editorTheme not setting custom css/scripts properly

Browse Source
This commit is contained in:
Nick O'Leary 2017-07-04 09:33:00 +01:00
parent 347e598715
commit 70a22187f7
No known key found for this signature in database
GPG Key ID: 4F2157149161A6C9
2 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
red/api/theme.js
View File

@ -98,11 +98,11 @@ module.exports = {
if (theme.page) { if (theme.page) {
themeContext.page.css = serveFilesFromTheme( themeContext.page.css = serveFilesFromTheme(
themeContext.page.css, theme.page.css,
themeApp, themeApp,
"/css/") "/css/")
themeContext.page.scripts = serveFilesFromTheme( themeContext.page.scripts = serveFilesFromTheme(
themeContext.page.scripts, theme.page.scripts,
themeApp, themeApp,
"/scripts/") "/scripts/")

7
test/red/api/theme_spec.js
View File

@ -55,7 +55,7 @@ describe("theme handler", function() {
page: { page: {
title: "Test Page Title", title: "Test Page Title",
favicon: "/absolute/path/to/theme/icon", favicon: "/absolute/path/to/theme/icon",
css: "/absolute/path/to/custom/css/file", css: "/absolute/path/to/custom/css/file.css",
scripts: "/absolute/path/to/script.js" scripts: "/absolute/path/to/script.js"
}, },
header: { header: {
@ -99,7 +99,12 @@ describe("theme handler", function() {
context.should.have.a.property("header"); context.should.have.a.property("header");
context.header.should.have.a.property("title","Test Header Title"); context.header.should.have.a.property("title","Test Header Title");
context.page.should.have.a.property("css"); context.page.should.have.a.property("css");
context.page.css.should.have.lengthOf(1);
context.page.css[0].should.eql('theme/css/file.css');
context.page.should.have.a.property("scripts"); context.page.should.have.a.property("scripts");
context.page.scripts.should.have.lengthOf(1);
context.page.scripts[0].should.eql('theme/scripts/script.js');
var settings = theme.settings(); var settings = theme.settings();
settings.should.have.a.property("deployButton"); settings.should.have.a.property("deployButton");