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 #3702 from node-red/default-monaco

Browse Source 
Set default editor to monaco in absence of user preference
This commit is contained in:
Stephen McLaughlin 2022-06-27 09:43:07 +01:00 committed by GitHub
commit cc5a0a436c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
packages/node_modules/@node-red/editor-client/src/js/ui/editors/code-editor.js vendored
View File

@ -21,7 +21,7 @@
const MONACO = "monaco"; const MONACO = "monaco";
const ACE = "ace"; const ACE = "ace";
const defaultEditor = ACE; const defaultEditor = MONACO;
const DEFAULT_SETTINGS = { lib: defaultEditor, options: {} }; const DEFAULT_SETTINGS = { lib: defaultEditor, options: {} };
var selectedCodeEditor = null; var selectedCodeEditor = null;
var initialised = false; var initialised = false;
@ -48,12 +48,12 @@
} }
function create(options) { function create(options) {
//TODO: (quandry - for consideration) //TODO: (quandry - for consideration)
// Below, I had to create a hidden element if options.id || options.element is not in the DOM // Below, I had to create a hidden element if options.id || options.element is not in the DOM
// I have seen 1 node calling `this.editor = RED.editor.createEditor()` with an // I have seen 1 node calling `this.editor = RED.editor.createEditor()` with an
// invalid (non existing html element selector) (e.g. node-red-contrib-components does this) // invalid (non existing html element selector) (e.g. node-red-contrib-components does this)
// This causes monaco to throw an error when attempting to hook up its events to the dom & the rest of the 'oneditperapre' // This causes monaco to throw an error when attempting to hook up its events to the dom & the rest of the 'oneditperapre'
// code is thus skipped. // code is thus skipped.
// In ACE mode, creating an ACE editor (with an invalid ID) allows the editor to be created (but obviously there is no UI) // In ACE mode, creating an ACE editor (with an invalid ID) allows the editor to be created (but obviously there is no UI)
// Because one (or more) contrib nodes have left this bad code in place, how would we handle this? // Because one (or more) contrib nodes have left this bad code in place, how would we handle this?
// For compatibility, I have decided to create a hidden element so that at least an editor is created & errors do not occur. // For compatibility, I have decided to create a hidden element so that at least an editor is created & errors do not occur.
@ -79,7 +79,7 @@
return this.editor.create(options);//fallback to ACE return this.editor.create(options);//fallback to ACE
} }
} }
return { return {
init: init, init: init,
/** /**
@ -91,7 +91,7 @@
}, },
/** /**
* Get user selected code editor * Get user selected code editor
* @return {string} Returns * @return {string} Returns
* @memberof RED.editor.codeEditor * @memberof RED.editor.codeEditor
*/ */
get editor() { get editor() {
@ -104,4 +104,4 @@
*/ */
create: create create: create
} }
})(); })();

2
packages/node_modules/@node-red/runtime/lib/api/settings.js vendored
View File

@ -91,7 +91,7 @@ var api = module.exports = {
safeSettings.context = runtime.nodes.listContextStores(); safeSettings.context = runtime.nodes.listContextStores();
if (runtime.settings.editorTheme && runtime.settings.editorTheme.codeEditor) { if (runtime.settings.editorTheme && runtime.settings.editorTheme.codeEditor) {
safeSettings.codeEditor = runtime.settings.editorTheme.codeEditor || {}; safeSettings.codeEditor = runtime.settings.editorTheme.codeEditor || {};
safeSettings.codeEditor.lib = safeSettings.codeEditor.lib || "ace"; safeSettings.codeEditor.lib = safeSettings.codeEditor.lib || "monaco";
safeSettings.codeEditor.options = safeSettings.codeEditor.options || {}; safeSettings.codeEditor.options = safeSettings.codeEditor.options || {};
} }
safeSettings.libraries = runtime.library.getLibraries(); safeSettings.libraries = runtime.library.getLibraries();