From: Dan Brown <redacted>
Date: Thu, 17 Oct 2019 13:32:39 +0000 (+0100)
Subject: Merge branch 'fix-1575' of git://github.com/james-geiger/BookStack into james-geiger... 
X-Git-Tag: v0.28.0~1^2~70
X-Git-Url: http://source.bookstackapp.com/bookstack/commitdiff_plain/e91ef54cc9f8ce6b264bced8191275b6a33e594f

Merge branch 'fix-1575' of git://github.com/james-geiger/BookStack into james-geiger-fix-1575
---

e91ef54cc9f8ce6b264bced8191275b6a33e594f
diff --cc resources/js/services/code.js
index ca66bdb5a,4ab25aeb7..61aac7dc5
--- a/resources/js/services/code.js
+++ b/resources/js/services/code.js
@@@ -250,17 -256,10 +252,17 @@@ function markdownEditor(elem) 
          value: content,
          mode: "markdown",
          lineNumbers: true,
-         theme: getTheme(),
          lineWrapping: true,
+         theme: getTheme(),
          scrollPastEnd: true,
 -    });
 +    };
 +
 +    window.$events.emitPublic(elem, 'editor-markdown-cm::pre-init', {config});
 +
 +    return CodeMirror(function (elt) {
 +        elem.parentNode.insertBefore(elt, elem);
 +        elem.style.display = 'none';
 +    }, config);
  }
  
  /**