Spring/spring-flo
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Groups order

Browse Source 
Groups order

Groups order
This commit is contained in:
BoykoAlex
2017-03-23 13:12:35 -04:00
parent e64a774067
commit 0b2f3d05c4
3 changed files with 79 additions and 107 deletions
Download Patch File Download Diff File Expand all files Collapse all files

92
dist/spring-flo.js vendored
View File

@@ -27001,60 +27001,46 @@ define('controllers/palette',['require','jquery','joint','common/shapes-factory'
// The field closedGroups tells us which should not be shown
// Work out the list of active groups/nodes based on the filter text
Object.keys(metamodel).sort(function(g1, g2) {
var order = ['source', 'processor', 'sink', 'other', 'job'];
var idx1 = order.indexOf(g1);
var idx2 = order.indexOf(g2);
if (idx1 === -1) {
if (idx2 === -1) {
return g1.localeCompare(g2);
} else {
return 1;
}
} else {
if (idx2 === -1) {
return -1;
} else {
return idx1 - idx2;
}
var groups = metamodelService.groups && angular.isFunction(metamodelService.groups) ? metamodelService.groups() : Object.keys(metamodel);
groups.forEach(function(group) {
if (metamodel[group]) {
Object.keys(metamodel[group]).sort().forEach(function(name) {
var node = metamodel[group][name];
var nodeActive = !node.noPaletteEntry;
if (nodeActive && filterText) {
nodeActive = false;
if (name.toLowerCase().indexOf(filterText) !== -1) {
nodeActive = true;
}
else if (group.toLowerCase().indexOf(filterText) !== -1) {
nodeActive = true;
}
else if (node.description && node.description.toLowerCase().indexOf(filterText) !== -1) {
nodeActive = true;
}
else if (node.properties) {
Object.keys(node.properties).sort().forEach(function(propertyName) {
if (propertyName.toLowerCase().indexOf(filterText) !== -1 ||
(node.properties[propertyName].description &&
node.properties[propertyName].description.toLowerCase().indexOf(filterText) !== -1)) {
nodeActive=true;
}
});
}
}
if (nodeActive) {
if (!groupAdded[group]) {
var header = createPaletteGroup(group, !_.contains(closedGroups,group));
header.set('size', {width: parentWidth, height: 30});
paletteNodes.push(header);
groupAdded[group] = true;
}
if (!_.contains(closedGroups,group)) {
paletteNodes.push(createPaletteEntry(name, node));
}
}
});
}
}).forEach(function(group) {
Object.keys(metamodel[group]).sort().forEach(function(name) {
var node = metamodel[group][name];
var nodeActive = !node.noPaletteEntry;
if (nodeActive && filterText) {
nodeActive = false;
if (name.toLowerCase().indexOf(filterText) !== -1) {
nodeActive = true;
}
else if (group.toLowerCase().indexOf(filterText) !== -1) {
nodeActive = true;
}
else if (node.description && node.description.toLowerCase().indexOf(filterText) !== -1) {
nodeActive = true;
}
else if (node.properties) {
Object.keys(node.properties).sort().forEach(function(propertyName) {
if (propertyName.toLowerCase().indexOf(filterText) !== -1 ||
(node.properties[propertyName].description &&
node.properties[propertyName].description.toLowerCase().indexOf(filterText) !== -1)) {
nodeActive=true;
}
});
}
}
if (nodeActive) {
if (!groupAdded[group]) {
var header = createPaletteGroup(group, !_.contains(closedGroups,group));
header.set('size', {width: parentWidth, height: 30});
paletteNodes.push(header);
groupAdded[group] = true;
}
if (!_.contains(closedGroups,group)) {
paletteNodes.push(createPaletteEntry(name, node));
}
}
});
});
var cellWidth = 0, cellHeight = 0;

2
dist/spring-flo.min.js vendored
View File

File diff suppressed because one or more lines are too long

92
src/controllers/palette.js
View File

@@ -267,60 +267,46 @@ define(function(require) {
// The field closedGroups tells us which should not be shown
// Work out the list of active groups/nodes based on the filter text
Object.keys(metamodel).sort(function(g1, g2) {
var order = ['source', 'processor', 'sink', 'other', 'job'];
var idx1 = order.indexOf(g1);
var idx2 = order.indexOf(g2);
if (idx1 === -1) {
if (idx2 === -1) {
return g1.localeCompare(g2);
} else {
return 1;
}
} else {
if (idx2 === -1) {
return -1;
} else {
return idx1 - idx2;
}
var groups = metamodelService.groups && angular.isFunction(metamodelService.groups) ? metamodelService.groups() : Object.keys(metamodel);
groups.forEach(function(group) {
if (metamodel[group]) {
Object.keys(metamodel[group]).sort().forEach(function(name) {
var node = metamodel[group][name];
var nodeActive = !node.noPaletteEntry;
if (nodeActive && filterText) {
nodeActive = false;
if (name.toLowerCase().indexOf(filterText) !== -1) {
nodeActive = true;
}
else if (group.toLowerCase().indexOf(filterText) !== -1) {
nodeActive = true;
}
else if (node.description && node.description.toLowerCase().indexOf(filterText) !== -1) {
nodeActive = true;
}
else if (node.properties) {
Object.keys(node.properties).sort().forEach(function(propertyName) {
if (propertyName.toLowerCase().indexOf(filterText) !== -1 ||
(node.properties[propertyName].description &&
node.properties[propertyName].description.toLowerCase().indexOf(filterText) !== -1)) {
nodeActive=true;
}
});
}
}
if (nodeActive) {
if (!groupAdded[group]) {
var header = createPaletteGroup(group, !_.contains(closedGroups,group));
header.set('size', {width: parentWidth, height: 30});
paletteNodes.push(header);
groupAdded[group] = true;
}
if (!_.contains(closedGroups,group)) {
paletteNodes.push(createPaletteEntry(name, node));
}
}
});
}
}).forEach(function(group) {
Object.keys(metamodel[group]).sort().forEach(function(name) {
var node = metamodel[group][name];
var nodeActive = !node.noPaletteEntry;
if (nodeActive && filterText) {
nodeActive = false;
if (name.toLowerCase().indexOf(filterText) !== -1) {
nodeActive = true;
}
else if (group.toLowerCase().indexOf(filterText) !== -1) {
nodeActive = true;
}
else if (node.description && node.description.toLowerCase().indexOf(filterText) !== -1) {
nodeActive = true;
}
else if (node.properties) {
Object.keys(node.properties).sort().forEach(function(propertyName) {
if (propertyName.toLowerCase().indexOf(filterText) !== -1 ||
(node.properties[propertyName].description &&
node.properties[propertyName].description.toLowerCase().indexOf(filterText) !== -1)) {
nodeActive=true;
}
});
}
}
if (nodeActive) {
if (!groupAdded[group]) {
var header = createPaletteGroup(group, !_.contains(closedGroups,group));
header.set('size', {width: parentWidth, height: 30});
paletteNodes.push(header);
groupAdded[group] = true;
}
if (!_.contains(closedGroups,group)) {
paletteNodes.push(createPaletteEntry(name, node));
}
}
});
});
var cellWidth = 0, cellHeight = 0;