TheThing/filo_caspar
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Fix bugs

Browse source
This commit is contained in:
Jonatan Nilsson 2018-07-15 04:00:42 +00:00
parent 3ce1d60196
commit 57c1cb6c87
4 changed files with 7 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
api/graphic/model.js
View file

@ -23,7 +23,7 @@ const Graphic = bookshelf.createModel({
attributes.settings = JSON.parse(attributes.settings) attributes.settings = JSON.parse(attributes.settings)
} }
return attributes return attributes
} },
}, { }, {
}) })

4
app/main/graphic/engine/text.js
View file

@ -55,7 +55,7 @@ exports.settings = function(module, graphic) {
m('p.graphic-helper', `<div id="${graphic.name}">`), m('p.graphic-helper', `<div id="${graphic.name}">`),
m('textarea#graphic-html', { m('textarea#graphic-html', {
rows: '4', rows: '4',
oninput: module.updated.bind(null, 'settings.html'), oninput: module.updated.bind(module, 'settings.html'),
value: graphic.settings.html || '', value: graphic.settings.html || '',
}), }),
m('p.graphic-helper.bottom', `</div>`), m('p.graphic-helper.bottom', `</div>`),
@ -65,7 +65,7 @@ exports.settings = function(module, graphic) {
m('p.graphic-helper', '<style type="text/css">'), m('p.graphic-helper', '<style type="text/css">'),
m('textarea#graphic-css', { m('textarea#graphic-css', {
rows: '4', rows: '4',
oninput: module.updated.bind(null, 'settings.css'), oninput: module.updated.bind(module, 'settings.css'),
value: graphic.settings.css || '', value: graphic.settings.css || '',
}), }),
m('p.graphic-helper.bottom', '</style>'), m('p.graphic-helper.bottom', '</style>'),

3
config/config.default.json
View file

@ -18,6 +18,7 @@
"filename" : "./db.sqlite" "filename" : "./db.sqlite"
}, },
"migrations": { "migrations": {
} },
"useNullAsDefault": true
} }
} }

4
package.json
View file

@ -46,11 +46,11 @@
"dependencies": { "dependencies": {
"babel-plugin-transform-es2015-modules-commonjs": "^6.26.0", "babel-plugin-transform-es2015-modules-commonjs": "^6.26.0",
"babel-register": "^6.26.0", "babel-register": "^6.26.0",
"bookshelf": "^0.13.3", "bookshelf": "^0.11.1",
"bunyan": "^1.8.12", "bunyan": "^1.8.12",
"casparcg-connection": "4.1.0", "casparcg-connection": "4.1.0",
"ip": "^1.1.5", "ip": "^1.1.5",
"knex": "^0.14.2", "knex": "^0.12.9",
"koa": "^2.4.1", "koa": "^2.4.1",
"koa-better-serve": "^2.0.7", "koa-better-serve": "^2.0.7",
"koa-socket": "^4.4.0", "koa-socket": "^4.4.0",