installed mathjs library locally and replaced eval

Osterie · Jan 23, 2023 · bd51013 · bd51013
1 parent 3f5a5de
commit bd51013
Show file tree

Hide file tree

Showing 2,726 changed files with 198,725 additions and 6 deletions.
diff --git a/color_function/index.html b/color_function/index.html
@@ -7,8 +7,6 @@
 	<title>Grafisk fremstilling av temperaturer</title>
 	<link rel="stylesheet" type="text/css" href="style.css" />
 
-	<script src=https://cdnjs.cloudflare.com/ajax/libs/mathjs/3.3.0/math.min.js></script>
-
 </head>
 
 <body>
@@ -32,6 +30,10 @@
 		<canvas id="canvas" width="600px" height="600px"> </canvas> <br>
 	</center>
 
+
+	<!-- <script src="https://cdnjs.cloudflare.com/ajax/libs/mathjs/3.3.0/math.min.js"></script> -->
+
+	<script src="./library/node_modules/mathjs/lib/browser/math.js"></script>
 	<script src="./library/functions.js"></script> <!-- Can convert vectors to angles (degress or radians) -->
 	<script src="./library/classdefinitions.js"></script>
 	<!-- <script src="worker.js"></script> -->

diff --git a/color_function/library/classdefinitions.js b/color_function/library/classdefinitions.js
@@ -13,7 +13,7 @@ class Square {
   draw() {
     switch (true) {
       case isFinite(this.hue):
-        this.color = `hsl( ${this.hue} , ${this.saturation}% , ${this.lightness}%)`;
+        this.color = `hsl( ${this.hue}, ${this.saturation}%, ${this.lightness}%)`;
         this.ctx.fillStyle = this.color;
         this.ctx.fillRect(this.xpos, this.ypos, this.square_size, this.square_size);
         break;
@@ -27,15 +27,16 @@ class Square {
   }
 
   hue_changed(expression, x, y) {
-    this.hue = Function( `return ${expression.replace(/X/g, x).replace(/Y/g, y)}` )();
+
+    this.hue =  math.evaluate(expression.replace(/X/g, x).replace(/Y/g, y));
     this.draw();
   }
   saturation_changed(expression, x, y) {
-    this.saturation = Math.abs( ((100 + Function(`return ${expression.replace(/X/g, x).replace(/Y/g, y)}`)()) % 200) - 100 );
+    this.saturation = Math.abs( ((100 +  math.evaluate(expression.replace(/X/g, x).replace(/Y/g, y))) % 200) - 100 );
     this.draw();
   }
   lightness_changed(expression, x, y) {
-    this.lightness = Math.abs( ((100 + Function(`return ${expression.replace(/X/g, x).replace(/Y/g, y)}`)()) % 200) - 100 );
+    this.lightness = Math.abs( ((100 + math.evaluate(expression.replace(/X/g, x).replace(/Y/g, y))) % 200) - 100 );
     this.draw();
   }
 }

diff --git a/color_function/library/node_modules/.bin/mathjs b/color_function/library/node_modules/.bin/mathjs
diff --git a/color_function/library/node_modules/.bin/mathjs.cmd b/color_function/library/node_modules/.bin/mathjs.cmd
diff --git a/color_function/library/node_modules/.bin/mathjs.ps1 b/color_function/library/node_modules/.bin/mathjs.ps1
diff --git a/color_function/library/node_modules/.package-lock.json b/color_function/library/node_modules/.package-lock.json
diff --git a/color_function/library/node_modules/@babel/runtime/LICENSE b/color_function/library/node_modules/@babel/runtime/LICENSE
diff --git a/color_function/library/node_modules/@babel/runtime/README.md b/color_function/library/node_modules/@babel/runtime/README.md
diff --git a/color_function/library/node_modules/@babel/runtime/helpers/AsyncGenerator.js b/color_function/library/node_modules/@babel/runtime/helpers/AsyncGenerator.js
diff --git a/color_function/library/node_modules/@babel/runtime/helpers/AwaitValue.js b/color_function/library/node_modules/@babel/runtime/helpers/AwaitValue.js
diff --git a/color_function/library/node_modules/@babel/runtime/helpers/OverloadYield.js b/color_function/library/node_modules/@babel/runtime/helpers/OverloadYield.js
diff --git a/color_function/library/node_modules/@babel/runtime/helpers/applyDecoratedDescriptor.js b/color_function/library/node_modules/@babel/runtime/helpers/applyDecoratedDescriptor.js