From a747d8c2d599a7177136cfda2efd12d0f7032b0e Mon Sep 17 00:00:00 2001 From: Nick O'Leary Date: Wed, 15 Aug 2018 23:12:51 +0100 Subject: [PATCH] Move core node icons into node package --- .../@node-red/editor/lib/editor/ui.js | 12 ++++++++--- .../src/{ => images}/icons/arrow-in.png | Bin .../src/{ => images}/icons/node-changed.png | Bin .../src/{ => images}/icons/node-error.png | Bin .../@node-red/editor/src/js/ui/view.js | 4 ++-- .../{editor/src => nodes}/icons/alert.png | Bin .../{editor/src => nodes}/icons/arduino.png | Bin .../@node-red/nodes/icons/arrow-in.png | Bin 0 -> 393 bytes .../{editor/src => nodes}/icons/batch.png | Bin .../{editor/src => nodes}/icons/bluetooth.png | Bin .../src => nodes}/icons/bridge-dash.png | Bin .../{editor/src => nodes}/icons/bridge.png | Bin .../{editor/src => nodes}/icons/cog.png | Bin .../{editor/src => nodes}/icons/comment.png | Bin .../{editor/src => nodes}/icons/db.png | Bin .../{editor/src => nodes}/icons/debug.png | Bin .../{editor/src => nodes}/icons/envelope.png | Bin .../{editor/src => nodes}/icons/feed.png | Bin .../{editor/src => nodes}/icons/file-in.png | Bin .../{editor/src => nodes}/icons/file-out.png | Bin .../{editor/src => nodes}/icons/file.png | Bin .../{editor/src => nodes}/icons/function.png | Bin .../{editor/src => nodes}/icons/hash.png | Bin .../{editor/src => nodes}/icons/inject.png | Bin .../{editor/src => nodes}/icons/join.png | Bin .../{editor/src => nodes}/icons/leveldb.png | Bin .../{editor/src => nodes}/icons/light.png | Bin .../{editor/src => nodes}/icons/link-out.png | Bin .../{editor/src => nodes}/icons/mongodb.png | Bin .../{editor/src => nodes}/icons/mouse.png | Bin .../src => nodes}/icons/parser-csv.png | Bin .../src => nodes}/icons/parser-html.png | Bin .../src => nodes}/icons/parser-json.png | Bin .../src => nodes}/icons/parser-xml.png | Bin .../src => nodes}/icons/parser-yaml.png | Bin .../{editor/src => nodes}/icons/range.png | Bin .../{editor/src => nodes}/icons/redis.png | Bin .../{editor/src => nodes}/icons/rpi.png | Bin .../{editor/src => nodes}/icons/serial.png | Bin .../{editor/src => nodes}/icons/sort.png | Bin .../{editor/src => nodes}/icons/split.png | Bin .../{editor/src => nodes}/icons/subflow.png | Bin .../{editor/src => nodes}/icons/swap.png | Bin .../{editor/src => nodes}/icons/switch.png | Bin .../{editor/src => nodes}/icons/template.png | Bin .../{editor/src => nodes}/icons/timer.png | Bin .../{editor/src => nodes}/icons/trigger.png | Bin .../{editor/src => nodes}/icons/twitter.png | Bin .../{editor/src => nodes}/icons/watch.png | Bin .../src => nodes}/icons/white-globe.png | Bin .../@node-red/registry/localfilesystem.js | 6 ++---- .../@node-red/registry/registry.js | 8 ++----- .../@node-red/runtime/api/nodes.js | 20 +++++++++++------- .../runtime/nodes/context/localfilesystem.js | 4 ++-- packages/node_modules/node-red/red/red.js | 2 +- 55 files changed, 30 insertions(+), 26 deletions(-) rename packages/node_modules/@node-red/editor/src/{ => images}/icons/arrow-in.png (100%) rename packages/node_modules/@node-red/editor/src/{ => images}/icons/node-changed.png (100%) rename packages/node_modules/@node-red/editor/src/{ => images}/icons/node-error.png (100%) rename packages/node_modules/@node-red/{editor/src => nodes}/icons/alert.png (100%) rename packages/node_modules/@node-red/{editor/src => nodes}/icons/arduino.png (100%) create mode 100644 packages/node_modules/@node-red/nodes/icons/arrow-in.png rename packages/node_modules/@node-red/{editor/src => nodes}/icons/batch.png (100%) rename packages/node_modules/@node-red/{editor/src => nodes}/icons/bluetooth.png (100%) rename packages/node_modules/@node-red/{editor/src => nodes}/icons/bridge-dash.png (100%) rename packages/node_modules/@node-red/{editor/src => nodes}/icons/bridge.png (100%) rename packages/node_modules/@node-red/{editor/src => nodes}/icons/cog.png (100%) rename packages/node_modules/@node-red/{editor/src => nodes}/icons/comment.png (100%) rename packages/node_modules/@node-red/{editor/src => nodes}/icons/db.png (100%) rename packages/node_modules/@node-red/{editor/src => nodes}/icons/debug.png (100%) rename packages/node_modules/@node-red/{editor/src => nodes}/icons/envelope.png (100%) rename packages/node_modules/@node-red/{editor/src => nodes}/icons/feed.png (100%) rename packages/node_modules/@node-red/{editor/src => nodes}/icons/file-in.png (100%) rename packages/node_modules/@node-red/{editor/src => nodes}/icons/file-out.png (100%) rename packages/node_modules/@node-red/{editor/src => nodes}/icons/file.png (100%) rename packages/node_modules/@node-red/{editor/src => nodes}/icons/function.png (100%) rename packages/node_modules/@node-red/{editor/src => nodes}/icons/hash.png (100%) rename packages/node_modules/@node-red/{editor/src => nodes}/icons/inject.png (100%) rename packages/node_modules/@node-red/{editor/src => nodes}/icons/join.png (100%) rename packages/node_modules/@node-red/{editor/src => nodes}/icons/leveldb.png (100%) rename packages/node_modules/@node-red/{editor/src => nodes}/icons/light.png (100%) rename packages/node_modules/@node-red/{editor/src => nodes}/icons/link-out.png (100%) rename packages/node_modules/@node-red/{editor/src => nodes}/icons/mongodb.png (100%) rename packages/node_modules/@node-red/{editor/src => nodes}/icons/mouse.png (100%) rename packages/node_modules/@node-red/{editor/src => nodes}/icons/parser-csv.png (100%) rename packages/node_modules/@node-red/{editor/src => nodes}/icons/parser-html.png (100%) rename packages/node_modules/@node-red/{editor/src => nodes}/icons/parser-json.png (100%) rename packages/node_modules/@node-red/{editor/src => nodes}/icons/parser-xml.png (100%) rename packages/node_modules/@node-red/{editor/src => nodes}/icons/parser-yaml.png (100%) rename packages/node_modules/@node-red/{editor/src => nodes}/icons/range.png (100%) rename packages/node_modules/@node-red/{editor/src => nodes}/icons/redis.png (100%) rename packages/node_modules/@node-red/{editor/src => nodes}/icons/rpi.png (100%) rename packages/node_modules/@node-red/{editor/src => nodes}/icons/serial.png (100%) rename packages/node_modules/@node-red/{editor/src => nodes}/icons/sort.png (100%) rename packages/node_modules/@node-red/{editor/src => nodes}/icons/split.png (100%) rename packages/node_modules/@node-red/{editor/src => nodes}/icons/subflow.png (100%) rename packages/node_modules/@node-red/{editor/src => nodes}/icons/swap.png (100%) rename packages/node_modules/@node-red/{editor/src => nodes}/icons/switch.png (100%) rename packages/node_modules/@node-red/{editor/src => nodes}/icons/template.png (100%) rename packages/node_modules/@node-red/{editor/src => nodes}/icons/timer.png (100%) rename packages/node_modules/@node-red/{editor/src => nodes}/icons/trigger.png (100%) rename packages/node_modules/@node-red/{editor/src => nodes}/icons/twitter.png (100%) rename packages/node_modules/@node-red/{editor/src => nodes}/icons/watch.png (100%) rename packages/node_modules/@node-red/{editor/src => nodes}/icons/white-globe.png (100%) diff --git a/packages/node_modules/@node-red/editor/lib/editor/ui.js b/packages/node_modules/@node-red/editor/lib/editor/ui.js index 3db19d4db..55e880980 100644 --- a/packages/node_modules/@node-red/editor/lib/editor/ui.js +++ b/packages/node_modules/@node-red/editor/lib/editor/ui.js @@ -25,6 +25,7 @@ var theme = require("./theme"); var runtimeAPI; +var defaultNodeIcon = path.resolve(__dirname+"/../../src/images/icons/arrow-in.png") var templateDir = path.resolve(__dirname+"/../../src/templates"); var editorTemplate; @@ -55,10 +56,15 @@ module.exports = { icon: icon } runtimeAPI.nodes.getIcon(opts).then(function(data) { - var contentType = mime.lookup(icon); - res.set("Content-Type", contentType); - res.send(data); + if (data) { + var contentType = mime.lookup(icon); + res.set("Content-Type", contentType); + res.send(data); + } else { + res.sendFile(defaultNodeIcon); + } }).catch(function(err) { + console.log(err.stack); apiUtils.rejectHandler(req,res,err); }) }, diff --git a/packages/node_modules/@node-red/editor/src/icons/arrow-in.png b/packages/node_modules/@node-red/editor/src/images/icons/arrow-in.png similarity index 100% rename from packages/node_modules/@node-red/editor/src/icons/arrow-in.png rename to packages/node_modules/@node-red/editor/src/images/icons/arrow-in.png diff --git a/packages/node_modules/@node-red/editor/src/icons/node-changed.png b/packages/node_modules/@node-red/editor/src/images/icons/node-changed.png similarity index 100% rename from packages/node_modules/@node-red/editor/src/icons/node-changed.png rename to packages/node_modules/@node-red/editor/src/images/icons/node-changed.png diff --git a/packages/node_modules/@node-red/editor/src/icons/node-error.png b/packages/node_modules/@node-red/editor/src/images/icons/node-error.png similarity index 100% rename from packages/node_modules/@node-red/editor/src/icons/node-error.png rename to packages/node_modules/@node-red/editor/src/images/icons/node-error.png diff --git a/packages/node_modules/@node-red/editor/src/js/ui/view.js b/packages/node_modules/@node-red/editor/src/js/ui/view.js index 4688c15cd..a80f7446f 100644 --- a/packages/node_modules/@node-red/editor/src/js/ui/view.js +++ b/packages/node_modules/@node-red/editor/src/js/ui/view.js @@ -2182,8 +2182,8 @@ RED.view = (function() { //node.append("path").attr("class","node_error").attr("d","M 3,-3 l 10,0 l -5,-8 z"); //TODO: these ought to be SVG - node.append("image").attr("class","node_error hidden").attr("xlink:href","icons/node-red/node-error.png").attr("x",0).attr("y",-6).attr("width",10).attr("height",9); - node.append("image").attr("class","node_changed hidden").attr("xlink:href","icons/node-red/node-changed.png").attr("x",12).attr("y",-6).attr("width",10).attr("height",10); + node.append("image").attr("class","node_error hidden").attr("xlink:href","red/images/icons/node-error.png").attr("x",0).attr("y",-6).attr("width",10).attr("height",9); + node.append("image").attr("class","node_changed hidden").attr("xlink:href","red/images/icons/node-changed.png").attr("x",12).attr("y",-6).attr("width",10).attr("height",10); }); node.each(function(d,i) { diff --git a/packages/node_modules/@node-red/editor/src/icons/alert.png b/packages/node_modules/@node-red/nodes/icons/alert.png similarity index 100% rename from packages/node_modules/@node-red/editor/src/icons/alert.png rename to packages/node_modules/@node-red/nodes/icons/alert.png diff --git a/packages/node_modules/@node-red/editor/src/icons/arduino.png b/packages/node_modules/@node-red/nodes/icons/arduino.png similarity index 100% rename from packages/node_modules/@node-red/editor/src/icons/arduino.png rename to packages/node_modules/@node-red/nodes/icons/arduino.png diff --git a/packages/node_modules/@node-red/nodes/icons/arrow-in.png b/packages/node_modules/@node-red/nodes/icons/arrow-in.png new file mode 100644 index 0000000000000000000000000000000000000000..e38f3914600901b736f5fa18786ee11be6d41c28 GIT binary patch literal 393 zcmeAS@N?(olHy`uVBq!ia0vp^B0wz1!3HFCgzU0`6icy_X9x!n)NrJ90QsB+9+AZi z3~X;em{G3O!W1YdS>hT|5}cn_Ql40p%1~Zju9umYU7Va)kgAtols@~NjT8d|Bb%p- zV~9uR+N-+$hZ97Oeyp#Y$RU!&XX#m>@|$agvYL9Jz$O6}72y^gZVi>ZMeaH^t*Q|! zLhVk<0xdko8zYVo#8M-LBBd8b>1kw|i?FO)bWqsy_rwQg27N4y zeX6pqO$_Cex^^A7_NsS@+=bOASA^wN0&GKN(hlAguRU&q- jTBY?`*L>xN+|S&+7B*edvmQhOgN?z{)z4*}Q$iB}+9!`i literal 0 HcmV?d00001 diff --git a/packages/node_modules/@node-red/editor/src/icons/batch.png b/packages/node_modules/@node-red/nodes/icons/batch.png similarity index 100% rename from packages/node_modules/@node-red/editor/src/icons/batch.png rename to packages/node_modules/@node-red/nodes/icons/batch.png diff --git a/packages/node_modules/@node-red/editor/src/icons/bluetooth.png b/packages/node_modules/@node-red/nodes/icons/bluetooth.png similarity index 100% rename from packages/node_modules/@node-red/editor/src/icons/bluetooth.png rename to packages/node_modules/@node-red/nodes/icons/bluetooth.png diff --git a/packages/node_modules/@node-red/editor/src/icons/bridge-dash.png b/packages/node_modules/@node-red/nodes/icons/bridge-dash.png similarity index 100% rename from packages/node_modules/@node-red/editor/src/icons/bridge-dash.png rename to packages/node_modules/@node-red/nodes/icons/bridge-dash.png diff --git a/packages/node_modules/@node-red/editor/src/icons/bridge.png b/packages/node_modules/@node-red/nodes/icons/bridge.png similarity index 100% rename from packages/node_modules/@node-red/editor/src/icons/bridge.png rename to packages/node_modules/@node-red/nodes/icons/bridge.png diff --git a/packages/node_modules/@node-red/editor/src/icons/cog.png b/packages/node_modules/@node-red/nodes/icons/cog.png similarity index 100% rename from packages/node_modules/@node-red/editor/src/icons/cog.png rename to packages/node_modules/@node-red/nodes/icons/cog.png diff --git a/packages/node_modules/@node-red/editor/src/icons/comment.png b/packages/node_modules/@node-red/nodes/icons/comment.png similarity index 100% rename from packages/node_modules/@node-red/editor/src/icons/comment.png rename to packages/node_modules/@node-red/nodes/icons/comment.png diff --git a/packages/node_modules/@node-red/editor/src/icons/db.png b/packages/node_modules/@node-red/nodes/icons/db.png similarity index 100% rename from packages/node_modules/@node-red/editor/src/icons/db.png rename to packages/node_modules/@node-red/nodes/icons/db.png diff --git a/packages/node_modules/@node-red/editor/src/icons/debug.png b/packages/node_modules/@node-red/nodes/icons/debug.png similarity index 100% rename from packages/node_modules/@node-red/editor/src/icons/debug.png rename to packages/node_modules/@node-red/nodes/icons/debug.png diff --git a/packages/node_modules/@node-red/editor/src/icons/envelope.png b/packages/node_modules/@node-red/nodes/icons/envelope.png similarity index 100% rename from packages/node_modules/@node-red/editor/src/icons/envelope.png rename to packages/node_modules/@node-red/nodes/icons/envelope.png diff --git a/packages/node_modules/@node-red/editor/src/icons/feed.png b/packages/node_modules/@node-red/nodes/icons/feed.png similarity index 100% rename from packages/node_modules/@node-red/editor/src/icons/feed.png rename to packages/node_modules/@node-red/nodes/icons/feed.png diff --git a/packages/node_modules/@node-red/editor/src/icons/file-in.png b/packages/node_modules/@node-red/nodes/icons/file-in.png similarity index 100% rename from packages/node_modules/@node-red/editor/src/icons/file-in.png rename to packages/node_modules/@node-red/nodes/icons/file-in.png diff --git a/packages/node_modules/@node-red/editor/src/icons/file-out.png b/packages/node_modules/@node-red/nodes/icons/file-out.png similarity index 100% rename from packages/node_modules/@node-red/editor/src/icons/file-out.png rename to packages/node_modules/@node-red/nodes/icons/file-out.png diff --git a/packages/node_modules/@node-red/editor/src/icons/file.png b/packages/node_modules/@node-red/nodes/icons/file.png similarity index 100% rename from packages/node_modules/@node-red/editor/src/icons/file.png rename to packages/node_modules/@node-red/nodes/icons/file.png diff --git a/packages/node_modules/@node-red/editor/src/icons/function.png b/packages/node_modules/@node-red/nodes/icons/function.png similarity index 100% rename from packages/node_modules/@node-red/editor/src/icons/function.png rename to packages/node_modules/@node-red/nodes/icons/function.png diff --git a/packages/node_modules/@node-red/editor/src/icons/hash.png b/packages/node_modules/@node-red/nodes/icons/hash.png similarity index 100% rename from packages/node_modules/@node-red/editor/src/icons/hash.png rename to packages/node_modules/@node-red/nodes/icons/hash.png diff --git a/packages/node_modules/@node-red/editor/src/icons/inject.png b/packages/node_modules/@node-red/nodes/icons/inject.png similarity index 100% rename from packages/node_modules/@node-red/editor/src/icons/inject.png rename to packages/node_modules/@node-red/nodes/icons/inject.png diff --git a/packages/node_modules/@node-red/editor/src/icons/join.png b/packages/node_modules/@node-red/nodes/icons/join.png similarity index 100% rename from packages/node_modules/@node-red/editor/src/icons/join.png rename to packages/node_modules/@node-red/nodes/icons/join.png diff --git a/packages/node_modules/@node-red/editor/src/icons/leveldb.png b/packages/node_modules/@node-red/nodes/icons/leveldb.png similarity index 100% rename from packages/node_modules/@node-red/editor/src/icons/leveldb.png rename to packages/node_modules/@node-red/nodes/icons/leveldb.png diff --git a/packages/node_modules/@node-red/editor/src/icons/light.png b/packages/node_modules/@node-red/nodes/icons/light.png similarity index 100% rename from packages/node_modules/@node-red/editor/src/icons/light.png rename to packages/node_modules/@node-red/nodes/icons/light.png diff --git a/packages/node_modules/@node-red/editor/src/icons/link-out.png b/packages/node_modules/@node-red/nodes/icons/link-out.png similarity index 100% rename from packages/node_modules/@node-red/editor/src/icons/link-out.png rename to packages/node_modules/@node-red/nodes/icons/link-out.png diff --git a/packages/node_modules/@node-red/editor/src/icons/mongodb.png b/packages/node_modules/@node-red/nodes/icons/mongodb.png similarity index 100% rename from packages/node_modules/@node-red/editor/src/icons/mongodb.png rename to packages/node_modules/@node-red/nodes/icons/mongodb.png diff --git a/packages/node_modules/@node-red/editor/src/icons/mouse.png b/packages/node_modules/@node-red/nodes/icons/mouse.png similarity index 100% rename from packages/node_modules/@node-red/editor/src/icons/mouse.png rename to packages/node_modules/@node-red/nodes/icons/mouse.png diff --git a/packages/node_modules/@node-red/editor/src/icons/parser-csv.png b/packages/node_modules/@node-red/nodes/icons/parser-csv.png similarity index 100% rename from packages/node_modules/@node-red/editor/src/icons/parser-csv.png rename to packages/node_modules/@node-red/nodes/icons/parser-csv.png diff --git a/packages/node_modules/@node-red/editor/src/icons/parser-html.png b/packages/node_modules/@node-red/nodes/icons/parser-html.png similarity index 100% rename from packages/node_modules/@node-red/editor/src/icons/parser-html.png rename to packages/node_modules/@node-red/nodes/icons/parser-html.png diff --git a/packages/node_modules/@node-red/editor/src/icons/parser-json.png b/packages/node_modules/@node-red/nodes/icons/parser-json.png similarity index 100% rename from packages/node_modules/@node-red/editor/src/icons/parser-json.png rename to packages/node_modules/@node-red/nodes/icons/parser-json.png diff --git a/packages/node_modules/@node-red/editor/src/icons/parser-xml.png b/packages/node_modules/@node-red/nodes/icons/parser-xml.png similarity index 100% rename from packages/node_modules/@node-red/editor/src/icons/parser-xml.png rename to packages/node_modules/@node-red/nodes/icons/parser-xml.png diff --git a/packages/node_modules/@node-red/editor/src/icons/parser-yaml.png b/packages/node_modules/@node-red/nodes/icons/parser-yaml.png similarity index 100% rename from packages/node_modules/@node-red/editor/src/icons/parser-yaml.png rename to packages/node_modules/@node-red/nodes/icons/parser-yaml.png diff --git a/packages/node_modules/@node-red/editor/src/icons/range.png b/packages/node_modules/@node-red/nodes/icons/range.png similarity index 100% rename from packages/node_modules/@node-red/editor/src/icons/range.png rename to packages/node_modules/@node-red/nodes/icons/range.png diff --git a/packages/node_modules/@node-red/editor/src/icons/redis.png b/packages/node_modules/@node-red/nodes/icons/redis.png similarity index 100% rename from packages/node_modules/@node-red/editor/src/icons/redis.png rename to packages/node_modules/@node-red/nodes/icons/redis.png diff --git a/packages/node_modules/@node-red/editor/src/icons/rpi.png b/packages/node_modules/@node-red/nodes/icons/rpi.png similarity index 100% rename from packages/node_modules/@node-red/editor/src/icons/rpi.png rename to packages/node_modules/@node-red/nodes/icons/rpi.png diff --git a/packages/node_modules/@node-red/editor/src/icons/serial.png b/packages/node_modules/@node-red/nodes/icons/serial.png similarity index 100% rename from packages/node_modules/@node-red/editor/src/icons/serial.png rename to packages/node_modules/@node-red/nodes/icons/serial.png diff --git a/packages/node_modules/@node-red/editor/src/icons/sort.png b/packages/node_modules/@node-red/nodes/icons/sort.png similarity index 100% rename from packages/node_modules/@node-red/editor/src/icons/sort.png rename to packages/node_modules/@node-red/nodes/icons/sort.png diff --git a/packages/node_modules/@node-red/editor/src/icons/split.png b/packages/node_modules/@node-red/nodes/icons/split.png similarity index 100% rename from packages/node_modules/@node-red/editor/src/icons/split.png rename to packages/node_modules/@node-red/nodes/icons/split.png diff --git a/packages/node_modules/@node-red/editor/src/icons/subflow.png b/packages/node_modules/@node-red/nodes/icons/subflow.png similarity index 100% rename from packages/node_modules/@node-red/editor/src/icons/subflow.png rename to packages/node_modules/@node-red/nodes/icons/subflow.png diff --git a/packages/node_modules/@node-red/editor/src/icons/swap.png b/packages/node_modules/@node-red/nodes/icons/swap.png similarity index 100% rename from packages/node_modules/@node-red/editor/src/icons/swap.png rename to packages/node_modules/@node-red/nodes/icons/swap.png diff --git a/packages/node_modules/@node-red/editor/src/icons/switch.png b/packages/node_modules/@node-red/nodes/icons/switch.png similarity index 100% rename from packages/node_modules/@node-red/editor/src/icons/switch.png rename to packages/node_modules/@node-red/nodes/icons/switch.png diff --git a/packages/node_modules/@node-red/editor/src/icons/template.png b/packages/node_modules/@node-red/nodes/icons/template.png similarity index 100% rename from packages/node_modules/@node-red/editor/src/icons/template.png rename to packages/node_modules/@node-red/nodes/icons/template.png diff --git a/packages/node_modules/@node-red/editor/src/icons/timer.png b/packages/node_modules/@node-red/nodes/icons/timer.png similarity index 100% rename from packages/node_modules/@node-red/editor/src/icons/timer.png rename to packages/node_modules/@node-red/nodes/icons/timer.png diff --git a/packages/node_modules/@node-red/editor/src/icons/trigger.png b/packages/node_modules/@node-red/nodes/icons/trigger.png similarity index 100% rename from packages/node_modules/@node-red/editor/src/icons/trigger.png rename to packages/node_modules/@node-red/nodes/icons/trigger.png diff --git a/packages/node_modules/@node-red/editor/src/icons/twitter.png b/packages/node_modules/@node-red/nodes/icons/twitter.png similarity index 100% rename from packages/node_modules/@node-red/editor/src/icons/twitter.png rename to packages/node_modules/@node-red/nodes/icons/twitter.png diff --git a/packages/node_modules/@node-red/editor/src/icons/watch.png b/packages/node_modules/@node-red/nodes/icons/watch.png similarity index 100% rename from packages/node_modules/@node-red/editor/src/icons/watch.png rename to packages/node_modules/@node-red/nodes/icons/watch.png diff --git a/packages/node_modules/@node-red/editor/src/icons/white-globe.png b/packages/node_modules/@node-red/nodes/icons/white-globe.png similarity index 100% rename from packages/node_modules/@node-red/editor/src/icons/white-globe.png rename to packages/node_modules/@node-red/nodes/icons/white-globe.png diff --git a/packages/node_modules/@node-red/registry/localfilesystem.js b/packages/node_modules/@node-red/registry/localfilesystem.js index 17c437058..4ea06839f 100644 --- a/packages/node_modules/@node-red/registry/localfilesystem.js +++ b/packages/node_modules/@node-red/registry/localfilesystem.js @@ -241,14 +241,12 @@ function getNodeFiles(disableNodePathScan) { var nodeFiles = []; var results; - var dir = path.resolve(__dirname + '/../../public/icons'); - var iconList = [{path:dir,icons:scanIconDir(dir)}]; - + var dir; + var iconList = []; if (settings.coreNodesDir) { results = getLocalNodeFiles(path.resolve(settings.coreNodesDir)); nodeFiles = nodeFiles.concat(results.files); iconList = iconList.concat(results.icons); - var defaultLocalesPath = path.join(settings.coreNodesDir,"core","locales"); i18n.registerMessageCatalog("node-red",defaultLocalesPath,"messages.json"); } diff --git a/packages/node_modules/@node-red/registry/registry.js b/packages/node_modules/@node-red/registry/registry.js index 91e6874b1..467037693 100644 --- a/packages/node_modules/@node-red/registry/registry.js +++ b/packages/node_modules/@node-red/registry/registry.js @@ -555,11 +555,8 @@ function setModulePendingUpdated(module,version) { }); } -var icon_paths = { - "node-red":[path.resolve(__dirname + '/../editor/public/icons')] -}; +var icon_paths = { }; var iconCache = {}; -var defaultIcon = path.join(icon_paths['node-red'][0],'arrow-in.png'); function getNodeIconPath(module,icon) { if (/\.\./.test(icon)) { @@ -585,8 +582,7 @@ function getNodeIconPath(module,icon) { if (module !== "node-red") { return getNodeIconPath("node-red", icon); } - - return defaultIcon; + return null; } } diff --git a/packages/node_modules/@node-red/runtime/api/nodes.js b/packages/node_modules/@node-red/runtime/api/nodes.js index 3ebba1a19..4afe03885 100644 --- a/packages/node_modules/@node-red/runtime/api/nodes.js +++ b/packages/node_modules/@node-red/runtime/api/nodes.js @@ -420,19 +420,23 @@ var api = module.exports = { * @param {User} opts.user - the user calling the api * @param {String} opts.module - the id of the module requesting the icon * @param {String} opts.icon - the name of the icon - * @return {Promise} - the icon file as a Buffer + * @return {Promise} - the icon file as a Buffer or null if no icon available * @memberof RED.nodes */ getIcon: function(opts) { return new Promise(function(resolve,reject) { var iconPath = runtime.nodes.getNodeIconPath(opts.module,opts.icon); - fs.readFile(iconPath,function(err,data) { - if (err) { - err.status = 400; - return reject(err); - } - return resolve(data) - }); + if (iconPath) { + fs.readFile(iconPath,function(err,data) { + if (err) { + err.status = 400; + return reject(err); + } + return resolve(data) + }); + } else { + resolve(null); + } }); } } diff --git a/packages/node_modules/@node-red/runtime/nodes/context/localfilesystem.js b/packages/node_modules/@node-red/runtime/nodes/context/localfilesystem.js index ff9f11d8e..64d0dc0d2 100644 --- a/packages/node_modules/@node-red/runtime/nodes/context/localfilesystem.js +++ b/packages/node_modules/@node-red/runtime/nodes/context/localfilesystem.js @@ -47,8 +47,8 @@ var fs = require('fs-extra'); var path = require("path"); -var util = require("../../util"); -var log = require("../../log"); +var util = require("@node-red/util").util; +var log = require("@node-red/util").log; var safeJSONStringify = require("json-stringify-safe"); var MemoryStore = require("./memory"); diff --git a/packages/node_modules/node-red/red/red.js b/packages/node_modules/node-red/red/red.js index 2a4104527..b239de47a 100644 --- a/packages/node_modules/node-red/red/red.js +++ b/packages/node_modules/node-red/red/red.js @@ -70,7 +70,7 @@ module.exports = { redUtil.init(userSettings); if (userSettings.httpAdminRoot !== false) { runtime.init(userSettings,redUtil,api); - api.init(httpServer,userSettings,runtime.storage,runtime); + api.init(httpServer,userSettings,runtime._.storage,runtime); apiEnabled = true; server = runtime._.adminApi.server;