aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndrew Manning <tamanning@zoho.com>2016-11-17 05:33:09 -0500
committerAndrew Manning <tamanning@zoho.com>2016-11-17 05:33:09 -0500
commit154923ca7dafdf75e52fa9b4100b77435a181773 (patch)
tree3d75f6b189cf86f89d29e3131a0b365890a01451
parentdb1ae808774a63715e9d5442d5551d219c8d86ae (diff)
parenta34d6363666493dd860f831b72975d751600305f (diff)
downloadvolse-hubzilla-154923ca7dafdf75e52fa9b4100b77435a181773.tar.gz
volse-hubzilla-154923ca7dafdf75e52fa9b4100b77435a181773.tar.bz2
volse-hubzilla-154923ca7dafdf75e52fa9b4100b77435a181773.zip
Merge remote-tracking branch 'upstream/dev' into wiki-gui
-rw-r--r--view/tpl/wiki.tpl23
1 files changed, 16 insertions, 7 deletions
diff --git a/view/tpl/wiki.tpl b/view/tpl/wiki.tpl
index ecc475e6f..4eefb3189 100644
--- a/view/tpl/wiki.tpl
+++ b/view/tpl/wiki.tpl
@@ -178,14 +178,23 @@
});
var editor = ace.edit("ace-editor");
- editor.setTheme("ace/theme/github");
- editor.setShowPrintMargin(false);
- editor.getSession().setUseWrapMode('free');
- editor.getSession().setMode("ace/mode/markdown");
+ editor.setOptions({
+ theme: "ace/theme/github",
+ mode: "ace/mode/markdown",
+
+ wrap: true,
+
+ minLines: 30,
+ maxLines: Infinity,
+
+ printMargin: false
+ });
+
editor.getSession().setValue(window.wiki_page_content);
- window.editor = editor; // Store the editor in the window object so the anonymous function can use it.
- $('#edit-pane-tab').click(function (ev) {
- setTimeout(function() {window.editor.focus();}, 500); // Return the focus to the editor allowing immediate text entry
+ window.editor = editor; // Store the editor in the window object so the anonymous function can use it.
+
+ $('#edit-pane-tab').click(function (ev) {
+ setTimeout(function() {window.editor.focus();}, 500); // Return the focus to the editor allowing immediate text entry
});
$('#wiki-get-preview').click(function (ev) {