Skip to content

Commit 996c336

Browse files
committed
code refactoring
1 parent 8b0db6e commit 996c336

File tree

24 files changed

+967
-872
lines changed

24 files changed

+967
-872
lines changed

coverage/clover.xml

Lines changed: 273 additions & 265 deletions
Large diffs are not rendered by default.

coverage/coverage-final.json

Lines changed: 3 additions & 3 deletions
Large diffs are not rendered by default.

coverage/lcov-report/index.html

Lines changed: 33 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -23,30 +23,30 @@ <h1>All files</h1>
2323
<div class='clearfix'>
2424

2525
<div class='fl pad1y space-right2'>
26-
<span class="strong">92.23% </span>
26+
<span class="strong">92.09% </span>
2727
<span class="quiet">Statements</span>
28-
<span class='fraction'>1544/1674</span>
28+
<span class='fraction'>1549/1682</span>
2929
</div>
3030

3131

3232
<div class='fl pad1y space-right2'>
33-
<span class="strong">79.48% </span>
33+
<span class="strong">79.23% </span>
3434
<span class="quiet">Branches</span>
35-
<span class='fraction'>705/887</span>
35+
<span class='fraction'>706/891</span>
3636
</div>
3737

3838

3939
<div class='fl pad1y space-right2'>
40-
<span class="strong">98.28% </span>
40+
<span class="strong">98.29% </span>
4141
<span class="quiet">Functions</span>
42-
<span class='fraction'>229/233</span>
42+
<span class='fraction'>230/234</span>
4343
</div>
4444

4545

4646
<div class='fl pad1y space-right2'>
47-
<span class="strong">92.29% </span>
47+
<span class="strong">92.15% </span>
4848
<span class="quiet">Lines</span>
49-
<span class='fraction'>1533/1661</span>
49+
<span class='fraction'>1538/1669</span>
5050
</div>
5151

5252

@@ -95,17 +95,17 @@ <h1>All files</h1>
9595

9696
<tr>
9797
<td class="file high" data-value="range-slider-fox/mvc/controller"><a href="range-slider-fox/mvc/controller/index.html">range-slider-fox/mvc/controller</a></td>
98-
<td data-value="91.17" class="pic high">
99-
<div class="chart"><div class="cover-fill" style="width: 91%"></div><div class="cover-empty" style="width: 9%"></div></div>
98+
<td data-value="90.87" class="pic high">
99+
<div class="chart"><div class="cover-fill" style="width: 90%"></div><div class="cover-empty" style="width: 10%"></div></div>
100100
</td>
101-
<td data-value="91.17" class="pct high">91.17%</td>
102-
<td data-value="238" class="abs high">217/238</td>
103-
<td data-value="85.29" class="pct high">85.29%</td>
104-
<td data-value="102" class="abs high">87/102</td>
101+
<td data-value="90.87" class="pct high">90.87%</td>
102+
<td data-value="241" class="abs high">219/241</td>
103+
<td data-value="84.61" class="pct high">84.61%</td>
104+
<td data-value="104" class="abs high">88/104</td>
105105
<td data-value="100" class="pct high">100%</td>
106106
<td data-value="32" class="abs high">32/32</td>
107-
<td data-value="91.1" class="pct high">91.1%</td>
108-
<td data-value="236" class="abs high">215/236</td>
107+
<td data-value="90.79" class="pct high">90.79%</td>
108+
<td data-value="239" class="abs high">217/239</td>
109109
</tr>
110110

111111
<tr>
@@ -125,32 +125,32 @@ <h1>All files</h1>
125125

126126
<tr>
127127
<td class="file high" data-value="range-slider-fox/mvc/view"><a href="range-slider-fox/mvc/view/index.html">range-slider-fox/mvc/view</a></td>
128-
<td data-value="95.81" class="pic high">
128+
<td data-value="95.9" class="pic high">
129129
<div class="chart"><div class="cover-fill" style="width: 95%"></div><div class="cover-empty" style="width: 5%"></div></div>
130130
</td>
131-
<td data-value="95.81" class="pct high">95.81%</td>
132-
<td data-value="215" class="abs high">206/215</td>
133-
<td data-value="73.97" class="pct medium">73.97%</td>
134-
<td data-value="73" class="abs medium">54/73</td>
135-
<td data-value="97.77" class="pct high">97.77%</td>
136-
<td data-value="45" class="abs high">44/45</td>
137-
<td data-value="95.81" class="pct high">95.81%</td>
138-
<td data-value="215" class="abs high">206/215</td>
131+
<td data-value="95.9" class="pct high">95.9%</td>
132+
<td data-value="220" class="abs high">211/220</td>
133+
<td data-value="73.33" class="pct medium">73.33%</td>
134+
<td data-value="75" class="abs medium">55/75</td>
135+
<td data-value="97.82" class="pct high">97.82%</td>
136+
<td data-value="46" class="abs high">45/46</td>
137+
<td data-value="95.9" class="pct high">95.9%</td>
138+
<td data-value="220" class="abs high">211/220</td>
139139
</tr>
140140

141141
<tr>
142142
<td class="file high" data-value="range-slider-fox/mvc/view/sub-view"><a href="range-slider-fox/mvc/view/sub-view/index.html">range-slider-fox/mvc/view/sub-view</a></td>
143-
<td data-value="93.87" class="pic high">
143+
<td data-value="93.54" class="pic high">
144144
<div class="chart"><div class="cover-fill" style="width: 93%"></div><div class="cover-empty" style="width: 7%"></div></div>
145145
</td>
146-
<td data-value="93.87" class="pct high">93.87%</td>
147-
<td data-value="604" class="abs high">567/604</td>
148-
<td data-value="78.28" class="pct medium">78.28%</td>
149-
<td data-value="304" class="abs medium">238/304</td>
146+
<td data-value="93.54" class="pct high">93.54%</td>
147+
<td data-value="604" class="abs high">565/604</td>
148+
<td data-value="77.96" class="pct medium">77.96%</td>
149+
<td data-value="304" class="abs medium">237/304</td>
150150
<td data-value="96.66" class="pct high">96.66%</td>
151151
<td data-value="90" class="abs high">87/90</td>
152-
<td data-value="94.16" class="pct high">94.16%</td>
153-
<td data-value="600" class="abs high">565/600</td>
152+
<td data-value="93.83" class="pct high">93.83%</td>
153+
<td data-value="600" class="abs high">563/600</td>
154154
</tr>
155155

156156
</tbody>
@@ -161,7 +161,7 @@ <h1>All files</h1>
161161
<div class='footer quiet pad2 space-top1 center small'>
162162
Code coverage generated by
163163
<a href="https://istanbul.js.org/" target="_blank">istanbul</a>
164-
at Tue Dec 14 2021 19:15:57 GMT+0300 (Москва, стандартное время)
164+
at Sat Dec 18 2021 13:49:22 GMT+0300 (Москва, стандартное время)
165165
</div>
166166
</div>
167167
<script src="prettify.js"></script>

coverage/lcov-report/range-slider-fox/index.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,7 @@ <h1><a href="../index.html">All files</a> range-slider-fox</h1>
116116
<div class='footer quiet pad2 space-top1 center small'>
117117
Code coverage generated by
118118
<a href="https://istanbul.js.org/" target="_blank">istanbul</a>
119-
at Tue Dec 14 2021 19:15:57 GMT+0300 (Москва, стандартное время)
119+
at Sat Dec 18 2021 13:49:22 GMT+0300 (Москва, стандартное время)
120120
</div>
121121
</div>
122122
<script src="../prettify.js"></script>

coverage/lcov-report/range-slider-fox/mvc/controller/controller.ts.html

Lines changed: 47 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -23,16 +23,16 @@ <h1><a href="../../../index.html">All files</a> / <a href="index.html">range-sli
2323
<div class='clearfix'>
2424

2525
<div class='fl pad1y space-right2'>
26-
<span class="strong">91.17% </span>
26+
<span class="strong">90.87% </span>
2727
<span class="quiet">Statements</span>
28-
<span class='fraction'>217/238</span>
28+
<span class='fraction'>219/241</span>
2929
</div>
3030

3131

3232
<div class='fl pad1y space-right2'>
33-
<span class="strong">85.29% </span>
33+
<span class="strong">84.61% </span>
3434
<span class="quiet">Branches</span>
35-
<span class='fraction'>87/102</span>
35+
<span class='fraction'>88/104</span>
3636
</div>
3737

3838

@@ -44,9 +44,9 @@ <h1><a href="../../../index.html">All files</a> / <a href="index.html">range-sli
4444

4545

4646
<div class='fl pad1y space-right2'>
47-
<span class="strong">91.1% </span>
47+
<span class="strong">90.79% </span>
4848
<span class="quiet">Lines</span>
49-
<span class='fraction'>215/236</span>
49+
<span class='fraction'>217/239</span>
5050
</div>
5151

5252

@@ -459,7 +459,9 @@ <h1><a href="../../../index.html">All files</a> / <a href="index.html">range-sli
459459
<a name='L394'></a><a href='#L394'>394</a>
460460
<a name='L395'></a><a href='#L395'>395</a>
461461
<a name='L396'></a><a href='#L396'>396</a>
462-
<a name='L397'></a><a href='#L397'>397</a></td><td class="line-coverage quiet"><span class="cline-any cline-neutral">&nbsp;</span>
462+
<a name='L397'></a><a href='#L397'>397</a>
463+
<a name='L398'></a><a href='#L398'>398</a>
464+
<a name='L399'></a><a href='#L399'>399</a></td><td class="line-coverage quiet"><span class="cline-any cline-neutral">&nbsp;</span>
463465
<span class="cline-any cline-yes">6x</span>
464466
<span class="cline-any cline-yes">6x</span>
465467
<span class="cline-any cline-yes">6x</span>
@@ -498,12 +500,15 @@ <h1><a href="../../../index.html">All files</a> / <a href="index.html">range-sli
498500
<span class="cline-any cline-neutral">&nbsp;</span>
499501
<span class="cline-any cline-yes">2x</span>
500502
<span class="cline-any cline-yes">2x</span>
503+
<span class="cline-any cline-no">&nbsp;</span>
504+
<span class="cline-any cline-yes">2x</span>
501505
<span class="cline-any cline-yes">2x</span>
502506
<span class="cline-any cline-no">&nbsp;</span>
503507
<span class="cline-any cline-yes">2x</span>
504508
<span class="cline-any cline-yes">2x</span>
505509
<span class="cline-any cline-yes">2x</span>
506510
<span class="cline-any cline-yes">2x</span>
511+
<span class="cline-any cline-yes">2x</span>
507512
<span class="cline-any cline-neutral">&nbsp;</span>
508513
<span class="cline-any cline-neutral">&nbsp;</span>
509514
<span class="cline-any cline-yes">22x</span>
@@ -854,7 +859,6 @@ <h1><a href="../../../index.html">All files</a> / <a href="index.html">range-sli
854859
<span class="cline-any cline-neutral">&nbsp;</span>
855860
<span class="cline-any cline-neutral">&nbsp;</span>
856861
<span class="cline-any cline-neutral">&nbsp;</span>
857-
<span class="cline-any cline-neutral">&nbsp;</span>
858862
<span class="cline-any cline-neutral">&nbsp;</span></td><td class="text"><pre class="prettyprint lang-js">import { Model } from '../model/model';
859863
import { View } from '../view/view';
860864
import { RangeSliderOptions } from '../../glob-interface';
@@ -893,15 +897,17 @@ <h1><a href="../../../index.html">All files</a> / <a href="index.html">range-sli
893897
this.model.update(options);
894898
return true;
895899
}
896-
&nbsp;
897-
async <span class="missing-if-branch" title="if path not taken" >I</span>destroy() {
898-
this.loc<span class="cstat-no" title="statement not covered" >k = true;</span>
899-
const elem = await this.view.elem;
900+
<span class="missing-if-branch" title="if path not taken" >I</span>
901+
async dest<span class="cstat-no" title="statement not covered" >roy() {</span>
902+
this.lock = true;
903+
if (<span class="missing-if-branch" title="if path not taken" >I</span>!this.view) return false;
904+
const el<span class="cstat-no" title="statement not covered" >em = await thi</span>s.view.elem;
900905
if (elem.constructor.name != 'HTMLInputElement') return false;
901906
await $.data(elem, 'RangeSliderFox', null);
902907
await this.view.destroy();
903908
this.view = null;
904909
this.model = null;
910+
return true;
905911
}
906912
&nbsp;
907913
&nbsp;
@@ -967,11 +973,11 @@ <h1><a href="../../../index.html">All files</a> / <a href="index.html">range-sli
967973
if (key != 'DataAttributes') return false;
968974
&nbsp;
969975
this.funAttributes = () =&gt; {
970-
th<span class="missing-if-branch" title="if path not taken" >I</span>is.update(option<span class="branch-1 cbranch-no" title="branch not covered" >s);</span>
971-
};<span class="cstat-no" title="statement not covered" ></span>
976+
this.update(options);
977+
};<span class="branch-1 cbranch-no" title="branch not covered" ><span class="missing-if-branch" title="if path not taken" >I</span></span>
972978
<span class="cstat-no" title="statement not covered" ></span>
973979
if (this<span class="cstat-no" title="statement not covered" >.startFL)</span>
974-
this.funAttributes();
980+
this.f<span class="cstat-no" title="statement not covered" >unAttributes();</span>
975981
&nbsp;
976982
return true;
977983
};
@@ -986,11 +992,11 @@ <h1><a href="../../../index.html">All files</a> / <a href="index.html">range-sli
986992
&nbsp;
987993
if (lockFl)
988994
this.view.updateTipMinMax(options.min, options.max);
989-
<span class="cstat-no" title="statement not covered" ></span>
990-
const ob<span class="cstat-no" title="statement not covered" >j = this.model</span>.getOptions();
991-
if (<span class="cstat-no" title="statement not covered" >obj.grid &amp;&amp; lockFl) {</span>
992-
th<span class="cstat-no" title="statement not covered" >is.view.delet</span>eGrid();
993-
this.model.createMark();
995+
&nbsp;
996+
cons<span class="cstat-no" title="statement not covered" >t obj = this.model.getOptions();</span>
997+
if (obj.<span class="cstat-no" title="statement not covered" >grid &amp;&amp; lockFl</span>) {
998+
th<span class="cstat-no" title="statement not covered" >is.view.deleteGrid();</span>
999+
th<span class="cstat-no" title="statement not covered" >is.model.crea</span>teMark();
9941000
this.view.createDomGrid();
9951001
}
9961002
&nbsp;
@@ -1024,9 +1030,9 @@ <h1><a href="../../../index.html">All files</a> / <a href="index.html">range-sli
10241030
const type = options.type;
10251031
&nbsp;
10261032
const lockFl = this.startFL &amp;&amp; !this.resetFL;
1027-
this<span class="missing-if-branch" title="if path not taken" >I</span>.view.createDotElem(type); // create dot
1028-
const fr<span class="cstat-no" title="statement not covered" >om = this.mode</span>l.calcPositionDotFrom();
1029-
this.view.setDotFrom(from);
1033+
this.view.createDotElem(type); // create dot
1034+
cons<span class="missing-if-branch" title="if path not taken" >I</span>t from = this.model.calcPositionDotFrom();
1035+
this.vie<span class="cstat-no" title="statement not covered" >w.setDotFrom(f</span>rom);
10301036
&nbsp;
10311037
if (type == 'double') {
10321038
const to = this.model.calcPositionDotTo();
@@ -1093,19 +1099,19 @@ <h1><a href="../../../index.html">All files</a> / <a href="index.html">range-sli
10931099
this.view.createDomGrid();
10941100
}
10951101
}
1096-
retu<span class="missing-if-branch" title="if path not taken" >I</span>rn true;
1097-
};<span class="cstat-no" title="statement not covered" ></span>
1102+
return true;
1103+
};<span class="missing-if-branch" title="if path not taken" >I</span>
10981104
<span class="cstat-no" title="statement not covered" ></span>
10991105
<span class="cstat-no" title="statement not covered" ></span>
1100-
private ha<span class="cstat-no" title="statement not covered" >ndleOrientationData = async (options: TOB) =&gt; {</span>
1101-
const key = <span class="cstat-no" title="statement not covered" >options.key;</span>
1106+
private handleOrientation<span class="cstat-no" title="statement not covered" >Da</span>ta = async (options: TOB) =&gt; {
1107+
const ke<span class="cstat-no" title="statement not covered" >y = options.key;</span>
11021108
if (key != '<span class="cstat-no" title="statement not covered" >OrientationData') return false;</span>
1103-
&nbsp;
1104-
await this.view.setOrientation(options.orientation);
1105-
const obj = <span class="cstat-no" title="statement not covered" >await this.model.getOptions();</span>
1106-
this.updateHints(obj.type, obj.from, obj.to);
11071109
<span class="cstat-no" title="statement not covered" ></span>
1108-
//-------- grid
1110+
await this.view.setOrientation(options.orientation);
1111+
const obj = await this.model.getOptions();
1112+
this.updateH<span class="cstat-no" title="statement not covered" >ints(obj.type, obj.from, obj.to</span>);
1113+
&nbsp;
1114+
//------<span class="cstat-no" title="statement not covered" >-- grid</span>
11091115
&nbsp;
11101116
if (obj.grid) {
11111117
this.view.deleteGrid();
@@ -1124,9 +1130,9 @@ <h1><a href="../../../index.html">All files</a> / <a href="index.html">range-sli
11241130
return true;
11251131
};
11261132
&nbsp;
1127-
<span class="missing-if-branch" title="if path not taken" >I</span>
1128-
private ha<span class="cstat-no" title="statement not covered" >ndleHintsData </span>= (options: TOB) =&gt; {
1129-
const key = options.key;
1133+
&nbsp;
1134+
privat<span class="missing-if-branch" title="if path not taken" >I</span>e handleHintsData = (options: TOB) =&gt; {
1135+
const ke<span class="cstat-no" title="statement not covered" >y = options.ke</span>y;
11301136
if (key != 'HintsData') return false;
11311137
&nbsp;
11321138
const wrapWH = this.view.getWrapWH();
@@ -1149,9 +1155,9 @@ <h1><a href="../../../index.html">All files</a> / <a href="index.html">range-sli
11491155
if (objTip.fromWH || objTip.toWH) {
11501156
const fromXY = await this.model.calcPositionTipFrom(objTip.fromWH);
11511157
let toXY = 0;
1152-
le<span class="missing-if-branch" title="if path not taken" >I</span>t singleXY = 0;
1153-
if (ty<span class="cstat-no" title="statement not covered" >pe == 'double'</span>) {
1154-
toXY = await this.model.calcPositionTipTo(objTip.toWH);
1158+
let singleXY = 0;
1159+
if<span class="missing-if-branch" title="if path not taken" >I</span> (type == 'double') {
1160+
toXY<span class="cstat-no" title="statement not covered" > = await this.</span>model.calcPositionTipTo(objTip.toWH);
11551161
singleXY = await this.model.calcPositionTipSingle(objTip.singleWH);
11561162
} else {
11571163
await this.view.deleteTipTo();
@@ -1165,9 +1171,9 @@ <h1><a href="../../../index.html">All files</a> / <a href="index.html">range-sli
11651171
&nbsp;
11661172
}
11671173
await this.view.checkVisibleTip();
1168-
<span class="missing-if-branch" title="if path not taken" >I</span>
1169-
}<span class="cstat-no" title="statement not covered" ></span>
11701174
&nbsp;
1175+
}<span class="missing-if-branch" title="if path not taken" >I</span>
1176+
<span class="cstat-no" title="statement not covered" ></span>
11711177
&nbsp;
11721178
private handleDisabledData = (options: TOB) =&gt; {
11731179
const key = options.key;
@@ -1258,7 +1264,7 @@ <h1><a href="../../../index.html">All files</a> / <a href="index.html">range-sli
12581264
<div class='footer quiet pad2 space-top1 center small'>
12591265
Code coverage generated by
12601266
<a href="https://istanbul.js.org/" target="_blank">istanbul</a>
1261-
at Tue Dec 14 2021 19:15:57 GMT+0300 (Москва, стандартное время)
1267+
at Sat Dec 18 2021 13:49:22 GMT+0300 (Москва, стандартное время)
12621268
</div>
12631269
</div>
12641270
<script src="../../../prettify.js"></script>

0 commit comments

Comments
 (0)