This commit is contained in:
oc 2018-03-15 23:02:09 +08:00
parent 955476285d
commit 7f5752ee94
2 changed files with 5 additions and 3 deletions

View File

@ -213,7 +213,6 @@ var workspace = Blockly.inject(blocklyDiv,{
toolbox: document.getElementById('toolbox'), toolbox: document.getElementById('toolbox'),
zoom:{ zoom:{
controls: true, controls: true,
wheel: true,//false
startScale: 1.0, startScale: 1.0,
maxScale: 3, maxScale: 3,
minScale: 0.3, minScale: 0.3,

View File

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