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 787166c00..0a9775ca2 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 @@ -115,9 +115,9 @@ var RED = (function() { var stepConfig = function() { if (configs.length === 0) { $("body").i18n(); - $("#palette > .palette-spinner").hide(); - $(".palette-scroll").removeClass("hide"); - $("#palette-search").removeClass("hide"); + $("#red-ui-palette > .red-ui-palette-spinner").hide(); + $(".red-ui-palette-scroll").removeClass("hide"); + $("#red-ui-palette-search").removeClass("hide"); loadFlows(function() { if (RED.settings.theme("projects.enabled",false)) { RED.projects.refresh(function(activeProject) { diff --git a/packages/node_modules/@node-red/editor-client/src/js/ui/common/stack.js b/packages/node_modules/@node-red/editor-client/src/js/ui/common/stack.js index 0cb410b29..ddb88b549 100644 --- a/packages/node_modules/@node-red/editor-client/src/js/ui/common/stack.js +++ b/packages/node_modules/@node-red/editor-client/src/js/ui/common/stack.js @@ -45,11 +45,11 @@ RED.stack = (function() { return { add: function(entry) { entries.push(entry); - entry.container = $('
').appendTo(container); + entry.container = $('
').appendTo(container); if (!visible) { entry.container.hide(); } - var header = $('
').appendTo(entry.container); + var header = $('
').appendTo(entry.container); entry.header = header; entry.contentWrap = $('
',{style:"position:relative"}).appendTo(entry.container); if (options.fill) { 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 5fe8be1e3..9a5a56d99 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 @@ -273,7 +273,7 @@ RED.deploy = (function() { deployInflight = true; $("#header-shade").show(); $("#editor-shade").show(); - $("#palette-shade").show(); + $("#red-ui-palette-shade").show(); $("#sidebar-shade").show(); $.ajax({ @@ -308,7 +308,7 @@ RED.deploy = (function() { $(".deploy-button-spinner").hide(); $("#header-shade").hide(); $("#editor-shade").hide(); - $("#palette-shade").hide(); + $("#red-ui-palette-shade").hide(); $("#sidebar-shade").hide(); },delta); }); @@ -424,7 +424,7 @@ RED.deploy = (function() { deployInflight = true; $("#header-shade").show(); $("#editor-shade").show(); - $("#palette-shade").show(); + $("#red-ui-palette-shade").show(); $("#sidebar-shade").show(); $.ajax({ url:"flows", @@ -494,7 +494,7 @@ RED.deploy = (function() { $(".deploy-button-spinner").hide(); $("#header-shade").hide(); $("#editor-shade").hide(); - $("#palette-shade").hide(); + $("#red-ui-palette-shade").hide(); $("#sidebar-shade").hide(); },delta); }); diff --git a/packages/node_modules/@node-red/editor-client/src/js/ui/diff.js b/packages/node_modules/@node-red/editor-client/src/js/ui/diff.js index e73dc7ec1..fd7a9bc7d 100644 --- a/packages/node_modules/@node-red/editor-client/src/js/ui/diff.js +++ b/packages/node_modules/@node-red/editor-client/src/js/ui/diff.js @@ -497,7 +497,7 @@ RED.diff = (function() { } nodeDiv.css('backgroundColor',colour); - var iconContainer = $('
',{class:"palette_icon_container"}).appendTo(nodeDiv); + var iconContainer = $('
',{class:"red-ui-palette-icon-container"}).appendTo(nodeDiv); RED.utils.createIconElement(icon_url, iconContainer, false); return nodeDiv; 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 6288afc7b..aa4dd1f16 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 @@ -913,7 +913,7 @@ RED.editor = (function() { var icon_url = RED.settings.apiRootUrl+"icons/"+moduleName+"/"+icon; iconDiv.data('icon',icon_url); nodeDiv.css('backgroundColor',colour); - var iconContainer = $('
',{class:"palette_icon_container"}).appendTo(nodeDiv); + var iconContainer = $('
',{class:"red-ui-palette-icon-container"}).appendTo(nodeDiv); RED.utils.createIconElement(icon_url, iconContainer, true); if (iconPath.module === moduleName && iconPath.file === icon) { @@ -983,7 +983,7 @@ RED.editor = (function() { var colour = RED.utils.getNodeColor(node.type, node._def); var icon_url = RED.utils.getNodeIcon(node._def,node); nodeDiv.css('backgroundColor',colour); - var iconContainer = $('
',{class:"palette_icon_container"}).appendTo(nodeDiv); + var iconContainer = $('
',{class:"red-ui-palette-icon-container"}).appendTo(nodeDiv); RED.utils.createIconElement(icon_url, iconContainer, true); iconButton.on("click", function(e) { diff --git a/packages/node_modules/@node-red/editor-client/src/js/ui/palette-editor.js b/packages/node_modules/@node-red/editor-client/src/js/ui/palette-editor.js index 7e224b524..7962e83bc 100644 --- a/packages/node_modules/@node-red/editor-client/src/js/ui/palette-editor.js +++ b/packages/node_modules/@node-red/editor-client/src/js/ui/palette-editor.js @@ -580,7 +580,7 @@ RED.palette.editor = (function() { content: modulesTab }) - var filterDiv = $('
',{class:"palette-search"}).appendTo(modulesTab); + var filterDiv = $('
',{class:"red-ui-palette-search"}).appendTo(modulesTab); filterInput = $('') .appendTo(filterDiv) .searchBox({ @@ -643,7 +643,7 @@ RED.palette.editor = (function() { var enableButton = $('').text(RED._('palette.editor.disableall')).appendTo(buttonGroup); var contentRow = $('
',{class:"palette-module-content"}).appendTo(container); - var shade = $('
').appendTo(container); + var shade = $('
').appendTo(container); object.elements = { updateButton: updateButton, @@ -736,7 +736,7 @@ RED.palette.editor = (function() { var toolBar = $('
',{class:"palette-editor-toolbar"}).appendTo(installTab); - var searchDiv = $('
',{class:"palette-search"}).appendTo(installTab); + var searchDiv = $('
',{class:"red-ui-palette-search"}).appendTo(installTab); searchInput = $('') .appendTo(searchDiv) .searchBox({ @@ -875,7 +875,7 @@ RED.palette.editor = (function() { } }); - $('
').appendTo(installTab); + $('
').appendTo(installTab); } function update(entry,version,container,done) { if (RED.settings.theme('palette.editable') === false) { 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 8a22eecbb..a4268140e 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 @@ -23,43 +23,43 @@ RED.palette = (function() { var sidebarControls; function createCategory(originalCategory,rootCategory,category,ns) { - if ($("#palette-base-category-"+rootCategory).length === 0) { + if ($("#red-ui-palette-base-category-"+rootCategory).length === 0) { createCategoryContainer(originalCategory,rootCategory, ns+":palette.label."+rootCategory); } - $("#palette-container-"+rootCategory).show(); - if ($("#palette-"+category).length === 0) { - $("#palette-base-category-"+rootCategory).append('
'); + $("#red-ui-palette-container-"+rootCategory).show(); + if ($("#red-ui-palette-"+category).length === 0) { + $("#red-ui-palette-base-category-"+rootCategory).append('
'); } } function createCategoryContainer(originalCategory,category, labelId) { var label = RED._(labelId, {defaultValue:category}); label = (label || category).replace(/_/g, " "); - var catDiv = $('
'+ - '
'+label+'
'+ - '
'+ - '
'+ - '
'+ - '
'+ + var catDiv = $('
'+ + '
'+label+'
'+ + '
'+ + '
'+ + '
'+ + '
'+ '
'+ - '
').appendTo("#palette-container"); + '
').appendTo("#red-ui-palette-container"); catDiv.data('category',originalCategory); catDiv.data('label',label); categoryContainers[category] = { container: catDiv, close: function() { - catDiv.removeClass("palette-open"); - catDiv.addClass("palette-closed"); - $("#palette-base-category-"+category).slideUp(); - $("#palette-header-"+category+" i").removeClass("expanded"); + catDiv.removeClass("red-ui-palette-open"); + catDiv.addClass("red-ui-palette-closed"); + $("#red-ui-palette-base-category-"+category).slideUp(); + $("#red-ui-palette-header-"+category+" i").removeClass("expanded"); }, open: function() { - catDiv.addClass("palette-open"); - catDiv.removeClass("palette-closed"); - $("#palette-base-category-"+category).slideDown(); - $("#palette-header-"+category+" i").addClass("expanded"); + catDiv.addClass("red-ui-palette-open"); + catDiv.removeClass("red-ui-palette-closed"); + $("#red-ui-palette-base-category-"+category).slideDown(); + $("#red-ui-palette-header-"+category+" i").addClass("expanded"); }, toggle: function() { - if (catDiv.hasClass("palette-open")) { + if (catDiv.hasClass("red-ui-palette-open")) { categoryContainers[category].close(); } else { categoryContainers[category].open(); @@ -67,7 +67,7 @@ RED.palette = (function() { } }; - $("#palette-header-"+category).on('click', function(e) { + $("#red-ui-palette-header-"+category).on('click', function(e) { categoryContainers[category].toggle(); }); } @@ -85,17 +85,17 @@ RED.palette = (function() { var displayLines = []; var currentLine = words[0]; - var currentLineWidth = RED.view.calculateTextWidth(currentLine, "palette_label", 0); + var currentLineWidth = RED.view.calculateTextWidth(currentLine, "red-ui-palette-label", 0); for (var i=1;i', { - class: "palette_label" - + (((!def.align && def.inputs !== 0 && def.outputs === 0) || "right" === def.align) ? " palette_label_right" : "") + class: "red-ui-palette-label" + + (((!def.align && def.inputs !== 0 && def.outputs === 0) || "right" === def.align) ? " red-ui-palette-label-right" : "") }).appendTo(d); - d.className="palette_node"; + d.className="red-ui-palette-node"; if (def.icon) { var icon_url = RED.utils.getNodeIcon(def); var iconContainer = $('
', { - class: "palette_icon_container" - + (((!def.align && def.inputs !== 0 && def.outputs === 0) || "right" === def.align) ? " palette_icon_container_right" : "") + class: "red-ui-palette-icon-container" + + (((!def.align && def.inputs !== 0 && def.outputs === 0) || "right" === def.align) ? " red-ui-palette-icon-container-right" : "") }).appendTo(d); RED.utils.createIconElement(icon_url, iconContainer, true); } @@ -197,19 +197,19 @@ RED.palette = (function() { if (def.outputs > 0) { var portOut = document.createElement("div"); - portOut.className = "palette_port palette_port_output"; + portOut.className = "red-ui-palette-port red-ui-palette-port-output"; d.appendChild(portOut); } if (def.inputs > 0) { var portIn = document.createElement("div"); - portIn.className = "palette_port palette_port_input"; + portIn.className = "red-ui-palette-port red-ui-palette-port-input"; d.appendChild(portIn); } createCategory(def.category,rootCategory,category,(coreCategories.indexOf(rootCategory) !== -1)?"node-red":def.set.id); - $("#palette-"+category).append(d); + $("#red-ui-palette-"+category).append(d); $(d).data('category',rootCategory); @@ -258,8 +258,8 @@ RED.palette = (function() { revertDuration: 300, containment:'#main-container', start: function() { - paletteWidth = $("#palette").width(); - paletteTop = $("#palette").parent().position().top + $("#palette-container").position().top; + paletteWidth = $("#red-ui-palette").width(); + paletteTop = $("#red-ui-palette").parent().position().top + $("#red-ui-palette-container").position().top; RED.view.focus(); }, stop: function() { d3.select('.link_splice').classed('link_splice',false); if (spliceTimer) { clearTimeout(spliceTimer); spliceTimer = null;}}, @@ -338,8 +338,8 @@ RED.palette = (function() { } setLabel(nt,$(d),label,nodeInfo); - var categoryNode = $("#palette-container-"+rootCategory); - if (categoryNode.find(".palette_node").length === 1) { + var categoryNode = $("#red-ui-palette-container-"+rootCategory); + if (categoryNode.find(".red-ui-palette-node").length === 1) { categoryContainers[rootCategory].open(); } @@ -348,12 +348,12 @@ RED.palette = (function() { function removeNodeType(nt) { var nodeTypeId = escapeNodeType(nt); - var paletteNode = $("#palette_node_"+nodeTypeId); - var categoryNode = paletteNode.closest(".palette-category"); + var paletteNode = $("#red-ui-palette-node_"+nodeTypeId); + var categoryNode = paletteNode.closest(".red-ui-palette-category"); paletteNode.remove(); - if (categoryNode.find(".palette_node").length === 0) { + if (categoryNode.find(".red-ui-palette-node").length === 0) { if (categoryNode.find("i").hasClass("expanded")) { - categoryNode.find(".palette-content").slideToggle(); + categoryNode.find(".red-ui-palette-content").slideToggle(); categoryNode.find("i").toggleClass("expanded"); } } @@ -361,10 +361,10 @@ RED.palette = (function() { function hideNodeType(nt) { var nodeTypeId = escapeNodeType(nt); - var paletteNode = $("#palette_node_"+nodeTypeId); + var paletteNode = $("#red-ui-palette-node_"+nodeTypeId); paletteNode.hide(); - var categoryNode = paletteNode.closest(".palette-category"); - var cl = categoryNode.find(".palette_node"); + var categoryNode = paletteNode.closest(".red-ui-palette-category"); + var cl = categoryNode.find(".red-ui-palette-node"); var c = 0; for (var i = 0; i < cl.length; i++) { if ($(cl[i]).css('display') === 'none') { c += 1; } @@ -374,32 +374,32 @@ RED.palette = (function() { function showNodeType(nt) { var nodeTypeId = escapeNodeType(nt); - var paletteNode = $("#palette_node_"+nodeTypeId); - var categoryNode = paletteNode.closest(".palette-category"); + var paletteNode = $("#red-ui-palette-node_"+nodeTypeId); + var categoryNode = paletteNode.closest(".red-ui-palette-category"); categoryNode.show(); paletteNode.show(); } function refreshNodeTypes() { RED.nodes.eachSubflow(function(sf) { - var paletteNode = $("#palette_node_subflow_"+sf.id.replace(".","_")); - var portInput = paletteNode.find(".palette_port_input"); - var portOutput = paletteNode.find(".palette_port_output"); + var paletteNode = $("#red-ui-palette-node_subflow_"+sf.id.replace(".","_")); + var portInput = paletteNode.find(".red-ui-palette-port-input"); + var portOutput = paletteNode.find(".red-ui-palette-port-output"); - var paletteLabel = paletteNode.find(".palette_label"); - paletteLabel.attr("class","palette_label" - + (((!sf._def.align && sf.in.length !== 0 && sf.out.length === 0) || "right" === sf._def.align) ? " palette_label_right" : "") + var paletteLabel = paletteNode.find(".red-ui-palette-label"); + paletteLabel.attr("class","red-ui-palette-label" + + (((!sf._def.align && sf.in.length !== 0 && sf.out.length === 0) || "right" === sf._def.align) ? " red-ui-palette-label-right" : "") ); - var paletteIconContainer = paletteNode.find(".palette_icon_container"); - paletteIconContainer.attr("class","palette_icon_container" - + (((!sf._def.align && sf.in.length !== 0 && sf.out.length === 0) || "right" === sf._def.align) ? " palette_icon_container_right" : "") + var paletteIconContainer = paletteNode.find(".red-ui-palette-icon-container"); + paletteIconContainer.attr("class","red-ui-palette-icon-container" + + (((!sf._def.align && sf.in.length !== 0 && sf.out.length === 0) || "right" === sf._def.align) ? " red-ui-palette-icon-container-right" : "") ); if (portInput.length === 0 && sf.in.length > 0) { var portIn = document.createElement("div"); - portIn.className = "palette_port palette_port_input"; + portIn.className = "red-ui-palette-port red-ui-palette-port-input"; paletteNode.append(portIn); } else if (portInput.length !== 0 && sf.in.length === 0) { portInput.remove(); @@ -407,7 +407,7 @@ RED.palette = (function() { if (portOutput.length === 0 && sf.out.length > 0) { var portOut = document.createElement("div"); - portOut.className = "palette_port palette_port_output"; + portOut.className = "red-ui-palette-port red-ui-palette-port-output"; paletteNode.append(portOut); } else if (portOutput.length !== 0 && sf.out.length === 0) { portOutput.remove(); @@ -421,17 +421,17 @@ RED.palette = (function() { var category = newCategory.replace(/ /g,"_"); createCategory(newCategory,category,category,"node-red"); - var currentCategoryNode = paletteNode.closest(".palette-category"); + var currentCategoryNode = paletteNode.closest(".red-ui-palette-category"); var newCategoryNode = $("#palette-"+category); newCategoryNode.append(paletteNode); - if (newCategoryNode.find(".palette_node").length === 1) { + if (newCategoryNode.find(".red-ui-palette-node").length === 1) { categoryContainers[category].open(); } paletteNode.data('category',newCategory); - if (currentCategoryNode.find(".palette_node").length === 0) { + if (currentCategoryNode.find(".red-ui-palette-node").length === 0) { if (currentCategoryNode.find("i").hasClass("expanded")) { - currentCategoryNode.find(".palette-content").slideToggle(); + currentCategoryNode.find(".red-ui-palette-content").slideToggle(); currentCategoryNode.find("i").toggleClass("expanded"); } } @@ -444,8 +444,8 @@ RED.palette = (function() { function filterChange(val) { var re = new RegExp(val.replace(/[-\/\\^$*+?.()|[\]{}]/g, '\\$&'),'i'); - $("#palette-container .palette_node").each(function(i,el) { - var currentLabel = $(el).find(".palette_label").text(); + $("#red-ui-palette-container .red-ui-palette-node").each(function(i,el) { + var currentLabel = $(el).find(".red-ui-palette-label").text(); if (val === "" || re.test(el.id) || re.test(currentLabel)) { $(this).show(); } else { @@ -456,7 +456,7 @@ RED.palette = (function() { for (var category in categoryContainers) { if (categoryContainers.hasOwnProperty(category)) { if (categoryContainers[category].container - .find(".palette_node") + .find(".red-ui-palette-node") .filter(function() { return $(this).css('display') !== 'none'}).length === 0) { categoryContainers[category].close(); } else { @@ -468,6 +468,13 @@ RED.palette = (function() { function init() { + $('').appendTo("#red-ui-palette"); + $('').appendTo("#red-ui-palette"); + $('
').appendTo("#red-ui-palette"); + $('').appendTo("#red-ui-palette"); + $('
').appendTo("#red-ui-palette"); + + RED.events.on('registry:node-type-added', function(nodeType) { var def = RED.nodes.getType(nodeType); addNodeType(nodeType,def); @@ -508,25 +515,26 @@ RED.palette = (function() { } }); - $("#palette > .palette-spinner").show(); + $("#red-ui-palette > .red-ui-palette-spinner").show(); - $("#palette-search input").searchBox({ + + $("#red-ui-palette-search input").searchBox({ delay: 100, change: function() { filterChange($(this).val()); } }) - sidebarControls = $('