From 57c1cb6c87c3b0b76b06ccbaf2fe4650bb948b9c Mon Sep 17 00:00:00 2001
From: Jonatan Nilsson <jonatan@nilsson.is>
Date: Sun, 15 Jul 2018 04:00:42 +0000
Subject: [PATCH] Fix bugs

---
 api/graphic/model.js            | 2 +-
 app/main/graphic/engine/text.js | 4 ++--
 config/config.default.json      | 3 ++-
 package.json                    | 4 ++--
 4 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/api/graphic/model.js b/api/graphic/model.js
index 1abe9ea..2dcce80 100644
--- a/api/graphic/model.js
+++ b/api/graphic/model.js
@@ -23,7 +23,7 @@ const Graphic = bookshelf.createModel({
       attributes.settings = JSON.parse(attributes.settings)
     }
     return attributes
-  }
+  },
 }, {
 })
 
diff --git a/app/main/graphic/engine/text.js b/app/main/graphic/engine/text.js
index 263d7c9..4afc9d1 100644
--- a/app/main/graphic/engine/text.js
+++ b/app/main/graphic/engine/text.js
@@ -55,7 +55,7 @@ exports.settings = function(module, graphic) {
     m('p.graphic-helper', `<div id="${graphic.name}">`),
     m('textarea#graphic-html', {
       rows: '4',
-      oninput: module.updated.bind(null, 'settings.html'),
+      oninput: module.updated.bind(module, 'settings.html'),
       value: graphic.settings.html || '',
     }),
     m('p.graphic-helper.bottom', `</div>`),
@@ -65,7 +65,7 @@ exports.settings = function(module, graphic) {
     m('p.graphic-helper', '<style type="text/css">'),
     m('textarea#graphic-css', {
       rows: '4',
-      oninput: module.updated.bind(null, 'settings.css'),
+      oninput: module.updated.bind(module, 'settings.css'),
       value: graphic.settings.css || '',
     }),
     m('p.graphic-helper.bottom', '</style>'),
diff --git a/config/config.default.json b/config/config.default.json
index c1c1327..6cba901 100644
--- a/config/config.default.json
+++ b/config/config.default.json
@@ -18,6 +18,7 @@
       "filename" : "./db.sqlite"
     },
     "migrations": {
-    }
+    },
+    "useNullAsDefault": true
   }
 }
\ No newline at end of file
diff --git a/package.json b/package.json
index 0b4891e..de0df6d 100644
--- a/package.json
+++ b/package.json
@@ -46,11 +46,11 @@
   "dependencies": {
     "babel-plugin-transform-es2015-modules-commonjs": "^6.26.0",
     "babel-register": "^6.26.0",
-    "bookshelf": "^0.13.3",
+    "bookshelf": "^0.11.1",
     "bunyan": "^1.8.12",
     "casparcg-connection": "4.1.0",
     "ip": "^1.1.5",
-    "knex": "^0.14.2",
+    "knex": "^0.12.9",
     "koa": "^2.4.1",
     "koa-better-serve": "^2.0.7",
     "koa-socket": "^4.4.0",