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

Merge pull request #96 from ckcz123/v2.0

Browse Source 
V2.0
This commit is contained in:
Zhang Chen 2018-03-19 23:26:42 +08:00 committed by GitHub
commit 3abb3a72e5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
_server/blockly/MotaAction.g4
View File

@ -809,7 +809,7 @@ tooltip : function: 自定义JS脚本
helpUrl : https://ckcz123.github.io/mota-js/#/event?id=function-%e8%87%aa%e5%ae%9a%e4%b9%89js%e8%84%9a%e6%9c%ac helpUrl : https://ckcz123.github.io/mota-js/#/event?id=function-%e8%87%aa%e5%ae%9a%e4%b9%89js%e8%84%9a%e6%9c%ac
default : ["alert(core.getStatus(\"atk\"));"] default : ["alert(core.getStatus(\"atk\"));"]
colour : this.dataColor colour : this.dataColor
var code = '{"type": "function", "function": "function(){\\n'+JSON.stringify(RawEvalString_0).slice(1,-1)+'\\n}"},\n'; var code = '{"type": "function", "function": "function(){\\n'+JSON.stringify(RawEvalString_0).slice(1,-1).split('\\\\n').join('\\n')+'\\n}"},\n';
return code; return code;
*/ */
@ -1329,9 +1329,9 @@ ActionParser.prototype.parseAction = function() {
break; break;
case "function": case "function":
var func = data["function"]; var func = data["function"];
func=func.split('{').slice(1).join('{').split('}').slice(0,-1).join('}').trim(); func=func.split('{').slice(1).join('{').split('}').slice(0,-1).join('}').trim().split('\n').join('\\n');
this.next = MotaActionBlocks['function_s'].xmlText([ this.next = MotaActionBlocks['function_s'].xmlText([
this.EvalString(func),this.next]); func,this.next]);
break; break;
case "update": case "update":
this.next = MotaActionBlocks['update_s'].xmlText([ this.next = MotaActionBlocks['update_s'].xmlText([