jschaufuss/DiceCloud
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Added if function

Browse Source
This commit is contained in:
Thaum Rystra
2020-05-13 10:42:20 +02:00
parent 9069ee8e35
commit 97fcb76454
6 changed files with 19 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
app/client/main.js
View File

@@ -1,2 +1,3 @@
import "/imports/ui/vueSetup.js"; import '/imports/ui/vueSetup.js';
import "/imports/ui/styles/stylesIndex.js"; import '/imports/ui/styles/stylesIndex.js';
import '/imports/ui/styles/stylesIndex.js';

2
app/imports/api/creature/computation/afterComputation/evaluateString.js
View File

@@ -1,4 +1,4 @@
import * as math from 'mathjs'; import math from '/imports/math.js';
import replaceBareSymbolsWithValueAccessor from '/imports/api/creature/computation/utility/replaceBareSymbolsWithValueAccessor.js'; import replaceBareSymbolsWithValueAccessor from '/imports/api/creature/computation/utility/replaceBareSymbolsWithValueAccessor.js';
export default function evaluateString(string, scope){ export default function evaluateString(string, scope){

2
app/imports/api/creature/computation/evaluateCalculation.js
View File

@@ -1,6 +1,6 @@
import replaceBareSymbolsWithValueAccessor from '/imports/api/creature/computation/utility/replaceBareSymbolsWithValueAccessor.js'; import replaceBareSymbolsWithValueAccessor from '/imports/api/creature/computation/utility/replaceBareSymbolsWithValueAccessor.js';
import computeStat from '/imports/api/creature/computation/computeStat.js'; import computeStat from '/imports/api/creature/computation/computeStat.js';
import * as math from 'mathjs'; import math from '/imports/math.js';
export default function evaluateCalculation(string, memo){ export default function evaluateCalculation(string, memo){
if (!string) return string; if (!string) return string;

2
app/imports/api/creature/computation/utility/replaceBareSymbolsWithValueAccessor.js
View File

@@ -1,4 +1,4 @@
import * as math from 'mathjs'; import math from '/imports/math.js';
export default function replaceBareSymbolsWithValueAccessor(node, path) { export default function replaceBareSymbolsWithValueAccessor(node, path) {
if (node.isFunctionNode){ if (node.isFunctionNode){

9
app/imports/math.js Normal file
View File

@@ -0,0 +1,9 @@
import { create, all } from 'mathjs';
const math = create(all);
math.import({
'if': function(pred, a, b) {
return pred ? a : b;
}
});
export default math;

8
app/server/main.js
View File

@@ -1,4 +1,4 @@
import "/imports/server/publications/index.js"; import '/imports/server/publications/index.js';
import "/imports/api/parenting/deleteRemovedDocuments.js"; import '/imports/api/parenting/deleteRemovedDocuments.js';
import "/imports/server/config/simpleSchemaDebug.js"; import '/imports/server/config/simpleSchemaDebug.js';
import "/imports/api/parenting/organizeMethods.js"; import '/imports/api/parenting/organizeMethods.js';