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

Merge branch 'v2.0' of https://github.com/ckcz123/mota-js into v2.0

Browse Source
This commit is contained in:
oc 2018-03-16 19:26:01 +08:00
commit 12066d1893
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
_server/editor_blockly.js
View File

@ -438,7 +438,7 @@ editor_blockly.doubleClickBlock = function (blockId){
if(f){ if(f){
var value = b.getFieldValue(f); var value = b.getFieldValue(f);
//多行编辑 //多行编辑
editor_multi.multiLineEdit(value,b,f,function(newvalue,b,f){ editor_multi.multiLineEdit(value,b,f,{'lint':f==='RawEvalString_0'},function(newvalue,b,f){
if(textStringDict[b.type]!=='RawEvalString_0'){} if(textStringDict[b.type]!=='RawEvalString_0'){}
b.setFieldValue(newvalue.split('\n').join('\\n'),f); b.setFieldValue(newvalue.split('\n').join('\\n'),f);
}); });

4
_server/editor_multi.js
View File

@ -109,13 +109,13 @@ editor_multi.confirm = function (){
} }
var multiLineArgs=[null,null,null]; var multiLineArgs=[null,null,null];
editor_multi.multiLineEdit = function(value,b,f,callback){ editor_multi.multiLineEdit = function(value,b,f,args,callback){
editor_multi.id='callFromBlockly'; editor_multi.id='callFromBlockly';
codeEditor.setValue(value.split('\\n').join('\n')||''); codeEditor.setValue(value.split('\\n').join('\n')||'');
multiLineArgs[0]=b; multiLineArgs[0]=b;
multiLineArgs[1]=f; multiLineArgs[1]=f;
multiLineArgs[2]=callback; multiLineArgs[2]=callback;
editor_multi.lintAutocomplete=false; editor_multi.lintAutocomplete=Boolean(args.lint);
editor_multi.show(); editor_multi.show();
} }
editor_multi.multiLineDone = function(){ editor_multi.multiLineDone = function(){