This commit is contained in:
libccy 2016-07-28 10:21:06 +08:00
parent 9636c3b913
commit 03f46ba3b2
2 changed files with 4 additions and 5 deletions

View File

@ -22511,11 +22511,10 @@
var mirror = window.CodeMirror(editor, { var mirror = window.CodeMirror(editor, {
value:node.code, value:node.code,
mode:"javascript", mode:"javascript",
lineWrapping:true, lineWrapping:!lib.config.touchscreen&&lib.config.mousewheel,
lineNumbers:true, lineNumbers:true,
indentUnit:4, indentUnit:4,
autoCloseBrackets:true, autoCloseBrackets:true,
indentWithTabs:true,
theme:'mdn-like' theme:'mdn-like'
}); });
lib.setScroll(editor.querySelector('.CodeMirror-scroll')); lib.setScroll(editor.querySelector('.CodeMirror-scroll'));
@ -22885,11 +22884,10 @@
var mirror = window.CodeMirror(editor, { var mirror = window.CodeMirror(editor, {
value:node.code, value:node.code,
mode:"javascript", mode:"javascript",
lineWrapping:true, lineWrapping:!lib.config.touchscreen&&lib.config.mousewheel,
lineNumbers:true, lineNumbers:true,
indentUnit:4, indentUnit:4,
autoCloseBrackets:true, autoCloseBrackets:true,
indentWithTabs:true,
theme:'mdn-like' theme:'mdn-like'
}); });
lib.setScroll(editor.querySelector('.CodeMirror-scroll')); lib.setScroll(editor.querySelector('.CodeMirror-scroll'));
@ -23155,7 +23153,7 @@
var mirror = window.CodeMirror(editor, { var mirror = window.CodeMirror(editor, {
value:node.code, value:node.code,
mode:"javascript", mode:"javascript",
lineWrapping:true, lineWrapping:!lib.config.touchscreen&&lib.config.mousewheel,
lineNumbers:true, lineNumbers:true,
indentUnit:4, indentUnit:4,
autoCloseBrackets:true, autoCloseBrackets:true,

View File

@ -248,6 +248,7 @@ div.CodeMirror span.CodeMirror-nonmatchingbracket {color: #f22;}
border-width: 0; border-width: 0;
background: transparent; background: transparent;
/*font-family: inherit;*/ /*font-family: inherit;*/
font-family:'STHeiti','SimHei','Microsoft JhengHei','Microsoft YaHei','WenQuanYi Micro Hei',Helvetica,Arial,sans-serif;
font-size: inherit; font-size: inherit;
margin: 0; margin: 0;
white-space: pre; white-space: pre;