frodovdr
/
node-red
mirror of https://github.com/node-red/node-red.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge branch 'dev' into pr_2076

This commit is contained in:
Nick O'Leary 2019-03-05 14:37:33 +00:00
parent b011b9203b 39344fcae5
commit 781b3aff1b
No known key found for this signature in database
GPG Key ID: 4F2157149161A6C9
4 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
packages/node_modules/@node-red/editor-client/src/js/ui/library.js vendored Normal file → Executable file
View File

@ -44,7 +44,7 @@ RED.library = (function() {
li.className = "dropdown-submenu pull-left"; li.className = "dropdown-submenu pull-left";
a = document.createElement("a"); a = document.createElement("a");
a.href="#"; a.href="#";
var label = i.replace(/^@.*\//,"").replace(/^node-red-contrib-/,"").replace(/^node-red-node-/,"").replace(/-/," ").replace(/_/," "); var label = i.replace(/^@.*\//,"").replace(/^node-red-contrib-/,"").replace(/^node-red-node-/,"").replace(/-/g," ").replace(/_/g," ");
a.innerText = label; a.innerText = label;
li.appendChild(a); li.appendChild(a);
li.appendChild(buildMenu(data.d[i],root+(root!==""?"/":"")+i)); li.appendChild(buildMenu(data.d[i],root+(root!==""?"/":"")+i));

1
packages/node_modules/@node-red/editor-client/src/sass/tabs.scss vendored
View File

@ -111,6 +111,7 @@
font-weight: bold; font-weight: bold;
.red-ui-tabs-badge-selected { .red-ui-tabs-badge-selected {
display: inline; display: inline;
background: white;
} }
.red-ui-tabs-badge-changed { .red-ui-tabs-badge-changed {
display: none; display: none;

4
packages/node_modules/@node-red/registry/lib/loader.js vendored
View File

@ -34,14 +34,14 @@ function init(_runtime) {
registryUtil.init(runtime); registryUtil.init(runtime);
} }
function load(defaultNodesDir,disableNodePathScan) { function load(disableNodePathScan) {
// To skip node scan, the following line will use the stored node list. // To skip node scan, the following line will use the stored node list.
// We should expose that as an option at some point, although the // We should expose that as an option at some point, although the
// performance gains are minimal. // performance gains are minimal.
//return loadNodeFiles(registry.getModuleList()); //return loadNodeFiles(registry.getModuleList());
runtime.log.info(runtime.log._("server.loading")); runtime.log.info(runtime.log._("server.loading"));
var nodeFiles = localfilesystem.getNodeFiles(defaultNodesDir,disableNodePathScan); var nodeFiles = localfilesystem.getNodeFiles(disableNodePathScan);
return loadNodeFiles(nodeFiles); return loadNodeFiles(nodeFiles);
} }

7
test/unit/@node-red/registry/lib/loader_spec.js
View File

@ -50,10 +50,9 @@ describe("red/nodes/registry/loader",function() {
stubs.push(sinon.stub(localfilesystem,"getNodeFiles", function(){ return {};})); stubs.push(sinon.stub(localfilesystem,"getNodeFiles", function(){ return {};}));
stubs.push(sinon.stub(registry,"saveNodeList", function(){ return {};})); stubs.push(sinon.stub(registry,"saveNodeList", function(){ return {};}));
loader.init({nodes:nodes,log:{info:function(){},_:function(){}},settings:{available:function(){return false;}}}); loader.init({nodes:nodes,log:{info:function(){},_:function(){}},settings:{available:function(){return false;}}});
loader.load("foo",true).then(function() { loader.load(true).then(function() {
localfilesystem.getNodeFiles.called.should.be.true(); localfilesystem.getNodeFiles.called.should.be.true();
localfilesystem.getNodeFiles.lastCall.args[0].should.eql('foo'); localfilesystem.getNodeFiles.lastCall.args[0].should.be.true();
localfilesystem.getNodeFiles.lastCall.args[1].should.be.true();
registry.saveNodeList.called.should.be.false(); registry.saveNodeList.called.should.be.false();
done(); done();
}) })
@ -62,7 +61,7 @@ describe("red/nodes/registry/loader",function() {
stubs.push(sinon.stub(localfilesystem,"getNodeFiles", function(){ return {};})); stubs.push(sinon.stub(localfilesystem,"getNodeFiles", function(){ return {};}));
stubs.push(sinon.stub(registry,"saveNodeList", function(){ return {};})); stubs.push(sinon.stub(registry,"saveNodeList", function(){ return {};}));
loader.init({nodes:nodes,log:{info:function(){},_:function(){}},settings:{available:function(){return true;}}}); loader.init({nodes:nodes,log:{info:function(){},_:function(){}},settings:{available:function(){return true;}}});
loader.load("foo",true).then(function() { loader.load(true).then(function() {
registry.saveNodeList.called.should.be.true(); registry.saveNodeList.called.should.be.true();
done(); done();
}).catch(function(err) { }).catch(function(err) {