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

判断是否开启lint和自动补全

Browse Source
This commit is contained in:
YouWei Zhao 2018-03-16 00:45:23 +08:00
parent 4d9327854d
commit e1786c40eb
2 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
_server/editor_blockly.js
View File

@ -232,7 +232,7 @@ Blockly.svgResize(workspace);
//Blockly.bindEventWithChecks_(editor_blockly.workspace.svgGroup_,"wheel",editor_blockly.workspace,function(e){}); //Blockly.bindEventWithChecks_(editor_blockly.workspace.svgGroup_,"wheel",editor_blockly.workspace,function(e){});
document.getElementById('blocklyDiv').onmousewheel = function(e){ document.getElementById('blocklyDiv').onmousewheel = function(e){
console.log(e); //console.log(e);
e.preventDefault(); e.preventDefault();
var hvScroll = e.shiftKey?'hScroll':'vScroll'; var hvScroll = e.shiftKey?'hScroll':'vScroll';
editor_blockly.workspace.scrollbar[hvScroll].handlePosition_+=( ((e.deltaY||0)+(e.detail||0)) >0?20:-20); editor_blockly.workspace.scrollbar[hvScroll].handlePosition_+=( ((e.deltaY||0)+(e.detail||0)) >0?20:-20);

12
_server/editor_multi.js
View File

@ -28,8 +28,14 @@ codeEditor.on("keyup", function (cm, event) {
editor_multi.id=''; editor_multi.id='';
editor_multi.isString=false; editor_multi.isString=false;
editor_multi.lintAutocomplete=false;
editor_multi.show = function(){document.getElementById('left7').style='';} editor_multi.show = function(){
if(codeEditor.getValue().slice(0,8)==='function')editor_multi.lintAutocomplete=true;
codeEditor.setOption("lint", editor_multi.lintAutocomplete);
codeEditor.setOption("autocomplete", editor_multi.lintAutocomplete);
document.getElementById('left7').style='';
}
editor_multi.hide = function(){document.getElementById('left7').style='z-index:-1;opacity: 0;';} editor_multi.hide = function(){document.getElementById('left7').style='z-index:-1;opacity: 0;';}
editor_multi.indent = function(field){ editor_multi.indent = function(field){
@ -42,9 +48,12 @@ editor_multi.import = function(id_){
if(!thisTr)return false; if(!thisTr)return false;
var input = thisTr.children[2].children[0].children[0]; var input = thisTr.children[2].children[0].children[0];
var field = thisTr.children[0].getAttribute('title'); var field = thisTr.children[0].getAttribute('title');
var comment = thisTr.children[1].getAttribute('title');
if(!input.type || input.type!=='textarea')return false; if(!input.type || input.type!=='textarea')return false;
editor_multi.id=id_; editor_multi.id=id_;
editor_multi.isString=false; editor_multi.isString=false;
editor_multi.lintAutocomplete=false;
if(field.indexOf('Effect') !== -1)editor_multi.lintAutocomplete=true;
if(input.value.slice(0,1)==='"'){ if(input.value.slice(0,1)==='"'){
editor_multi.isString=true; editor_multi.isString=true;
codeEditor.setValue(JSON.parse(input.value)||''); codeEditor.setValue(JSON.parse(input.value)||'');
@ -106,6 +115,7 @@ editor_multi.multiLineEdit = function(value,b,f,callback){
multiLineArgs[0]=b; multiLineArgs[0]=b;
multiLineArgs[1]=f; multiLineArgs[1]=f;
multiLineArgs[2]=callback; multiLineArgs[2]=callback;
editor_multi.lintAutocomplete=false;
editor_multi.show(); editor_multi.show();
} }
editor_multi.multiLineDone = function(){ editor_multi.multiLineDone = function(){