From 71bdade7b9eb2dd1073eb11d796f828416f63ab8 Mon Sep 17 00:00:00 2001 From: Steve-Mcl Date: Thu, 29 Apr 2021 16:59:11 +0100 Subject: [PATCH] prevent exception if ace is missing --- packages/node_modules/@node-red/editor-client/src/js/red.js | 2 +- .../node_modules/@node-red/editor-client/src/js/ui/editor.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/node_modules/@node-red/editor-client/src/js/red.js b/packages/node_modules/@node-red/editor-client/src/js/red.js index 0ba08878a..7c3576e13 100644 --- a/packages/node_modules/@node-red/editor-client/src/js/red.js +++ b/packages/node_modules/@node-red/editor-client/src/js/red.js @@ -711,7 +711,7 @@ var RED = (function() { throw new Error("RED already initialised"); } initialised = true; - ace.require("ace/ext/language_tools"); + if(window.ace) { window.ace.require("ace/ext/language_tools"); } options = options || {}; options.apiRootUrl = options.apiRootUrl || ""; if (options.apiRootUrl && !/\/$/.test(options.apiRootUrl)) { diff --git a/packages/node_modules/@node-red/editor-client/src/js/ui/editor.js b/packages/node_modules/@node-red/editor-client/src/js/ui/editor.js index 9c3274441..7f7decaa1 100644 --- a/packages/node_modules/@node-red/editor-client/src/js/ui/editor.js +++ b/packages/node_modules/@node-red/editor-client/src/js/ui/editor.js @@ -2850,7 +2850,7 @@ var buildingEditDialog = false; return { init: function() { - ace.config.set('basePath', 'vendor/ace'); + if(window.ace) { window.ace.config.set('basePath', 'vendor/ace'); } RED.tray.init(); RED.actions.add("core:confirm-edit-tray", function() { $(document.activeElement).blur();