frodovdr/node-red
1
0
Fork 0
mirror of https://github.com/node-red/node-red.git synced 2025-03-01 10:36:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge 08fcbd46af into 2a4fb7123d

Browse Source
This commit is contained in:
Yaroslav Halchenko
2024-06-18 09:30:22 -04:00
committed by GitHub
parent 2a4fb7123d 08fcbd46af
commit 0ae5043866
38 changed files with 62 additions and 62 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
packages/node_modules/@node-red/editor-client/src/ace/mode/nrjavascript_worker.js vendored
View File

@@ -183,7 +183,7 @@ oop.inherits(NRJavaScriptWorker, Mirror);
// This code scans through the original code looking for the first '{'
// that is not in a comment or string.
// It will incorrectly find a '{' if it is inside a regex... but
// at least the error will be shown somwhere. There are only
// at least the error will be shown somewhere. There are only
// so many hours in the day to fix every tiny edge case of an
// edge case.
var inSingleComment = false;

4
packages/node_modules/@node-red/editor-client/src/js/ui/deploy.js vendored
View File

@@ -250,7 +250,7 @@ RED.deploy = (function() {
var now = Date.now();
RED.diff.getRemoteDiff(function(diff) {
var ellapsed = Math.max(1000 - (Date.now()-now), 0);
var elapsed = Math.max(1000 - (Date.now()-now), 0);
currentDiff = diff;
setTimeout(function() {
conflictCheck.hide();
@@ -262,7 +262,7 @@ RED.deploy = (function() {
conflictManualMerge.show();
}
$("#red-ui-deploy-dialog-confirm-deploy-review").removeClass('disabled')
},ellapsed);
},elapsed);
})
}
function cropList(list) {

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

@@ -280,7 +280,7 @@ RED.editor = (function() {
/**
* Called when the node's properties have changed.
* Marks the node as dirty and needing a size check.
* Removes any links to non-existant outputs.
* Removes any links to non-existent outputs.
* @param node - the node that has been updated
* @param outputMap - (optional) a map of old->new port numbers if wires should be moved
* @returns {array} the links that were removed due to this update

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

@@ -71,7 +71,7 @@
if (this.editor.type === MONACO) {
// compatibility (see above note)
if (!options.element && !options.id) {
options.id = 'node-backwards-compatability-dummy-editor';
options.id = 'node-backwards-compatibility-dummy-editor';
}
options.element = options.element || $("#" + options.id)[0];
if (!options.element) {

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

@@ -17,7 +17,7 @@
*/
/*
The code editor currenlty supports 2 functions init and create.
The code editor currently supports 2 functions init and create.
* Init() - setup the editor / must return true
* Create() - create an editor instance / returns an editor as generated by the editor lib
* To be compatable with the original ace lib (for contrib nodes using it), the object returned by create() must (at minimum) support the following...
@@ -53,7 +53,7 @@
RED.editor.codeEditor.monaco = (function() {
var initialised = false;
const type = "monaco";
const monacoThemes = ["vs","vs-dark","hc-black"]; //TODO: consider setting hc-black autmatically based on acessability?
const monacoThemes = ["vs","vs-dark","hc-black"]; //TODO: consider setting hc-black automatically based on acessability?
let userSelectedTheme;
//TODO: get from externalModules.js For now this is enough for feature parity with ACE (and then some).
@@ -765,7 +765,7 @@ RED.editor.codeEditor.monaco = (function() {
case "protobuf":
mode = "proto";
break;
//TODO: add other compatability types.
//TODO: add other compatibility types.
}
return mode;
}
@@ -981,7 +981,7 @@ RED.editor.codeEditor.monaco = (function() {
ed.addAction(createThemeMenuOption(themeName));
}
//#region "ACE compatability"
//#region "ACE compatibility"
ed.selection = {};
ed.session = ed;
@@ -1259,13 +1259,13 @@ RED.editor.codeEditor.monaco = (function() {
ed.setFontSize = function setFontSize(size) {
ed.updateOptions({ fontSize: size });
}
//#endregion "ACE compatability"
//#endregion "ACE compatibility"
//final setup
ed.focusMemory = options.focus;
ed._mode = editorOptions.language;
//as models are signleton, consts and let are avialable to other javascript instances
//as models are singleton, consts and let are avialable to other javascript instances
//so when not focused, set editor mode to text temporarily to avoid multiple defs
if(editorOptions._language) {

8
packages/node_modules/@node-red/editor-client/src/js/ui/notifications.js vendored
View File

@@ -88,10 +88,10 @@ RED.notifications = (function() {
if (currentNotifications.length > 4) {
var ll = currentNotifications.length;
for (var i = 0;ll > 4 && i<currentNotifications.length;i+=1) {
var notifiction = currentNotifications[i];
if (!notifiction.fixed) {
window.clearTimeout(notifiction.timeoutid);
notifiction.close();
var notification = currentNotifications[i];
if (!notification.fixed) {
window.clearTimeout(notification.timeoutid);
notification.close();
ll -= 1;
}
}

2
packages/node_modules/@node-red/editor-client/src/types/node/globals.d.ts vendored
View File

@@ -22,7 +22,7 @@ interface ErrorConstructor {
* *
------------------------------------------------*/
// For backwards compability
// For backwards compatibility
interface NodeRequire extends NodeJS.Require { }
interface RequireResolve extends NodeJS.RequireResolve { }
interface NodeModule extends NodeJS.Module { }

6
packages/node_modules/@node-red/editor-client/src/types/node/timers.d.ts vendored
View File

@@ -66,7 +66,7 @@ declare module 'timers' {
}
}
function setTimeout<TArgs extends any[]>(callback: (...args: TArgs) => void, ms?: number, ...args: TArgs): NodeJS.Timeout;
// util.promisify no rest args compability
// util.promisify no rest args compatibility
// tslint:disable-next-line void-return
function setTimeout(callback: (args: void) => void, ms?: number): NodeJS.Timeout;
namespace setTimeout {
@@ -74,7 +74,7 @@ declare module 'timers' {
}
function clearTimeout(timeoutId: NodeJS.Timeout | string | number | undefined): void;
function setInterval<TArgs extends any[]>(callback: (...args: TArgs) => void, ms?: number, ...args: TArgs): NodeJS.Timer;
// util.promisify no rest args compability
// util.promisify no rest args compatibility
// tslint:disable-next-line void-return
function setInterval(callback: (args: void) => void, ms?: number): NodeJS.Timer;
namespace setInterval {
@@ -82,7 +82,7 @@ declare module 'timers' {
}
function clearInterval(intervalId: NodeJS.Timeout | string | number | undefined): void;
function setImmediate<TArgs extends any[]>(callback: (...args: TArgs) => void, ...args: TArgs): NodeJS.Immediate;
// util.promisify no rest args compability
// util.promisify no rest args compatibility
// tslint:disable-next-line void-return
function setImmediate(callback: (args: void) => void): NodeJS.Immediate;
namespace setImmediate {