dave/pathfinder
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

- fixed a bug where "empty" <select> option was missing for some signatures "type" selects

Browse Source
This commit is contained in:
Mark Friedrich
2018-08-09 20:03:14 +02:00
parent 1c15b573b9
commit f0f6d6d676
2 changed files with 18 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
js/app/ui/system_signature.js
View File

@@ -1487,7 +1487,7 @@ define([
// cached signatures do not include static WHs!
// -> ".slice(0)" creates copy
newSelectOptions = sigNameCache[cacheKey].slice(0);
newSelectOptionsCount = sumSignaturesRecursive('children', newSelectOptions);
newSelectOptionsCount = getOptionsCount('children', newSelectOptions);
}else{
// get new Options ----------
// get all possible "static" signature names by the selected groupId
@@ -1602,7 +1602,7 @@ define([
};
/**
* recursive sum array.length for a given object key
* sum up all options in nested (or not nested) object of objects
* -> e.g.
* {
* first: {
@@ -1614,23 +1614,20 @@ define([
* test = { ... }
* }
* }
* -> sumSignaturesRecursive('count', obj) => 5;
* -> getOptionsCount('count', obj) => 5;
* @param key
* @param obj
* @returns {number}
*/
let sumSignaturesRecursive = (key, obj) => {
let getOptionsCount = (key, obj) => {
let sum = 0;
for (let prop in obj) {
if (obj.hasOwnProperty(prop) && key === prop) {
sum += obj[prop].length;
}
else if (Object.prototype.toString.call(obj[prop]) === '[object Object]') {
sum += sumSignaturesRecursive(key, obj[prop]);
for(let entry of obj){
if(entry.hasOwnProperty(key)){
sum += entry[key].length;
}else{
sum++;
}
}
return sum;
};

21
public/js/v1.4.1/app/ui/system_signature.js
View File

@@ -1487,7 +1487,7 @@ define([
// cached signatures do not include static WHs!
// -> ".slice(0)" creates copy
newSelectOptions = sigNameCache[cacheKey].slice(0);
newSelectOptionsCount = sumSignaturesRecursive('children', newSelectOptions);
newSelectOptionsCount = getOptionsCount('children', newSelectOptions);
}else{
// get new Options ----------
// get all possible "static" signature names by the selected groupId
@@ -1602,7 +1602,7 @@ define([
};
/**
* recursive sum array.length for a given object key
* sum up all options in nested (or not nested) object of objects
* -> e.g.
* {
* first: {
@@ -1614,23 +1614,20 @@ define([
* test = { ... }
* }
* }
* -> sumSignaturesRecursive('count', obj) => 5;
* -> getOptionsCount('count', obj) => 5;
* @param key
* @param obj
* @returns {number}
*/
let sumSignaturesRecursive = (key, obj) => {
let getOptionsCount = (key, obj) => {
let sum = 0;
for (let prop in obj) {
if (obj.hasOwnProperty(prop) && key === prop) {
sum += obj[prop].length;
}
else if (Object.prototype.toString.call(obj[prop]) === '[object Object]') {
sum += sumSignaturesRecursive(key, obj[prop]);
for(let entry of obj){
if(entry.hasOwnProperty(key)){
sum += entry[key].length;
}else{
sum++;
}
}
return sum;
};