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 c53249424..8f71cecd6 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
@@ -38,7 +38,7 @@ var RED = (function() {
newScript.onload = function() {
scriptCount--;
if (scriptCount === 0) {
- $("body").append(nodeConfigEls);
+ $("#red-ui-editor-node-configs").append(nodeConfigEls);
done()
}
}
@@ -58,7 +58,7 @@ var RED = (function() {
}
})
if (!hasDeferred) {
- $("body").append(nodeConfigEls);
+ $("#red-ui-editor-node-configs").append(nodeConfigEls);
done();
}
} catch(err) {
@@ -114,7 +114,7 @@ var RED = (function() {
var configs = data.trim().split(/(?=)/);
var stepConfig = function() {
if (configs.length === 0) {
- $("body").i18n();
+ $("#red-ui-editor").i18n();
$("#red-ui-palette > .red-ui-palette-spinner").hide();
$(".red-ui-palette-scroll").removeClass("hide");
$("#red-ui-palette-search").removeClass("hide");
@@ -547,6 +547,7 @@ var RED = (function() {
''+
''+
'').appendTo(options.target);
+ $('').appendTo(options.target);
$('').appendTo(options.target);
$.getJSON(options.apiRootUrl+"theme", function(theme) {
if (theme.header) {
diff --git a/packages/node_modules/@node-red/editor-client/src/js/ui/common/popover.js b/packages/node_modules/@node-red/editor-client/src/js/ui/common/popover.js
index e3a10664c..5a1c8718c 100644
--- a/packages/node_modules/@node-red/editor-client/src/js/ui/common/popover.js
+++ b/packages/node_modules/@node-red/editor-client/src/js/ui/common/popover.js
@@ -131,7 +131,7 @@ RED.popover = (function() {
}
}
var closePopup = function(instant) {
- $(document).off('mousedown.modal-popover-close');
+ $(document).off('mousedown.red-ui-popover');
if (!active) {
if (div) {
if (instant) {
@@ -185,7 +185,7 @@ RED.popover = (function() {
}
} else if (trigger === 'modal') {
- $(document).on('mousedown.modal-popover-close', function (event) {
+ $(document).on('mousedown.red-ui-popover', function (event) {
var target = event.target;
while (target.nodeName !== 'BODY' && target !== div[0]) {
target = target.parentElement;
diff --git a/packages/node_modules/@node-red/editor-client/src/js/ui/common/searchBox.js b/packages/node_modules/@node-red/editor-client/src/js/ui/common/searchBox.js
index 8f98862c7..9ca16bcf7 100644
--- a/packages/node_modules/@node-red/editor-client/src/js/ui/common/searchBox.js
+++ b/packages/node_modules/@node-red/editor-client/src/js/ui/common/searchBox.js
@@ -60,7 +60,7 @@
});
this.element.on("focus",function() {
- $("body").one("mousedown",function() {
+ $(document).one("mousedown",function() {
that.element.blur();
});
});
diff --git a/packages/node_modules/@node-red/editor-client/src/js/ui/common/tabs.js b/packages/node_modules/@node-red/editor-client/src/js/ui/common/tabs.js
index 4e3d3c0bc..c24eba033 100644
--- a/packages/node_modules/@node-red/editor-client/src/js/ui/common/tabs.js
+++ b/packages/node_modules/@node-red/editor-client/src/js/ui/common/tabs.js
@@ -148,11 +148,11 @@ RED.tabs = (function() {
left: (elementPos.left - collapsibleMenu.width() + selectButton.width())+"px"
})
if (collapsibleMenu.is(":visible")) {
- $(document).off("click.tabmenu");
+ $(document).off("click.red-ui-tabmenu");
} else {
$(".red-ui-menu").hide();
- $(document).on("click.tabmenu", function(evt) {
- $(document).off("click.tabmenu");
+ $(document).on("click.red-ui-tabmenu", function(evt) {
+ $(document).off("click.red-ui-tabmenu");
collapsibleMenu.hide();
});
}
diff --git a/packages/node_modules/@node-red/editor-client/src/js/ui/deploy.js b/packages/node_modules/@node-red/editor-client/src/js/ui/deploy.js
index 63b6a2066..3710cd042 100644
--- a/packages/node_modules/@node-red/editor-client/src/js/ui/deploy.js
+++ b/packages/node_modules/@node-red/editor-client/src/js/ui/deploy.js
@@ -272,7 +272,7 @@ RED.deploy = (function() {
$("#btn-deploy").addClass("disabled");
deployInflight = true;
$("#red-ui-header-shade").show();
- $("#editor-shade").show();
+ $("#red-ui-editor-shade").show();
$("#red-ui-palette-shade").show();
$("#red-ui-sidebar-shade").show();
@@ -307,7 +307,7 @@ RED.deploy = (function() {
$(".deploy-button-content").css('opacity',1);
$(".deploy-button-spinner").hide();
$("#red-ui-header-shade").hide();
- $("#editor-shade").hide();
+ $("#red-ui-editor-shade").hide();
$("#red-ui-palette-shade").hide();
$("#red-ui-sidebar-shade").hide();
},delta);
@@ -423,7 +423,7 @@ RED.deploy = (function() {
deployInflight = true;
$("#red-ui-header-shade").show();
- $("#editor-shade").show();
+ $("#red-ui-editor-shade").show();
$("#red-ui-palette-shade").show();
$("#red-ui-sidebar-shade").show();
$.ajax({
@@ -493,7 +493,7 @@ RED.deploy = (function() {
$(".deploy-button-content").css('opacity',1);
$(".deploy-button-spinner").hide();
$("#red-ui-header-shade").hide();
- $("#editor-shade").hide();
+ $("#red-ui-editor-shade").hide();
$("#red-ui-palette-shade").hide();
$("#red-ui-sidebar-shade").hide();
},delta);
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 d1c14d008..5db185e4b 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
@@ -202,7 +202,7 @@
RED.tray.show(trayOptions);
}
}
- $(template).appendTo(document.body);
+ $(template).appendTo("#red-ui-editor-node-configs");
RED.editor.registerTypeEditor("_buffer", definition);
})();
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 1803e4d22..7c223672c 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
@@ -346,6 +346,6 @@
RED.tray.show(trayOptions);
}
}
- $(template).appendTo(document.body);
+ $(template).appendTo("#red-ui-editor-node-configs");
RED.editor.registerTypeEditor("_expression", definition);
})();
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 4e8740055..079e76a7b 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
@@ -96,7 +96,7 @@
RED.tray.show(trayOptions);
}
}
- $(template).appendTo(document.body);
+ $(template).appendTo("#red-ui-editor-node-configs");
RED.editor.registerTypeEditor("_js", definition);
})();
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 8800a1473..50fd57234 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
@@ -112,6 +112,6 @@
RED.tray.show(trayOptions);
}
}
- $(template).appendTo(document.body);
+ $(template).appendTo("#red-ui-editor-node-configs");
RED.editor.registerTypeEditor("_json", definition);
})();
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 253d47257..9b7a6dceb 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
@@ -207,6 +207,6 @@
return toolbar;
}
}
- $(template).appendTo(document.body);
+ $(template).appendTo("#red-ui-editor-node-configs");
RED.editor.registerTypeEditor("_markdown", definition);
})();
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 566fe7bde..aac85bec2 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
@@ -36,7 +36,7 @@ RED.eventLog = (function() {
}
return {
init: function() {
- $(template).appendTo(document.body);
+ $(template).appendTo("#red-ui-editor-node-configs");
RED.actions.add("core:show-event-log",RED.eventLog.show);
},
show: function() {
diff --git a/packages/node_modules/@node-red/editor-client/src/js/ui/projects/projects.js b/packages/node_modules/@node-red/editor-client/src/js/ui/projects/projects.js
index 32ad00205..8d69be97f 100755
--- a/packages/node_modules/@node-red/editor-client/src/js/ui/projects/projects.js
+++ b/packages/node_modules/@node-red/editor-client/src/js/ui/projects/projects.js
@@ -2227,13 +2227,13 @@ RED.projects = (function() {
open: function(e) {
$(this).parent().find(".ui-dialog-titlebar-close").hide();
// $("#red-ui-header-shade").show();
- // $("#editor-shade").show();
+ // $("#red-ui-editor-shade").show();
// $("#red-ui-palette-shade").show();
// $("#red-ui-sidebar-shade").show();
},
close: function(e) {
// $("#red-ui-header-shade").hide();
- // $("#editor-shade").hide();
+ // $("#red-ui-editor-shade").hide();
// $("#red-ui-palette-shade").hide();
// $("#red-ui-sidebar-shade").hide();
}
diff --git a/packages/node_modules/@node-red/editor-client/src/js/ui/search.js b/packages/node_modules/@node-red/editor-client/src/js/ui/search.js
index 3e8b3feb8..b796410ff 100644
--- a/packages/node_modules/@node-red/editor-client/src/js/ui/search.js
+++ b/packages/node_modules/@node-red/editor-client/src/js/ui/search.js
@@ -255,7 +255,7 @@ RED.search = (function() {
if (!visible) {
RED.keyboard.add("*","escape",function(){hide()});
$("#red-ui-header-shade").show();
- $("#editor-shade").show();
+ $("#red-ui-editor-shade").show();
$("#red-ui-palette-shade").show();
$("#red-ui-sidebar-shade").show();
$("#red-ui-sidebar-separator").hide();
@@ -276,7 +276,7 @@ RED.search = (function() {
RED.keyboard.remove("escape");
visible = false;
$("#red-ui-header-shade").hide();
- $("#editor-shade").hide();
+ $("#red-ui-editor-shade").hide();
$("#red-ui-palette-shade").hide();
$("#red-ui-sidebar-shade").hide();
$("#red-ui-sidebar-separator").show();
@@ -300,7 +300,7 @@ RED.search = (function() {
$("#red-ui-header-shade").on('mousedown',hide);
- $("#editor-shade").on('mousedown',hide);
+ $("#red-ui-editor-shade").on('mousedown',hide);
$("#red-ui-palette-shade").on('mousedown',hide);
$("#red-ui-sidebar-shade").on('mousedown',hide);
}
diff --git a/packages/node_modules/@node-red/editor-client/src/js/ui/sidebar.js b/packages/node_modules/@node-red/editor-client/src/js/ui/sidebar.js
index bda764533..cc544ea7a 100644
--- a/packages/node_modules/@node-red/editor-client/src/js/ui/sidebar.js
+++ b/packages/node_modules/@node-red/editor-client/src/js/ui/sidebar.js
@@ -88,7 +88,7 @@ RED.sidebar = (function() {
start:function(event,ui) {
sidebarSeparator.closing = false;
sidebarSeparator.opening = false;
- var winWidth = $(window).width();
+ var winWidth = $("#red-ui-editor").width();
sidebarSeparator.start = ui.position.left;
sidebarSeparator.chartWidth = $("#red-ui-workspace").width();
sidebarSeparator.chartRight = winWidth-$("#red-ui-workspace").width()-$("#red-ui-workspace").offset().left-2;
@@ -252,7 +252,7 @@ RED.sidebar = (function() {
RED.sidebar.config.init();
RED.sidebar.context.init();
// hide info bar at start if screen rather narrow...
- if ($(window).width() < 600) { RED.menu.setSelected("menu-item-sidebar",false); }
+ if ($("#red-ui-editor").width() < 600) { RED.menu.setSelected("menu-item-sidebar",false); }
}
return {
diff --git a/packages/node_modules/@node-red/editor-client/src/js/ui/subflow.js b/packages/node_modules/@node-red/editor-client/src/js/ui/subflow.js
index 801c0c9d6..b0ab5c066 100644
--- a/packages/node_modules/@node-red/editor-client/src/js/ui/subflow.js
+++ b/packages/node_modules/@node-red/editor-client/src/js/ui/subflow.js
@@ -499,8 +499,8 @@ RED.subflow = (function() {
RED.actions.add("core:create-subflow",createSubflow);
RED.actions.add("core:convert-to-subflow",convertToSubflow);
- $(_subflowEditTemplate).appendTo(document.body);
- $(_subflowTemplateEditTemplate).appendTo(document.body);
+ $(_subflowEditTemplate).appendTo("#red-ui-editor-node-configs");
+ $(_subflowTemplateEditTemplate).appendTo("#red-ui-editor-node-configs");
}
diff --git a/packages/node_modules/@node-red/editor-client/src/js/ui/touch/radialMenu.js b/packages/node_modules/@node-red/editor-client/src/js/ui/touch/radialMenu.js
index 9e39506e8..29daa6510 100644
--- a/packages/node_modules/@node-red/editor-client/src/js/ui/touch/radialMenu.js
+++ b/packages/node_modules/@node-red/editor-client/src/js/ui/touch/radialMenu.js
@@ -16,20 +16,17 @@
RED.touch = RED.touch||{};
RED.touch.radialMenu = (function() {
-
-
+
+
var touchMenu = null;
var isActive = false;
var isOutside = false;
var activeOption = null;
-
+
function createRadial(obj,pos,options) {
isActive = true;
try {
- var w = $("body").width();
- var h = $("body").height();
-
touchMenu = d3.select("body").append("div")
.style({
position:"absolute",
@@ -43,10 +40,7 @@ RED.touch.radialMenu = (function() {
hide();
d3.event.preventDefault();
});
-
-
-
var menu = touchMenu.append("div")
.style({
position: "absolute",
@@ -58,7 +52,7 @@ RED.touch.radialMenu = (function() {
background: "rgba(255,255,255,0.6)",
border: "1px solid #666"
});
-
+
var menuOpts = [];
var createMenuOpt = function(x,y,opt) {
opt.el = menu.append("div")
@@ -74,16 +68,16 @@ RED.touch.radialMenu = (function() {
"text-align": "center",
"line-height":"50px"
});
-
+
opt.el.html(opt.name);
-
+
if (opt.disabled) {
opt.el.style({"border-color":"#ccc",color:"#ccc"});
}
opt.x = x;
opt.y = y;
menuOpts.push(opt);
-
+
opt.el.on('touchstart',function() {
opt.el.style("background","#999");
d3.event.preventDefault();
@@ -96,7 +90,7 @@ RED.touch.radialMenu = (function() {
d3.event.stopPropagation();
});
}
-
+
var n = options.length;
var dang = Math.max(Math.PI/(n-1),Math.PI/4);
var ang = Math.PI;
@@ -108,7 +102,7 @@ RED.touch.radialMenu = (function() {
}
ang += dang;
}
-
+
var hide = function() {
isActive = false;
@@ -116,11 +110,11 @@ RED.touch.radialMenu = (function() {
touchMenu.remove();
touchMenu = null;
}
-
+
obj.on('touchend.radial',function() {
obj.on('touchend.radial',null);
obj.on('touchmenu.radial',null);
-
+
if (activeOption) {
try {
activeOption.onselect();
@@ -133,8 +127,6 @@ RED.touch.radialMenu = (function() {
}
});
-
-
obj.on('touchmove.radial',function() {
try {
var touch0 = d3.event.touches.item(0);
@@ -159,20 +151,20 @@ RED.touch.radialMenu = (function() {
var d = Math.abs((p[0]*p[0])+(p[1]*p[1]));
isOutside = (d > 80*80);
}
-
+
} catch(err) {
RED._debug(err);
}
-
+
});
-
+
} catch(err) {
RED._debug(err);
}
- }
+ }
+
-
return {
show: createRadial,
active: function() {
@@ -181,4 +173,3 @@ RED.touch.radialMenu = (function() {
}
})();
-
diff --git a/packages/node_modules/@node-red/editor-client/src/js/ui/tray.js b/packages/node_modules/@node-red/editor-client/src/js/ui/tray.js
index 14ad2a4d3..57d423e67 100644
--- a/packages/node_modules/@node-red/editor-client/src/js/ui/tray.js
+++ b/packages/node_modules/@node-red/editor-client/src/js/ui/tray.js
@@ -116,7 +116,7 @@ RED.tray = (function() {
function finishBuild() {
$("#red-ui-header-shade").show();
- $("#editor-shade").show();
+ $("#red-ui-editor-shade").show();
$("#red-ui-palette-shade").show();
$(".red-ui-sidebar-shade").show();
tray.preferredWidth = Math.max(el.width(),500);
@@ -206,7 +206,7 @@ RED.tray = (function() {
editorStack = $("#red-ui-editor-stack");
$(window).on("resize", handleWindowResize);
RED.events.on("sidebar:resize",handleWindowResize);
- $("#editor-shade").on("click", function() {
+ $("#red-ui-editor-shade").on("click", function() {
if (!openingTray) {
var tray = stack[stack.length-1];
if (tray && tray.primaryButton) {
@@ -269,7 +269,7 @@ RED.tray = (function() {
}
if (stack.length === 0) {
$("#red-ui-header-shade").hide();
- $("#editor-shade").hide();
+ $("#red-ui-editor-shade").hide();
$("#red-ui-palette-shade").hide();
$(".red-ui-sidebar-shade").hide();
RED.events.emit("editor:close");
diff --git a/packages/node_modules/@node-red/editor-client/src/js/ui/typeSearch.js b/packages/node_modules/@node-red/editor-client/src/js/ui/typeSearch.js
index cb4f86724..461cb6801 100644
--- a/packages/node_modules/@node-red/editor-client/src/js/ui/typeSearch.js
+++ b/packages/node_modules/@node-red/editor-client/src/js/ui/typeSearch.js
@@ -208,13 +208,13 @@ RED.typeSearch = (function() {
dialog.hide();
searchResultsDiv.hide();
}
- $(document).off('mousedown.type-search');
- $(document).off('mouseup.type-search');
- $(document).off('click.type-search');
+ $(document).off('mousedown.red-ui-type-search');
+ $(document).off('mouseup.red-ui-type-search');
+ $(document).off('click.red-ui-type-search');
setTimeout(function() {
- $(document).on('mousedown.type-search',handleMouseActivity);
- $(document).on('mouseup.type-search',handleMouseActivity);
- $(document).on('click.type-search',handleMouseActivity);
+ $(document).on('mousedown.red-ui-type-search',handleMouseActivity);
+ $(document).on('mouseup.red-ui-type-search',handleMouseActivity);
+ $(document).on('click.red-ui-type-search',handleMouseActivity);
},200);
refreshTypeList(opts);
@@ -245,9 +245,9 @@ RED.typeSearch = (function() {
}
RED.events.emit("type-search:close");
RED.view.focus();
- $(document).off('mousedown.type-search');
- $(document).off('mouseup.type-search');
- $(document).off('click.type-search');
+ $(document).off('mousedown.red-ui-type-search');
+ $(document).off('mouseup.red-ui-type-search');
+ $(document).off('click.red-ui-type-search');
}
}
function getTypeLabel(type, def) {
diff --git a/packages/node_modules/@node-red/editor-client/src/js/ui/workspaces.js b/packages/node_modules/@node-red/editor-client/src/js/ui/workspaces.js
index b2ed1d68f..9cbf84f72 100644
--- a/packages/node_modules/@node-red/editor-client/src/js/ui/workspaces.js
+++ b/packages/node_modules/@node-red/editor-client/src/js/ui/workspaces.js
@@ -331,7 +331,7 @@ RED.workspaces = (function() {
$('').appendTo("#red-ui-workspace");
$('').appendTo("#red-ui-workspace");
$('').appendTo("#red-ui-workspace");
- $('').appendTo("#red-ui-workspace");
+ $('').appendTo("#red-ui-workspace");
createWorkspaceTabs();
diff --git a/packages/node_modules/@node-red/editor-client/src/sass/base.scss b/packages/node_modules/@node-red/editor-client/src/sass/base.scss
index 6579ec4de..7ca9ec227 100644
--- a/packages/node_modules/@node-red/editor-client/src/sass/base.scss
+++ b/packages/node_modules/@node-red/editor-client/src/sass/base.scss
@@ -28,7 +28,9 @@ body {
position: absolute;
top: 0; left: 0; bottom: 0; right: 0;
}
-
+#red-ui-editor-node-configs {
+ display: none;
+}
#red-ui-main-container {
position: absolute;
top:40px; left:0; bottom: 0; right:0;
diff --git a/packages/node_modules/@node-red/editor-client/src/sass/editor.scss b/packages/node_modules/@node-red/editor-client/src/sass/editor.scss
index 32c075dc2..02c99c95d 100644
--- a/packages/node_modules/@node-red/editor-client/src/sass/editor.scss
+++ b/packages/node_modules/@node-red/editor-client/src/sass/editor.scss
@@ -154,7 +154,7 @@
background: $background-color;
color: $workspace-button-color;
}
-#red-ui-palette-shade, #editor-shade, #red-ui-header-shade, #red-ui-sidebar-shade {
+#red-ui-palette-shade, #red-ui-editor-shade, #red-ui-header-shade, #red-ui-sidebar-shade {
@include shade;
z-index: 2;
}