frodovdr/node-red
1
0
Fork 0
mirror of https://github.com/node-red/node-red.git synced 2023-10-10 13:36:53 +02:00
Code Issues Releases Wiki Activity

Sort quick-add types and add most-recent used type section

Browse Source
This commit is contained in:
Nick O'Leary 2016-11-22 22:57:05 +00:00
parent 95b2675f03
commit fa9a7e725b
2 changed files with 107 additions and 56 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

140
editor/js/ui/typeSearch.js
View File

@ -13,6 +13,8 @@ RED.typeSearch = (function() {
var activeFilter = ""; var activeFilter = "";
var addCallback; var addCallback;
var typesUsed = {};
function search(val) { function search(val) {
activeFilter = val.toLowerCase(); activeFilter = val.toLowerCase();
var visible = searchResults.editableList('filter'); var visible = searchResults.editableList('filter');
@ -93,12 +95,17 @@ RED.typeSearch = (function() {
if (activeFilter === "" ) { if (activeFilter === "" ) {
return true; return true;
} }
if (data.recent) {
return false;
}
return (activeFilter==="")||(data.index.indexOf(activeFilter) > -1); return (activeFilter==="")||(data.index.indexOf(activeFilter) > -1);
}, },
addItem: function(container,i,object) { addItem: function(container,i,object) {
var def = object.def; var def = object.def;
object.index = object.type.toLowerCase(); object.index = object.type.toLowerCase();
if (object.separator) {
container.addClass("red-ui-search-result-separator")
}
var div = $('<a>',{href:'#',class:"red-ui-search-result"}).appendTo(container); var div = $('<a>',{href:'#',class:"red-ui-search-result"}).appendTo(container);
var nodeDiv = $('<div>',{class:"red-ui-search-result-node"}).appendTo(div); var nodeDiv = $('<div>',{class:"red-ui-search-result-node"}).appendTo(div);
@ -118,19 +125,17 @@ RED.typeSearch = (function() {
var iconContainer = $('<div/>',{class:"palette_icon_container"}).appendTo(nodeDiv); var iconContainer = $('<div/>',{class:"palette_icon_container"}).appendTo(nodeDiv);
$('<div/>',{class:"palette_icon",style:"background-image: url(icons/"+icon_url+")"}).appendTo(iconContainer); $('<div/>',{class:"palette_icon",style:"background-image: url(icons/"+icon_url+")"}).appendTo(iconContainer);
var contentDiv = $('<div>',{class:"red-ui-search-result-description"}).appendTo(div); if (def.inputs > 0) {
$('<div/>',{class:"red-ui-search-result-node-port"}).appendTo(nodeDiv);
var label = object.type; }
if (typeof def.paletteLabel !== "undefined") { if (def.outputs > 0) {
try { $('<div/>',{class:"red-ui-search-result-node-port red-ui-search-result-node-output"}).appendTo(nodeDiv);
label = (typeof def.paletteLabel === "function" ? def.paletteLabel.call(def) : def.paletteLabel)||"";
label += " ("+object.type+")";
object.index += "|"+label.toLowerCase();
} catch(err) {
console.log("Definition error: "+object.type+".paletteLabel",err);
}
} }
var contentDiv = $('<div>',{class:"red-ui-search-result-description"}).appendTo(div);
var label = object.label;
object.index += "|"+label.toLowerCase();
$('<div>',{class:"red-ui-search-result-node-label"}).html(label).appendTo(contentDiv); $('<div>',{class:"red-ui-search-result-node-label"}).html(label).appendTo(contentDiv);
@ -145,6 +150,7 @@ RED.typeSearch = (function() {
} }
function confirm(def) { function confirm(def) {
hide(); hide();
typesUsed[def.type] = Date.now();
addCallback(def.type); addCallback(def.type);
} }
@ -205,41 +211,83 @@ RED.typeSearch = (function() {
$(document).off('click.type-search'); $(document).off('click.type-search');
} }
} }
function getTypeLabel(type, def) {
var label = type;
if (typeof def.paletteLabel !== "undefined") {
try {
label = (typeof def.paletteLabel === "function" ? def.paletteLabel.call(def) : def.paletteLabel)||"";
label += " ("+type+")";
} catch(err) {
console.log("Definition error: "+type+".paletteLabel",err);
}
}
return label;
}
function refreshTypeList() { function refreshTypeList() {
var i;
searchResults.editableList('empty'); searchResults.editableList('empty');
searchInput.searchBox('value',''); searchInput.searchBox('value','');
selected = -1; selected = -1;
var common = { var common = [
"debug" : false, 'debug','inject','function','change','switch'
"inject" : false, ];
"function": false
}; var recentlyUsed = Object.keys(typesUsed);
var nodeTypes = RED.nodes.registry.getNodeTypes().filter(function(n) { recentlyUsed.sort(function(a,b) {
if (common.hasOwnProperty(n)) { return typesUsed[b]-typesUsed[a];
common[n] = true; });
return false; recentlyUsed = recentlyUsed.filter(function(t) {
} return common.indexOf(t) === -1;
return true;
}); });
// Just in case a core node has been disabled
if (common["function"]) {
nodeTypes.unshift("function");
}
if (common["inject"]) {
nodeTypes.unshift("inject");
}
if (common["debug"]) {
nodeTypes.unshift("debug");
}
var items = [];
var i; RED.nodes.registry.getNodeTypes().forEach(function(t) {
for (i=0;i<nodeTypes.length;i++) {
var t = nodeTypes[i];
var def = RED.nodes.getType(t); var def = RED.nodes.getType(t);
if (def.category !== 'config' && t !== 'unknown') { if (def.category !== 'config' && t !== 'unknown') {
searchResults.editableList('addItem',{type:t,def: def}) items.push({type:t,def: def, label:getTypeLabel(t,def)});
} }
});
items.sort(function(a,b) {
var al = a.label.toLowerCase();
var bl = b.label.toLowerCase();
if (al < bl) {
return -1;
} else if (al === bl) {
return 0;
} else {
return 1;
}
})
var commonCount = 0;
var item;
for(i=0;i<common.length;i++) {
item = {
type: common[i],
def: RED.nodes.getType(common[i])
};
item.label = getTypeLabel(item.type,item.def);
if (i === common.length-1) {
item.separator = true;
}
searchResults.editableList('addItem', item);
}
for(i=0;i<Math.min(5,recentlyUsed.length);i++) {
item = {
type:recentlyUsed[i],
def: RED.nodes.getType(recentlyUsed[i]),
recent: true
};
item.label = getTypeLabel(item.type,item.def);
if (i === recentlyUsed.length-1) {
item.separator = true;
}
searchResults.editableList('addItem', item);
}
for (i=0;i<items.length;i++) {
searchResults.editableList('addItem', items[i]);
} }
setTimeout(function() { setTimeout(function() {
selected = 0; selected = 0;
@ -247,23 +295,7 @@ RED.typeSearch = (function() {
},100); },100);
} }
function init() {
// RED.keyboard.add("*",/* . */ 190,{ctrl:true},function(){if (!disabled) { show(); } d3.event.preventDefault();});
// RED.events.on("editor:open",function() { disabled = true; });
// RED.events.on("editor:close",function() { disabled = false; });
// RED.events.on("palette-editor:open",function() { disabled = true; });
// RED.events.on("palette-editor:close",function() { disabled = false; });
//
//
//
// $("#header-shade").on('mousedown',hide);
// $("#editor-shade").on('mousedown',hide);
// $("#palette-shade").on('mousedown',hide);
// $("#sidebar-shade").on('mousedown',hide);
}
return { return {
init: init,
show: show, show: show,
hide: hide hide: hide
}; };

23
editor/sass/search.scss
View File

@ -60,12 +60,31 @@
.red-ui-search-result { .red-ui-search-result {
padding: 2px 2px 2px 5px; padding: 2px 2px 2px 5px;
font-size: 13px; font-size: 13px;
border-left-width: 2px; border-left-width: 3px;
border-right-width: 2px; border-right-width: 3px;
}
.red-ui-search-result-separator {
border-bottom: 3px solid #ddd;
} }
.red-ui-search-result-node { .red-ui-search-result-node {
position: relative;
width: 18px; width: 18px;
height: 15px; height: 15px;
margin-top: 1px;
}
.red-ui-search-result-node-port {
position: absolute;
border-radius: 2px;
border: 1px solid #999;
width: 6px;
height: 7px;
top:4px;
left:-4px;
background: #eee;
box-sizing: border-box;
}
.red-ui-search-result-node-output{
left: 16px;
} }
.palette_icon_container { .palette_icon_container {
width: 18px; width: 18px;