4 files changed, 25 insertions, 3 deletions
diff --git a/public/js/extra.js b/public/js/extra.js
index 13b8924c..ec7d39da 100644
--- a/public/js/extra.js
+++ b/public/js/extra.js
@@ -156,7 +156,11 @@ export function renderTags (view) {
 }
 
 function slugifyWithUTF8 (text) {
-  let newText = S(text.toLowerCase()).trim().stripTags().dasherize().s
+  // remove html tags and trim spaces
+  let newText = S(text).trim().stripTags().s
+  // replace all spaces in between to dashes
+  newText = newText.replace(/\s+/g, '-')
+  // slugify string to make it valid for attribute
   newText = newText.replace(/([!"#$%&'()*+,./:;<=>?@[\\\]^`{|}~])/g, '')
   return newText
 }
@@ -1003,9 +1007,10 @@ md.use(markdownitContainer, 'info', { render: renderContainer })
 md.use(markdownitContainer, 'warning', { render: renderContainer })
 md.use(markdownitContainer, 'danger', { render: renderContainer })
 
+let defaultImageRender = md.renderer.rules.image
 md.renderer.rules.image = function (tokens, idx, options, env, self) {
   tokens[idx].attrJoin('class', 'raw')
-  return self.renderToken(...arguments)
+  return defaultImageRender(...arguments)
 }
 md.renderer.rules.list_item_open = function (tokens, idx, options, env, self) {
   tokens[idx].attrJoin('class', 'raw')
diff --git a/public/js/index.js b/public/js/index.js
index b336af90..5ff716fd 100644
--- a/public/js/index.js
+++ b/public/js/index.js
@@ -1633,6 +1633,10 @@ ui.toolbar.view.click(function () {
 ui.toolbar.both.click(function () {
   changeMode(modeType.both)
 })
+
+ui.toolbar.night.click(function () {
+  toggleNightMode()
+})
 // permission
 // freely
 ui.infobar.permission.freely.click(function () {
@@ -1666,6 +1670,17 @@ $('.ui-delete-modal-confirm').click(function () {
   socket.emit('delete')
 })
 
+function toggleNightMode () {
+  var $body = $('body')
+  var isActive = ui.toolbar.night.hasClass('active')
+  if (isActive) {
+    $body.removeClass('night')
+    appState.nightMode = false
+  } else {
+    $body.addClass('night')
+    appState.nightMode = true
+  }
+}
 function emitPermission (_permission) {
   if (_permission !== permission) {
     socket.emit('permission', _permission)
diff --git a/public/js/lib/appState.js b/public/js/lib/appState.js
index fb8030e1..87aaf737 100644
--- a/public/js/lib/appState.js
+++ b/public/js/lib/appState.js
@@ -2,7 +2,8 @@ import modeType from './modeType'
 
 let state = {
   syncscroll: true,
-  currentMode: modeType.view
+  currentMode: modeType.view,
+  nightMode: false
 }
 
 export default state
diff --git a/public/js/lib/editor/ui-elements.js b/public/js/lib/editor/ui-elements.js
index 0d330d77..88a1e3ca 100644
--- a/public/js/lib/editor/ui-elements.js
+++ b/public/js/lib/editor/ui-elements.js
@@ -37,6 +37,7 @@ export const getUIElements = () => ({
     edit: $('.ui-edit'),
     view: $('.ui-view'),
     both: $('.ui-both'),
+    night: $('.ui-night'),
     uploadImage: $('.ui-upload-image')
   },
   infobar: {