', {class:"editor-tray-content"}).appendTo(editorContent).hide(),
+ content: $('
', {class:"red-ui-tray-content"}).appendTo(editorContent).hide(),
iconClass: "fa fa-object-group",
onchange: function() {
refreshLabelForm(this.content,editing_node);
diff --git a/packages/node_modules/@node-red/editor-client/src/js/ui/editors/buffer.js b/packages/node_modules/@node-red/editor-client/src/js/ui/editors/buffer.js
index ed8e19240..d1c14d008 100644
--- a/packages/node_modules/@node-red/editor-client/src/js/ui/editors/buffer.js
+++ b/packages/node_modules/@node-red/editor-client/src/js/ui/editors/buffer.js
@@ -83,8 +83,8 @@
}
},
open: function(tray) {
- var trayBody = tray.find('.editor-tray-body');
- var dialogForm = RED.editor.buildEditForm(tray.find('.editor-tray-body'),'dialog-form',type,'editor');
+ var trayBody = tray.find('.red-ui-tray-body');
+ var dialogForm = RED.editor.buildEditForm(tray.find('.red-ui-tray-body'),'dialog-form',type,'editor');
bufferStringEditor = RED.editor.createEditor({
id: 'node-input-buffer-str',
diff --git a/packages/node_modules/@node-red/editor-client/src/js/ui/editors/expression.js b/packages/node_modules/@node-red/editor-client/src/js/ui/editors/expression.js
index e4d154fbb..1803e4d22 100644
--- a/packages/node_modules/@node-red/editor-client/src/js/ui/editors/expression.js
+++ b/packages/node_modules/@node-red/editor-client/src/js/ui/editors/expression.js
@@ -88,9 +88,9 @@
},
open: function(tray) {
- var trayBody = tray.find('.editor-tray-body');
+ var trayBody = tray.find('.red-ui-tray-body');
trayBody.addClass("node-input-expression-editor")
- var dialogForm = RED.editor.buildEditForm(tray.find('.editor-tray-body'),'dialog-form','_expression','editor');
+ var dialogForm = RED.editor.buildEditForm(tray.find('.red-ui-tray-body'),'dialog-form','_expression','editor');
var funcSelect = $("#node-input-expression-func");
Object.keys(jsonata.functions).forEach(function(f) {
funcSelect.append($("
").val(f).text(f));
diff --git a/packages/node_modules/@node-red/editor-client/src/js/ui/editors/js.js b/packages/node_modules/@node-red/editor-client/src/js/ui/editors/js.js
index c0ce56411..4e8740055 100644
--- a/packages/node_modules/@node-red/editor-client/src/js/ui/editors/js.js
+++ b/packages/node_modules/@node-red/editor-client/src/js/ui/editors/js.js
@@ -59,8 +59,8 @@
expressionEditor.resize();
},
open: function(tray) {
- var trayBody = tray.find('.editor-tray-body');
- var dialogForm = RED.editor.buildEditForm(tray.find('.editor-tray-body'),'dialog-form',type,'editor');
+ var trayBody = tray.find('.red-ui-tray-body');
+ var dialogForm = RED.editor.buildEditForm(tray.find('.red-ui-tray-body'),'dialog-form',type,'editor');
expressionEditor = RED.editor.createEditor({
id: 'node-input-js',
mode: options.mode || 'ace/mode/javascript',
diff --git a/packages/node_modules/@node-red/editor-client/src/js/ui/editors/json.js b/packages/node_modules/@node-red/editor-client/src/js/ui/editors/json.js
index 848c0105d..8800a1473 100644
--- a/packages/node_modules/@node-red/editor-client/src/js/ui/editors/json.js
+++ b/packages/node_modules/@node-red/editor-client/src/js/ui/editors/json.js
@@ -74,8 +74,8 @@
expressionEditor.resize();
},
open: function(tray) {
- var trayBody = tray.find('.editor-tray-body');
- var dialogForm = RED.editor.buildEditForm(tray.find('.editor-tray-body'),'dialog-form',type,'editor');
+ var trayBody = tray.find('.red-ui-tray-body');
+ var dialogForm = RED.editor.buildEditForm(tray.find('.red-ui-tray-body'),'dialog-form',type,'editor');
expressionEditor = RED.editor.createEditor({
id: 'node-input-json',
value: "",
diff --git a/packages/node_modules/@node-red/editor-client/src/js/ui/editors/markdown.js b/packages/node_modules/@node-red/editor-client/src/js/ui/editors/markdown.js
index 77619b61d..253d47257 100644
--- a/packages/node_modules/@node-red/editor-client/src/js/ui/editors/markdown.js
+++ b/packages/node_modules/@node-red/editor-client/src/js/ui/editors/markdown.js
@@ -88,9 +88,9 @@
},
open: function(tray) {
- var trayBody = tray.find('.editor-tray-body');
+ var trayBody = tray.find('.red-ui-tray-body');
trayBody.addClass("node-input-markdown-editor")
- var dialogForm = RED.editor.buildEditForm(tray.find('.editor-tray-body'),'dialog-form',type,'editor');
+ var dialogForm = RED.editor.buildEditForm(tray.find('.red-ui-tray-body'),'dialog-form',type,'editor');
expressionEditor = RED.editor.createEditor({
id: 'node-input-markdown',
value: value,
diff --git a/packages/node_modules/@node-red/editor-client/src/js/ui/event-log.js b/packages/node_modules/@node-red/editor-client/src/js/ui/event-log.js
index c024b06fe..566fe7bde 100644
--- a/packages/node_modules/@node-red/editor-client/src/js/ui/event-log.js
+++ b/packages/node_modules/@node-red/editor-client/src/js/ui/event-log.js
@@ -70,8 +70,8 @@ RED.eventLog = (function() {
eventLogEditor.resize();
},
open: function(tray) {
- var trayBody = tray.find('.editor-tray-body');
- var dialogForm = RED.editor.buildEditForm(tray.find('.editor-tray-body'),'dialog-form',type,'editor');
+ var trayBody = tray.find('.red-ui-tray-body');
+ var dialogForm = RED.editor.buildEditForm(tray.find('.red-ui-tray-body'),'dialog-form',type,'editor');
eventLogEditor = RED.editor.createEditor({
id: 'event-log-editor',
value: backlog.join("\n"),
diff --git a/packages/node_modules/@node-red/editor-client/src/js/ui/keyboard.js b/packages/node_modules/@node-red/editor-client/src/js/ui/keyboard.js
index ab06edfdf..6a0e6237d 100644
--- a/packages/node_modules/@node-red/editor-client/src/js/ui/keyboard.js
+++ b/packages/node_modules/@node-red/editor-client/src/js/ui/keyboard.js
@@ -94,10 +94,14 @@ RED.h = handlers;
}
}
for (var action in userKeymap) {
- if (userKeymap.hasOwnProperty(action)) {
+ if (userKeymap.hasOwnProperty(action) && userKeymap[action]) {
var obj = userKeymap[action];
if (obj.hasOwnProperty('key')) {
- addHandler(obj.scope, obj.key, action, true);
+ var scope = obj.scope;
+ if (scope === "workspace") {
+ scope = "red-ui-workspace";
+ }
+ addHandler(scope, obj.key, action, true);
}
}
}
@@ -391,8 +395,11 @@ RED.h = handlers;
$(this).toggleClass("input-error",!valid);
})
- var scopeSelect = $('
').appendTo(scope);
+ var scopeSelect = $('
').appendTo(scope);
scopeSelect.i18n();
+ if (object.scope === "workspace") {
+ object.scope = "red-ui-workspace";
+ }
scopeSelect.val(object.scope||'*');
var div = $('
').appendTo(scope);
diff --git a/packages/node_modules/@node-red/editor-client/src/js/ui/library.js b/packages/node_modules/@node-red/editor-client/src/js/ui/library.js
index a939e8e23..409bc2970 100755
--- a/packages/node_modules/@node-red/editor-client/src/js/ui/library.js
+++ b/packages/node_modules/@node-red/editor-client/src/js/ui/library.js
@@ -421,8 +421,8 @@ RED.library = (function() {
return {
init: function() {
- $(_librarySave).appendTo(document.body);
- $(_libraryLookup).appendTo(document.body);
+ $(_librarySave).appendTo("#red-ui-editor");
+ $(_libraryLookup).appendTo("#red-ui-editor");
$( "#node-dialog-library-save" ).dialog({
title: RED._("library.saveToLibrary"),
diff --git a/packages/node_modules/@node-red/editor-client/src/js/ui/notifications.js b/packages/node_modules/@node-red/editor-client/src/js/ui/notifications.js
index f2d04aa02..f0a7b24d1 100644
--- a/packages/node_modules/@node-red/editor-client/src/js/ui/notifications.js
+++ b/packages/node_modules/@node-red/editor-client/src/js/ui/notifications.js
@@ -62,7 +62,7 @@ RED.notifications = (function() {
}
if (options.modal) {
- $("#full-shade").show();
+ $("#red-ui-full-shade").show();
}
if (currentNotifications.length > 4) {
@@ -77,14 +77,14 @@ RED.notifications = (function() {
}
}
var n = document.createElement("div");
- n.id="red-notification-"+c;
- n.className = "notification";
+ n.id="red-ui-notification-"+c;
+ n.className = "red-ui-notification";
n.fixed = fixed;
if (type) {
- n.className = "notification notification-"+type;
+ n.className = "red-ui-notification red-ui-notification-"+type;
}
if (options.width) {
- var parentWidth = $("#notifications").width();
+ var parentWidth = $("#red-ui-notifications").width();
if (options.width > parentWidth) {
var margin = -(options.width-parentWidth)/2;
$(n).css({
@@ -116,7 +116,7 @@ RED.notifications = (function() {
}
- $("#notifications").append(n);
+ $("#red-ui-notifications").append(n);
if (!RED.notifications.hide) {
$(n).slideDown(300);
}
@@ -142,7 +142,7 @@ RED.notifications = (function() {
nn.parentNode.removeChild(nn);
}
if (options.modal) {
- $("#full-shade").hide();
+ $("#red-ui-full-shade").hide();
}
};
})();
@@ -211,9 +211,9 @@ RED.notifications = (function() {
if (nn.hidden) {
nn.showNotification();
} else if (!options || !options.silent){
- $(nn).addClass("notification-shake-horizontal");
+ $(nn).addClass("red-ui-notification-shake-horizontal");
setTimeout(function() {
- $(nn).removeClass("notification-shake-horizontal");
+ $(nn).removeClass("red-ui-notification-shake-horizontal");
},300);
}
@@ -234,6 +234,7 @@ RED.notifications = (function() {
if (options.id) {
persistentNotifications[options.id] = n;
if (options.fixed) {
+ console.log("SHPW)")
notificationButtonWrapper.show();
}
}
@@ -263,14 +264,14 @@ RED.notifications = (function() {
return {
init: function() {
- notificationButtonWrapper = $('
'+
- ''+
- ''+
- ''+
- '').prependTo(".red-ui-header-toolbar").hide();
- $('#btn-notifications').on("click", function() {
- showPersistent();
- })
+ $('
').appendTo("#red-ui-editor");
+
+ notificationButtonWrapper = $('
').prependTo(".red-ui-header-toolbar").hide();
+ $('
')
+ .appendTo(notificationButtonWrapper)
+ .on("click", function() {
+ showPersistent();
+ })
},
notify: notify
}
diff --git a/packages/node_modules/@node-red/editor-client/src/js/ui/palette.js b/packages/node_modules/@node-red/editor-client/src/js/ui/palette.js
index a4268140e..ee702f8e4 100755
--- a/packages/node_modules/@node-red/editor-client/src/js/ui/palette.js
+++ b/packages/node_modules/@node-red/editor-client/src/js/ui/palette.js
@@ -242,9 +242,9 @@ RED.palette = (function() {
}
RED.sidebar.info.set(helpText,RED._("sidebar.info.nodeHelp"));
});
- var chart = $("#chart");
+ var chart = $("#red-ui-workspace-chart");
var chartOffset = chart.offset();
- var chartSVG = $("#chart>svg").get(0);
+ var chartSVG = $("#red-ui-workspace-chart>svg").get(0);
var activeSpliceLink;
var mouseX;
var mouseY;
@@ -256,7 +256,7 @@ RED.palette = (function() {
appendTo: 'body',
revert: 'invalid',
revertDuration: 300,
- containment:'#main-container',
+ containment:'#red-ui-main-container',
start: function() {
paletteWidth = $("#red-ui-palette").width();
paletteTop = $("#red-ui-palette").parent().position().top + $("#red-ui-palette-container").position().top;
@@ -525,7 +525,7 @@ RED.palette = (function() {
}
})
- sidebarControls = $('