',{class:"red-ui-search-result-node"}).css({
@@ -353,7 +359,7 @@
if (opt.icon.indexOf("<") === 0) {
$(opt.icon).prependTo(op);
} else if (opt.icon.indexOf("/") !== -1) {
- $('
![]()
',{src:opt.icon,style:"margin-right: 4px; height: 18px;"}).prependTo(op);
+ $('
![]()
',{src:mapDeprecatedIcon(opt.icon),style:"margin-right: 4px; height: 18px;"}).prependTo(op);
} else {
$('
',{class:"red-ui-typedInput-icon "+opt.icon}).prependTo(op);
}
@@ -507,7 +513,7 @@
$(o.icon).prependTo(this.optionSelectLabel);
} else if (o.icon.indexOf("/") !== -1) {
// url
- $('![]()
',{src:o.icon,style:"height: 18px;"}).prependTo(this.optionSelectLabel);
+ $('![]()
',{src:mapDeprecatedIcon(o.icon),style:"height: 18px;"}).prependTo(this.optionSelectLabel);
} else {
// icon class
$('',{class:"red-ui-typedInput-icon "+o.icon}).prependTo(this.optionSelectLabel);
@@ -619,8 +625,8 @@
else if (opt.icon.indexOf("/") !== -1) {
image = new Image();
image.name = opt.icon;
- image.src = opt.icon;
- $('![]()
',{src:opt.icon,style:"margin-right: 4px;height: 18px;"}).prependTo(this.selectLabel);
+ image.src = mapDeprecatedIcon(opt.icon);
+ $('![]()
',{src:mapDeprecatedIcon(opt.icon),style:"margin-right: 4px;height: 18px;"}).prependTo(this.selectLabel);
}
else {
$('',{class:"red-ui-typedInput-icon "+opt.icon}).prependTo(this.selectLabel);
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 16a774b0e..cdf84d02f 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
@@ -17,9 +17,9 @@
RED.deploy = (function() {
var deploymentTypes = {
- "full":{img:"red/images/deploy-full-o.png"},
- "nodes":{img:"red/images/deploy-nodes-o.png"},
- "flows":{img:"red/images/deploy-flows-o.png"}
+ "full":{img:"red/images/deploy-full-o.svg"},
+ "nodes":{img:"red/images/deploy-nodes-o.svg"},
+ "flows":{img:"red/images/deploy-flows-o.svg"}
}
var ignoreDeployWarnings = {
@@ -44,7 +44,7 @@ RED.deploy = (function() {
* type: "default" - Button with drop-down options - no further customisation available
* type: "simple" - Button without dropdown. Customisations:
* label: the text to display - default: "Deploy"
- * icon : the icon to use. Null removes the icon. default: "red/images/deploy-full-o.png"
+ * icon : the icon to use. Null removes the icon. default: "red/images/deploy-full-o.svg"
*/
function init(options) {
options = options || {};
@@ -54,7 +54,7 @@ RED.deploy = (function() {
$(''+
'').prependTo(".red-ui-header-toolbar");
RED.menu.init({id:"red-ui-header-button-deploy-options",
options: [
- {id:"deploymenu-item-full",toggle:"deploy-type",icon:"red/images/deploy-full.png",label:RED._("deploy.full"),sublabel:RED._("deploy.fullDesc"),selected: true, onselect:function(s) { if(s){changeDeploymentType("full")}}},
- {id:"deploymenu-item-flow",toggle:"deploy-type",icon:"red/images/deploy-flows.png",label:RED._("deploy.modifiedFlows"),sublabel:RED._("deploy.modifiedFlowsDesc"), onselect:function(s) {if(s){changeDeploymentType("flows")}}},
- {id:"deploymenu-item-node",toggle:"deploy-type",icon:"red/images/deploy-nodes.png",label:RED._("deploy.modifiedNodes"),sublabel:RED._("deploy.modifiedNodesDesc"),onselect:function(s) { if(s){changeDeploymentType("nodes")}}},
+ {id:"deploymenu-item-full",toggle:"deploy-type",icon:"red/images/deploy-full.svg",label:RED._("deploy.full"),sublabel:RED._("deploy.fullDesc"),selected: true, onselect:function(s) { if(s){changeDeploymentType("full")}}},
+ {id:"deploymenu-item-flow",toggle:"deploy-type",icon:"red/images/deploy-flows.svg",label:RED._("deploy.modifiedFlows"),sublabel:RED._("deploy.modifiedFlowsDesc"), onselect:function(s) {if(s){changeDeploymentType("flows")}}},
+ {id:"deploymenu-item-node",toggle:"deploy-type",icon:"red/images/deploy-nodes.svg",label:RED._("deploy.modifiedNodes"),sublabel:RED._("deploy.modifiedNodesDesc"),onselect:function(s) { if(s){changeDeploymentType("nodes")}}},
null,
- {id:"deploymenu-item-reload", icon:"red/images/deploy-reload.png",label:RED._("deploy.restartFlows"),sublabel:RED._("deploy.restartFlowsDesc"),onselect:"core:restart-flows"},
+ {id:"deploymenu-item-reload", icon:"red/images/deploy-reload.svg",label:RED._("deploy.restartFlows"),sublabel:RED._("deploy.restartFlowsDesc"),onselect:"core:restart-flows"},
]
});
} else if (type == "simple") {
var label = options.label || RED._("deploy.deploy");
- var icon = 'red/images/deploy-full-o.png';
+ var icon = 'red/images/deploy-full-o.svg';
if (options.hasOwnProperty('icon')) {
icon = options.icon;
}
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 9ea599e3d..4ebdcdce9 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
@@ -399,7 +399,7 @@ RED.diff = (function() {
diff: localDiff,
def: {
defaults:{},
- icon:"subflow.png",
+ icon:"subflow.svg",
category: "subflows",
color: "#da9"
},
@@ -422,7 +422,7 @@ RED.diff = (function() {
diff: localDiff,
def: {
defaults:{},
- icon:"subflow.png",
+ icon:"subflow.svg",
category: "subflows",
color: "#da9"
},
@@ -443,7 +443,7 @@ RED.diff = (function() {
remoteDiff: remoteDiff,
def: {
defaults:{},
- icon:"subflow.png",
+ icon:"subflow.svg",
category: "subflows",
color: "#da9"
},
@@ -549,7 +549,7 @@ RED.diff = (function() {
if (def === undefined) {
if (/^subflow:/.test(node.type)) {
def = {
- icon:"subflow.png",
+ icon:"subflow.svg",
category: "subflows",
color: "#da9",
defaults:{name:{value:""}}
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 1b3ccea52..4547dc756 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
@@ -2156,7 +2156,7 @@ RED.editor = (function() {
changed = true;
}
var icon = $("#red-ui-editor-node-icon").text()||"";
- if ((editing_node.icon === undefined && icon !== "node-red/subflow.png") ||
+ if ((editing_node.icon === undefined && icon !== "node-red/subflow.svg") ||
(editing_node.icon !== undefined && editing_node.icon !== icon)) {
changes.icon = editing_node.icon;
editing_node.icon = icon;
diff --git a/packages/node_modules/@node-red/editor-client/src/js/ui/utils.js b/packages/node_modules/@node-red/editor-client/src/js/ui/utils.js
index a7b022172..d26ed4a4c 100644
--- a/packages/node_modules/@node-red/editor-client/src/js/ui/utils.js
+++ b/packages/node_modules/@node-red/editor-client/src/js/ui/utils.js
@@ -802,13 +802,13 @@ RED.utils = (function() {
function getDefaultNodeIcon(def,node) {
var icon_url;
if (node && node.type === "subflow") {
- icon_url = "node-red/subflow.png";
+ icon_url = "node-red/subflow.svg";
} else if (typeof def.icon === "function") {
try {
icon_url = def.icon.call(node);
} catch(err) {
console.log("Definition error: "+def.type+".icon",err);
- icon_url = "arrow-in.png";
+ icon_url = "arrow-in.svg";
}
} else {
icon_url = def.icon;
@@ -838,11 +838,11 @@ RED.utils = (function() {
function getNodeIcon(def,node) {
if (def.category === 'config') {
- return RED.settings.apiRootUrl+"icons/node-red/cog.png"
+ return RED.settings.apiRootUrl+"icons/node-red/cog.svg"
} else if (node && node.type === 'tab') {
- return RED.settings.apiRootUrl+"icons/node-red/subflow.png"
+ return RED.settings.apiRootUrl+"icons/node-red/subflow.svg"
} else if (node && node.type === 'unknown') {
- return RED.settings.apiRootUrl+"icons/node-red/alert.png"
+ return RED.settings.apiRootUrl+"icons/node-red/alert.svg"
} else if (node && node.icon) {
var iconPath = separateIconPath(node.icon);
if (isIconExists(iconPath)) {
@@ -851,6 +851,11 @@ RED.utils = (function() {
} else {
return RED.settings.apiRootUrl+"icons/" + node.icon;
}
+ } else if (iconPath.module !== "font-awesome" && /.png$/i.test(iconPath.file)) {
+ iconPath.file = iconPath.file.replace(/.png$/,".svg");
+ if (isIconExists(iconPath)) {
+ return RED.settings.apiRootUrl+"icons/" + node.icon.replace(/.png$/,".svg");
+ }
}
}
@@ -861,17 +866,32 @@ RED.utils = (function() {
} else {
return RED.settings.apiRootUrl+"icons/"+iconPath.module+"/"+iconPath.file;
}
- } else {
- // This could be a non-core node trying to use a core icon.
- iconPath.module = 'node-red';
+ }
+
+ if (/.png$/i.test(iconPath.file)) {
+ var originalFile = iconPath.file;
+ iconPath.file = iconPath.file.replace(/.png$/,".svg");
+ if (isIconExists(iconPath)) {
+ return RED.settings.apiRootUrl+"icons/"+iconPath.module+"/"+iconPath.file;
+ }
+ iconPath.file = originalFile;
+ }
+
+ // This could be a non-core node trying to use a core icon.
+ iconPath.module = 'node-red';
+ if (isIconExists(iconPath)) {
+ return RED.settings.apiRootUrl+"icons/"+iconPath.module+"/"+iconPath.file;
+ }
+ if (/.png$/i.test(iconPath.file)) {
+ iconPath.file = iconPath.file.replace(/.png$/,".svg");
if (isIconExists(iconPath)) {
return RED.settings.apiRootUrl+"icons/"+iconPath.module+"/"+iconPath.file;
- } else if (def.category === 'subflows') {
- return RED.settings.apiRootUrl+"icons/node-red/subflow.png";
- } else {
- return RED.settings.apiRootUrl+"icons/node-red/arrow-in.png";
}
}
+ if (def.category === 'subflows') {
+ return RED.settings.apiRootUrl+"icons/node-red/subflow.svg";
+ }
+ return RED.settings.apiRootUrl+"icons/node-red/arrow-in.svg";
}
function getNodeLabel(node,defaultLabel) {
@@ -1007,7 +1027,7 @@ RED.utils = (function() {
return;
}
// If the specified name is not defined in font-awesome, show arrow-in icon.
- iconUrl = RED.settings.apiRootUrl+"icons/node-red/arrow-in.png"
+ iconUrl = RED.settings.apiRootUrl+"icons/node-red/arrow-in.svg"
}
var imageIconElement = $('',{class:"red-ui-palette-icon"}).appendTo(iconContainer);
imageIconElement.css("backgroundImage", "url("+iconUrl+")");
diff --git a/packages/node_modules/@node-red/editor-client/src/js/ui/view.js b/packages/node_modules/@node-red/editor-client/src/js/ui/view.js
index e3aa33a7f..57cce2852 100755
--- a/packages/node_modules/@node-red/editor-client/src/js/ui/view.js
+++ b/packages/node_modules/@node-red/editor-client/src/js/ui/view.js
@@ -2463,14 +2463,22 @@ RED.view = (function() {
.attr("class","red-ui-flow-node-icon")
.attr("x",0)
.attr("width","30")
- .attr("height","30");
+ .attr("height","30")
+ .style("display","none");
var img = new Image();
img.src = iconUrl;
img.onload = function() {
- icon.attr("width",Math.min(img.width,30));
- icon.attr("height",Math.min(img.height,30));
- icon.attr("x",15-Math.min(img.width,30)/2);
+ var largestEdge = Math.max(img.width,img.height);
+ var scaleFactor = 1;
+ if (largestEdge > 30) {
+ scaleFactor = 30/largestEdge;
+ }
+ var width = img.width * scaleFactor;
+ var height = img.height * scaleFactor;
+ icon.attr("width",width);
+ icon.attr("height",height);
+ icon.attr("x",15-width/2);
icon.attr("xlink:href",iconUrl);
icon.style("display",null);
//if ("right" == d._def.align) {
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 db36004ab..91fa8e34a 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
@@ -439,7 +439,7 @@ RED.workspaces = (function() {
if (!workspace_tabs.contains(id)) {
var sf = RED.nodes.subflow(id);
if (sf) {
- addWorkspace({type:"subflow",id:id,icon:"red/images/subflow_tab.png",label:sf.name, closeable: true});
+ addWorkspace({type:"subflow",id:id,icon:"red/images/subflow_tab.svg",label:sf.name, closeable: true});
} else {
return;
}
diff --git a/packages/node_modules/@node-red/nodes/core/core/20-inject.html b/packages/node_modules/@node-red/nodes/core/core/20-inject.html
index 558530835..69fd9c8d1 100644
--- a/packages/node_modules/@node-red/nodes/core/core/20-inject.html
+++ b/packages/node_modules/@node-red/nodes/core/core/20-inject.html
@@ -168,7 +168,7 @@
once: {value:false},
onceDelay: {value:0.1}
},
- icon: "inject.png",
+ icon: "inject.svg",
inputs:0,
outputs:1,
outputLabels: function(index) {
diff --git a/packages/node_modules/@node-red/nodes/core/core/25-catch.html b/packages/node_modules/@node-red/nodes/core/core/25-catch.html
index 8145fd525..97bd627d5 100644
--- a/packages/node_modules/@node-red/nodes/core/core/25-catch.html
+++ b/packages/node_modules/@node-red/nodes/core/core/25-catch.html
@@ -34,7 +34,7 @@
},
inputs:0,
outputs:1,
- icon: "alert.png",
+ icon: "alert.svg",
label: function() {
if (this.name) {
return this.name;
diff --git a/packages/node_modules/@node-red/nodes/core/core/25-status.html b/packages/node_modules/@node-red/nodes/core/core/25-status.html
index de52ae281..68eb127a7 100644
--- a/packages/node_modules/@node-red/nodes/core/core/25-status.html
+++ b/packages/node_modules/@node-red/nodes/core/core/25-status.html
@@ -22,14 +22,14 @@
'+
+ '
'+
''+RED._("deploy.deploy")+''+
''+
'