frodovdr/node-red
1
0
Fork 0
mirror of https://github.com/node-red/node-red.git synced 2023-10-10 13:36:53 +02:00
Code Issues Releases Wiki Activity

NLS Expression/JSON editor and fix their height calculation

Browse Source
This commit is contained in:
Nick O'Leary 2017-05-03 17:17:36 +01:00
parent 30920b1b78
commit 2249b9449c
No known key found for this signature in database
GPG Key ID: 4F2157149161A6C9
4 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
editor/js/ui/editor.js
View File

@ -493,9 +493,9 @@ RED.editor = (function() {
var node = editStack[i]; var node = editStack[i];
var label = node.type; var label = node.type;
if (node.type === '_expression') { if (node.type === '_expression') {
label = "Expression editor"; // TODO: nls label = RED._("expressionEditor.title");
} else if (node.type === '_json') { } else if (node.type === '_json') {
label = "JSON editor"; // TODO: nls label = RED._("jsonEditor.title");
} else if (node.type === 'subflow') { } else if (node.type === 'subflow') {
label = RED._("subflow.editSubflow",{name:node.name}) label = RED._("subflow.editSubflow",{name:node.name})
} else if (node.type.indexOf("subflow:")===0) { } else if (node.type.indexOf("subflow:")===0) {

3
editor/sass/editor.scss
View File

@ -47,6 +47,7 @@
} }
.editor-tray-body { .editor-tray-body {
position: relative; position: relative;
box-sizing: border-box;
form { form {
margin: 20px; margin: 20px;
} }
@ -153,7 +154,7 @@
.dialog-form,#dialog-form, #dialog-config-form { .dialog-form,#dialog-form, #dialog-config-form {
height: 100%; height: calc(100% - 20px);
} }
.input-error { .input-error {

7
nodes/core/logic/15-change.html
View File

@ -32,9 +32,10 @@
<dd>move or rename a property.</dt> <dd>move or rename a property.</dt>
</dl> </dl>
<h3>Details</h3> <h3>Details</h3>
<p>The "expression" option uses the <a href="http://jsonata.org/" target="_new">JSONata</a> <p>The "expression" type uses the <a href="http://jsonata.org/" target="_new">JSONata</a>
query and expression language. You can paste your data into <a href="http://try.jsonata.org/" target="_new">this site it</a> query and expression language. A tool is available to test expressions against
to experiment and then use the expression back here.</p> real data <a href="http://try.jsonata.org/" target="_new">here</a>.
</p>
</script> </script>
<script type="text/javascript"> <script type="text/javascript">

6
red/api/locales/en-US/editor.json
View File

@ -397,6 +397,10 @@
}, },
"expressionEditor": { "expressionEditor": {
"functions": "Functions", "functions": "Functions",
"insert": "Insert" "insert": "Insert",
"title": "JSONata Expression editor"
},
"jsonEditor": {
"title": "JSON editor"
} }
} }