jianghe2nd/mota-js
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 2 Wiki Activity

Merge remote-tracking branch 'refs/remotes/ckcz123/v2.0' into v2.0-editor-docs-20180313

Browse Source 
# Conflicts:
#	_server/editor_blockly.js
This commit is contained in:
YouWei Zhao 2018-03-16 00:28:17 +08:00
commit 4d9327854d
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
_server/editor_blockly.js
View File

@ -213,8 +213,7 @@ var workspace = Blockly.inject(blocklyDiv,{
toolbox: document.getElementById('toolbox'),
zoom:{
controls: true,
wheel: true,//false
//滚轮改为上下(shift:左右)翻滚
wheel: false,//滚轮改为上下(shift:左右)翻滚
startScale: 1.0,
maxScale: 3,
minScale: 0.3,

7
_server/editor_multi.js
View File

@ -9,17 +9,20 @@ var codeEditor = CodeMirror.fromTextArea(document.getElementById("multiLineCode"
tabSize: 4,
indentWithTabs: true,
smartIndent: true,
mode: {name: "javascript", json: true, globalVars: true},
mode: {name: "javascript", globalVars: true, localVars: true},
lineWrapping: true,
continueComments: "Enter",
gutters: ["CodeMirror-lint-markers"],
lint: true,
autocomplete: true,
extraKeys: {"Ctrl-Q": "toggleComment"},
});
codeEditor.on("keyup", function (cm, event) {
if ((event.keyCode >= 65 && event.keyCode<=90) || (event.keyCode>=49 && event.keyCode<=57) || event.keyCode==190) {
if (codeEditor.getOption("autocomplete") && (event.keyCode >= 65 && event.keyCode<=90) || (event.keyCode>=49 && event.keyCode<=57) || event.keyCode==190) {
try {
CodeMirror.commands.autocomplete(cm, null, {completeSingle: false});
} catch (e) {}
}
});