frodovdr/node-red
1
0
Fork 0
mirror of https://github.com/node-red/node-red.git synced 2025-03-01 10:36:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add jsonata function help

Browse Source
This commit is contained in:
Nick O'Leary
2016-11-15 23:22:25 +00:00
parent d33029027f
commit 26f5305593
11 changed files with 318 additions and 73 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
editor/js/i18n.js
View File

@@ -23,7 +23,7 @@ RED.i18n = (function() {
dynamicLoad: false,
load:'current',
ns: {
namespaces: ["editor","node-red"],
namespaces: ["editor","node-red","jsonata"],
defaultNs: "editor"
},
fallbackLng: ['en-US'],

5
editor/js/ui/common/typedInput.js
View File

@@ -85,6 +85,7 @@
}
return true;
}
var allOptions = {
msg: {value:"msg",label:"msg.",validate:validateExpression},
flow: {value:"flow",label:"flow.",validate:validateExpression},
@@ -103,9 +104,9 @@
expand:function() {
var that = this;
RED.editor.editExpression({
value: this.value(),
value: jsonata.format(this.value()),
complete: function(v) {
that.value(v);
that.value(v.replace(/\s*\n\s*/g," "));
}
})
}

23
editor/js/ui/editor.js
View File

@@ -1392,6 +1392,7 @@ RED.editor = (function() {
text: RED._("common.label.done"),
class: "primary",
click: function() {
$("#node-input-expression-help").html("");
onComplete(expressionEditor.getValue());
RED.tray.close();
}
@@ -1412,8 +1413,19 @@ RED.editor = (function() {
},
open: function(tray) {
var trayBody = tray.find('.editor-tray-body');
var dialogForm = buildEditForm(tray,'dialog-form','_expression');
var dialogForm = buildEditForm(tray,'dialog-form','_expression','editor');
var funcSelect = $("#node-input-expression-func");
jsonata.functions.forEach(function(f) {
funcSelect.append($("<option></option>").val(f).text(f));
})
funcSelect.change(function(e) {
var f = $(this).val();
var args = RED._('jsonata:'+f+".args",{defaultValue:''});
var title = "<h4>"+f+"("+args+")</h4>";
var body = marked(RED._('jsonata:'+f+'.desc',{defaultValue:''}));
$("#node-input-expression-help").html(title+"<p>"+body+"</p>");
})
expressionEditor = RED.editor.createEditor({
id: 'node-input-expression',
value: "",
@@ -1426,6 +1438,15 @@ RED.editor = (function() {
});
expressionEditor.getSession().setValue(value||"",-1);
expressionEditor.on("changeSelection", function() {
var c = expressionEditor.getCursorPosition();
var token = expressionEditor.getSession().getTokenAt(c.row,c.column);
//console.log(token);
if (token && token.type === 'keyword') {
funcSelect.val(token.value).change();
}
});
dialogForm.i18n();
},