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

Merge pull request #1552 from node-red/ace-editor-annotations

Browse Source 
Changes to ACE editor annotations
This commit is contained in:
Nick O'Leary 2018-01-24 23:16:53 +00:00 committed by GitHub
commit cd8ca6fc62
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
editor/js/ui/editor.js
View File

@ -2488,6 +2488,16 @@ RED.editor = (function() {
var editor = ace.edit(options.id||options.element); var editor = ace.edit(options.id||options.element);
editor.setTheme("ace/theme/tomorrow"); editor.setTheme("ace/theme/tomorrow");
var session = editor.getSession(); var session = editor.getSession();
session.on("changeAnnotation", function () {
var annotations = session.getAnnotations() || [];
var i = annotations.length;
var len = annotations.length;
while (i--) {
if (/doctype first\. Expected/.test(annotations[i].text)) { annotations.splice(i, 1); }
else if (/Unexpected End of file\. Expected/.test(annotations[i].text)) { annotations.splice(i, 1); }
}
if (len > annotations.length) { session.setAnnotations(annotations); }
});
if (options.mode) { if (options.mode) {
session.setMode(options.mode); session.setMode(options.mode);
} }
@ -2518,7 +2528,7 @@ RED.editor = (function() {
if (options.globals) { if (options.globals) {
setTimeout(function() { setTimeout(function() {
if (!!session.$worker) { if (!!session.$worker) {
session.$worker.send("setOptions", [{globals: options.globals, esversion:6}]); session.$worker.send("setOptions", [{globals: options.globals, esversion:6, sub:true, asi:true, maxerr:1000}]);
} }
},100); },100);
} }