code refactoring

Author: coder1x

README.md

@@ -113,22 +113,21 @@ $('.rslider__fox').RangeSliderFox({
 ```javascript
 const obj = $(dom).RangeSliderFox({}).data('RangeSliderFox');
 
+// This piece of code will change range values and set the dot on position 350.
 obj.update({
 min:0,
 max:600,
 from:350
 })
 
 // unsubscribe from events
-
 obj.update({
   onStart:null,
   onChange:null,
   onUpdate:null,
   onReset:null
 })
 
-// This piece of code will change range values and set the dot on position 350.
 
 obj.reset()
 
@@ -152,9 +151,9 @@ obj.destroy()
 | max | data-max | 10 (-n, n.n..) | number | Maximal value of the range |
 | to | data-to | 2 (-n, n.n..) | number | Second dot position |
 | from | data-from | 1 (-n, n.n..) | number | First dot position |
-| step | data-step | 0 (max-mun) | number | Step of the dot mooving |
-| keyStepOne | data-key-step-one | 0 (max-mun) | number | Step of the dot mooving on keyboard key single pressing |
-| keyStepHold | data-key-step-hold | 0 (max-mun) | number | Step of the dot mooving on keyboard key holding |
+| step | data-step | 0 (n, n.n.. <= max-min) | number | Step of the dot mooving |
+| keyStepOne | data-key-step-one | 0 (max-min) | number | Step of the dot mooving on keyboard key single pressing |
+| keyStepHold | data-key-step-hold | 0 (max-min) | number | Step of the dot mooving on keyboard key holding |
 | bar | data-bar | false | boolean | Progrees-bar view (shown or hidden) |
 | tipPrefix | data-tip-prefix | '' (char…) | string | Prefix for hints (15 characters maximum) |
 | tipPostfix | data-tip-postfix | '' (char…) | string | Postfix for hints (15 characters maximum) |
@@ -171,6 +170,14 @@ obj.destroy()
 | onUpdate | - | null | Function | Call a callback function after “update”  method calling and pass an object of current configuration data as an argument |
 | onReset | - | null | Function | Call a callback function after “reset”  method calling and pass an object of current configuration data as an argument |
 
+## details
+
+* only one of values gridNum or gridStep can be set for scale. If both of them are set, gridStep will be ignored
+
+* gridSnap is ignored if one of parameters step, keyStepOne, keyStepHold is set
+
+* step is ignored while keyboard controlling if one of parameters keyStepOne, keyStepHold is set
+
 
 ## Setup and Scripts ( build the project, start, testing, production)
 

src/plugins/range-slider-fox/mvc/model/__tests__/model.test.ts

@@ -342,9 +342,9 @@ describe('------- Test Model API -------', () => {
     await model.onHandle();
 
     mas = await [
-      -1.45, 1.5,
-      4.5, 7.5,
-      10.5, 13.5,
+      -1.45, 1.6,
+      4.6, 7.6,
+      10.6, 13.6,
       15.234
     ];
 

src/plugins/range-slider-fox/mvc/model/model.ts

@@ -87,7 +87,7 @@ class Model extends Observer {
     let opKey = Object.keys(op);
     for (let key of opKey) {
       // использую type assertions так как не нашёл возможности передавать нужный тип
-      // не могу отказаться от данной конструкции кода так как это сильно уменьшает копипаст
+      // не могу отказаться от данной конструкции кода, так как это сильно уменьшает копипаст
       const val = this.getProperty(op, key as keyof RangeSliderOptions);
       this.setProperty(this, key as keyof Model, val as this[keyof Model]);
     }
@@ -260,14 +260,14 @@ class Model extends Observer {
 
     const len = this.trimFraction(this.step);
     let mas: number[] = [];
-    let kol = this.fixedNum((this.min + this.step), len);
+    let kol = +(this.min + this.step).toFixed(len);
     mas.push(this.min);
     for (let i = this.min; i <= this.max;) {
-      i = this.fixedNum((i += this.step), len);
+      i = +(i += this.step).toFixed(len);
       if (kol == i && i < this.max) {
         mas.push(kol);
-        kol = this.fixedNum((kol += this.step), len);
-      }
+        kol = +(kol += this.step).toFixed(len);
+      } else break;
     }
     mas.push(this.max);
 
@@ -539,10 +539,10 @@ class Model extends Observer {
 
         if (dotF) {
           const num = !signF ? from - step : from + step;
-          from = this.fixedNum(num, len);
+          from = +num.toFixed(len);
         } else {
           const num = !signF ? to - step : to + step;
-          to = this.fixedNum(num, len);
+          to = +num.toFixed(len);
         }
         if (this.type == 'double') {
           if (from > to && dotF) from = to;
@@ -556,7 +556,7 @@ class Model extends Observer {
         }
         if (!this.keyStepHold && this.keyStepOne) {
           const len = this.trimFraction(this.keyStepOne);
-          this.keyStepHold = this.fixedNum(this.keyStepOne, len);
+          this.keyStepHold = +this.keyStepOne.toFixed(len);
         }
         repeat ? value(this.keyStepHold) : value(this.keyStepOne);
       } else if (this.step) {
@@ -595,18 +595,6 @@ class Model extends Observer {
     return +(this.min + (this.toP * this.valP)).toFixed(0);
   }
 
-  private fixedNum(num: number, len: number) {
-    let temp = '';
-    let fl = false;
-    let k = 0;
-    for (let item of String(num)) {
-      if (item == '.') fl = true;
-      temp += item;
-      if (fl) ++k;
-      if (k == len + 1) break;
-    }
-    return parseFloat(temp);
-  }
 
   private trimFraction(num: number) {
     const integer = Math.trunc(num);
@@ -703,7 +691,7 @@ class Model extends Observer {
   private checkValue(data: PROP, str: string) {
     const _this = this;
     // использую type assertions так как не нашёл возможности передавать нужный тип
-    // не могу отказаться от данной конструкции кода так как это сильно уменьшает копипаст
+    // не могу отказаться от данной конструкции кода, так как это сильно уменьшает копипаст
     const key = str as keyof typeof _this;
     const val = this[key];
     const valF = (val ?? null) != null ? true : false;

src/plugins/range-slider-fox/mvc/view/view.ts

@@ -365,6 +365,8 @@ class View extends Observer {
         if (data) {
           const key = String(data[0]);
           const val = data[1];
+          // использую type assertions так как не нашёл возможности передавать нужный тип
+          // не могу отказаться от данной конструкции кода, так как это сильно уменьшает копипаст
           this.setProperty(obj, key as keyof RangeSliderOptions, val);
         }
       }