diff options
| -rw-r--r-- | package-lock.json | 34 | ||||
| -rw-r--r-- | src/client/views/nodes/ScriptingBox.scss | 15 | ||||
| -rw-r--r-- | src/client/views/nodes/ScriptingBox.tsx | 9 |
3 files changed, 19 insertions, 39 deletions
diff --git a/package-lock.json b/package-lock.json index 043b540e9..3a079d627 100644 --- a/package-lock.json +++ b/package-lock.json @@ -750,15 +750,9 @@ "integrity": "sha512-//oorEZjL6sbPcKUaCdIGlIUeH26mgzimjBB77G6XRgnDl/L5wOnpyBGRe/Mmf5CVW3PwEBE1NjiMZ/ssFh4wA==" }, "@types/passport": { -<<<<<<< HEAD - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/@types/passport/-/passport-1.0.2.tgz", - "integrity": "sha512-Pf39AYKf8q+YoONym3150cEwfUD66dtwHJWvbeOzKxnA0GZZ/vAXhNWv9vMhKyRQBQZiQyWQnhYBEBlKW6G8wg==", -======= "version": "1.0.3", "resolved": "https://registry.npmjs.org/@types/passport/-/passport-1.0.3.tgz", "integrity": "sha512-nyztuxtDPQv9utCzU0qW7Gl8BY2Dn8BKlYAFFyxKipFxjaVd96celbkLCV/tRqqBUZ+JB8If3UfgV8347DTo3Q==", ->>>>>>> 9f8e76451b807ed8f51ef32aab9b2255dfccd525 "requires": { "@types/express": "*" } @@ -5729,14 +5723,9 @@ } }, "minimist": { -<<<<<<< HEAD - "version": "0.0.8", + "version": "1.2.5", "bundled": true, "optional": true -======= - "version": "1.2.5", - "bundled": true ->>>>>>> 9f8e76451b807ed8f51ef32aab9b2255dfccd525 }, "minipass": { "version": "2.9.0", @@ -5814,7 +5803,8 @@ }, "npm-normalize-package-bin": { "version": "1.0.1", - "bundled": true + "bundled": true, + "optional": true }, "npm-packlist": { "version": "1.4.8", @@ -14204,15 +14194,9 @@ } }, "readable-stream": { -<<<<<<< HEAD - "version": "2.3.6", - "resolved": "http://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz", - "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==", -======= "version": "3.6.0", "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.0.tgz", "integrity": "sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==", ->>>>>>> 9f8e76451b807ed8f51ef32aab9b2255dfccd525 "requires": { "inherits": "^2.0.3", "string_decoder": "^1.1.1", @@ -15921,15 +15905,9 @@ } }, "strip-ansi": { -<<<<<<< HEAD - "version": "3.0.1", - "resolved": "http://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz", - "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=", -======= "version": "4.0.0", "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz", "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=", ->>>>>>> 9f8e76451b807ed8f51ef32aab9b2255dfccd525 "requires": { "ansi-regex": "^3.0.0" } @@ -18045,15 +18023,9 @@ } }, "wrap-ansi": { -<<<<<<< HEAD - "version": "2.1.0", - "resolved": "http://registry.npmjs.org/wrap-ansi/-/wrap-ansi-2.1.0.tgz", - "integrity": "sha1-2Pw9KE3QV5T+hJc8rs3Rz4JP3YU=", -======= "version": "5.1.0", "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-5.1.0.tgz", "integrity": "sha512-QC1/iN/2/RPVJ5jYK8BGttj5z83LmSKmvbvrXPNCLZSEb32KKVDJDl/MOt2N01qU2H/FkzEa9PKto1BqDjtd7Q==", ->>>>>>> 9f8e76451b807ed8f51ef32aab9b2255dfccd525 "requires": { "ansi-styles": "^3.2.0", "string-width": "^3.0.0", diff --git a/src/client/views/nodes/ScriptingBox.scss b/src/client/views/nodes/ScriptingBox.scss index 5d367f8a8..25fbd3f35 100644 --- a/src/client/views/nodes/ScriptingBox.scss +++ b/src/client/views/nodes/ScriptingBox.scss @@ -11,6 +11,7 @@ flex-direction: column; height: calc(100% - 30px); + .scriptingBox-errorMessage { overflow: auto; } @@ -19,13 +20,13 @@ background: "beige"; } - .scriptingBox-textArea { - width: 100%; - height: 100%; - box-sizing: border-box; - resize: none; - padding: 7px; - } + .scriptingBox-textArea { + width: 100%; + height: 100%; + box-sizing: border-box; + resize: none; + padding: 7px; + } } .scriptingBox-toolbar { diff --git a/src/client/views/nodes/ScriptingBox.tsx b/src/client/views/nodes/ScriptingBox.tsx index cd0e4fa8d..a5d55018b 100644 --- a/src/client/views/nodes/ScriptingBox.tsx +++ b/src/client/views/nodes/ScriptingBox.tsx @@ -89,12 +89,19 @@ export class ScriptingBox extends ViewBoxAnnotatableComponent<FieldViewProps, Sc <div className="scriptingBox-inputDiv" onPointerDown={e => this.props.isSelected(true) && e.stopPropagation()} > + <textarea className="scriptingBox-textarea" placeholder="write your script here" onChange={e => this.rawScript = e.target.value} value={this.rawScript} onFocus={this.onFocus} - onBlur={e => this._overlayDisposer?.()} /> + onBlur={e => this._overlayDisposer?.()} + style={{ width: this.compileParams.length > 0 ? "70%" : "100%" }} /> + + {this.compileParams.length > 0 ? <div className="split right" style={{ width: "30%" }}> + parameters go here + </div> : null} + <div className="scriptingBox-errorMessage" style={{ background: this._errorMessage ? "red" : "" }}>{this._errorMessage}</div> <div className="scriptingBox-params" >{params}</div> </div> |