summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--lib/models/index.js2
-rwxr-xr-xlib/response.js2
-rw-r--r--package.json2
-rwxr-xr-xpublic/js/reveal-markdown.js2
4 files changed, 4 insertions, 4 deletions
diff --git a/lib/models/index.js b/lib/models/index.js
index 0679a7fc..e3aa8bf3 100644
--- a/lib/models/index.js
+++ b/lib/models/index.js
@@ -10,7 +10,7 @@ var config = require('../config')
var logger = require('../logger')
var dbconfig = cloneDeep(config.db)
-dbconfig.logger = config.debug ? logger.info : false
+dbconfig.logging = config.debug ? logger.info : false
var sequelize = null
diff --git a/lib/response.js b/lib/response.js
index cda484e7..a22d1e70 100755
--- a/lib/response.js
+++ b/lib/response.js
@@ -575,7 +575,7 @@ function showPublishSlide (req, res, next) {
updatetime: updatetime,
url: origin,
body: markdown,
- theme: utils.isRevealTheme(meta.slideOptions.theme),
+ theme: meta.slideOptions && utils.isRevealTheme(meta.slideOptions.theme),
meta: JSON.stringify(extracted.meta),
useCDN: config.usecdn,
owner: note.owner ? note.owner.id : null,
diff --git a/package.json b/package.json
index 7e38fda8..e4a0c7e9 100644
--- a/package.json
+++ b/package.json
@@ -8,7 +8,7 @@
"test": "npm run-script standard",
"standard": "node ./node_modules/standard/bin/cmd.js",
"dev": "webpack --config webpack.config.js --progress --colors --watch",
- "build": "webpack --config webpack.production.js --progress --colors",
+ "build": "webpack --config webpack.production.js --progress --colors --bail",
"postinstall": "bin/heroku",
"start": "node app.js"
},
diff --git a/public/js/reveal-markdown.js b/public/js/reveal-markdown.js
index eca148d8..94f6fb91 100755
--- a/public/js/reveal-markdown.js
+++ b/public/js/reveal-markdown.js
@@ -18,7 +18,7 @@ import { md } from './extra'
}
}(this, function () {
var DEFAULT_SLIDE_SEPARATOR = '^\r?\n---\r?\n$'
- var DEFAULT_NOTES_SEPARATOR = 'note:'
+ var DEFAULT_NOTES_SEPARATOR = '^note:'
var DEFAULT_ELEMENT_ATTRIBUTES_SEPARATOR = '\\.element\\s*?(.+?)$'
var DEFAULT_SLIDE_ATTRIBUTES_SEPARATOR = '\\.slide:\\s*?(\\S.+?)$'