push the latest changes to the temp branch

e-tinkers · Oct 28, 2021 · 3daa7d3 · 3daa7d3
1 parent 832ff99
commit 3daa7d3
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 10 deletions.
diff --git a/dist/gauge.min.js b/dist/gauge.min.js
diff --git a/example.js b/example.js
@@ -5,17 +5,15 @@
 */
 document.addEventListener('DOMContentLoaded', () => {
 
-  // create an Gauge instance with default construct, and set configuration later
-  const powerGauge = new Gauge();
-  powerGuage.setConfig({
+  const powerGauge = new Gauge({
     minValue: 5,
     maxValue: 300000,
     lowThreshhold: 300,
     highThreshhold: 2000,
     scale: 'log',
     displayUnit: 'Log10(x)'
   });
-  // create an Guage instance with pass-in configuration object
+
   const powerGauge2 = new Gauge({
     minValue: 10,
     maxValue: 60,

diff --git a/source/gauge.js b/source/gauge.js
@@ -28,10 +28,9 @@ class Gauge {
     this.maxAngle = 90,
     this.angleRange = this.maxAngle - this.minAngle;
 
-    if (configuration !== undefined) {
-      this.config = Object.assign(config, configuration);
-      this._config(configuration);
-    }
+    this.config = Object.assign(config, configuration);
+    this._config();
+
   }
 
   _config() {
@@ -69,7 +68,7 @@ class Gauge {
 
     let ticks = this.config.majorTicks;
     if (this.config.scale === 'log') {
-      ticks = Math.log10(this.config.maxValue/this.minValue);
+      ticks = Math.log10(this.config.maxValue/this.config.minValue);
     }
     this.ticks = this.scale.ticks(ticks);