Merge remote-tracking branch 'upstream/dev' into wiki-gui

This commit is contained in:
Andrew Manning 2016-11-17 05:33:09 -05:00
commit 154923ca7d

View File

@ -178,12 +178,21 @@
}); });
var editor = ace.edit("ace-editor"); var editor = ace.edit("ace-editor");
editor.setTheme("ace/theme/github"); editor.setOptions({
editor.setShowPrintMargin(false); theme: "ace/theme/github",
editor.getSession().setUseWrapMode('free'); mode: "ace/mode/markdown",
editor.getSession().setMode("ace/mode/markdown");
wrap: true,
minLines: 30,
maxLines: Infinity,
printMargin: false
});
editor.getSession().setValue(window.wiki_page_content); editor.getSession().setValue(window.wiki_page_content);
window.editor = editor; // Store the editor in the window object so the anonymous function can use it. window.editor = editor; // Store the editor in the window object so the anonymous function can use it.
$('#edit-pane-tab').click(function (ev) { $('#edit-pane-tab').click(function (ev) {
setTimeout(function() {window.editor.focus();}, 500); // Return the focus to the editor allowing immediate text entry setTimeout(function() {window.editor.focus();}, 500); // Return the focus to the editor allowing immediate text entry
}); });