Skip to content

Commit d0c35a0

Browse files
committed
fixed wrong reading estimate
1 parent fae49c4 commit d0c35a0

File tree

9 files changed

+336
-110
lines changed

9 files changed

+336
-110
lines changed

coverage/PhantomJS 1.9.8 (Mac OS X 0.0.0)/lcov-report/index.html

+11-11
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,10 @@
1515
<div class="header low">
1616
<h1>Code coverage report for <span class="entity">All files</span></h1>
1717
<h2>
18-
Statements: <span class="metric">35.87% <small>(33 / 92)</small></span> &nbsp;&nbsp;&nbsp;&nbsp;
19-
Branches: <span class="metric">22.68% <small>(22 / 97)</small></span> &nbsp;&nbsp;&nbsp;&nbsp;
18+
Statements: <span class="metric">35.11% <small>(33 / 94)</small></span> &nbsp;&nbsp;&nbsp;&nbsp;
19+
Branches: <span class="metric">25.29% <small>(22 / 87)</small></span> &nbsp;&nbsp;&nbsp;&nbsp;
2020
Functions: <span class="metric">50% <small>(8 / 16)</small></span> &nbsp;&nbsp;&nbsp;&nbsp;
21-
Lines: <span class="metric">35.87% <small>(33 / 92)</small></span> &nbsp;&nbsp;&nbsp;&nbsp;
21+
Lines: <span class="metric">35.11% <small>(33 / 94)</small></span> &nbsp;&nbsp;&nbsp;&nbsp;
2222
Ignored: <span class="metric"><span class="ignore-none">none</span></span> &nbsp;&nbsp;&nbsp;&nbsp;
2323
</h2>
2424
<div class="path"></div>
@@ -42,23 +42,23 @@ <h2>
4242
</thead>
4343
<tbody><tr>
4444
<td class="file low" data-value="src/"><a href="src/index.html">src/</a></td>
45-
<td data-value="35.87" class="pic low"><span class="cover-fill" style="width: 35px;"></span><span class="cover-empty" style="width:65px;"></span></td>
46-
<td data-value="35.87" class="pct low">35.87%</td>
47-
<td data-value="92" class="abs low">(33&nbsp;/&nbsp;92)</td>
48-
<td data-value="22.68" class="pct low">22.68%</td>
49-
<td data-value="97" class="abs low">(22&nbsp;/&nbsp;97)</td>
45+
<td data-value="35.11" class="pic low"><span class="cover-fill" style="width: 35px;"></span><span class="cover-empty" style="width:65px;"></span></td>
46+
<td data-value="35.11" class="pct low">35.11%</td>
47+
<td data-value="94" class="abs low">(33&nbsp;/&nbsp;94)</td>
48+
<td data-value="25.29" class="pct low">25.29%</td>
49+
<td data-value="87" class="abs low">(22&nbsp;/&nbsp;87)</td>
5050
<td data-value="50" class="pct medium">50%</td>
5151
<td data-value="16" class="abs medium">(8&nbsp;/&nbsp;16)</td>
52-
<td data-value="35.87" class="pct low">35.87%</td>
53-
<td data-value="92" class="abs low">(33&nbsp;/&nbsp;92)</td>
52+
<td data-value="35.11" class="pct low">35.11%</td>
53+
<td data-value="94" class="abs low">(33&nbsp;/&nbsp;94)</td>
5454
</tr>
5555

5656
</tbody>
5757
</table>
5858
</div>
5959
</div>
6060
<div class="footer">
61-
<div class="meta">Generated by <a href="http://istanbul-js.org/" target="_blank">istanbul</a> at Wed Jul 15 2015 11:23:45 GMT+0200 (CEST)</div>
61+
<div class="meta">Generated by <a href="http://istanbul-js.org/" target="_blank">istanbul</a> at Thu Jul 16 2015 10:01:41 GMT+0200 (CEST)</div>
6262
</div>
6363
<script src="prettify.js"></script>
6464
<script>

coverage/PhantomJS 1.9.8 (Mac OS X 0.0.0)/lcov-report/src/index.html

+11-11
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,10 @@
1515
<div class="header low">
1616
<h1>Code coverage report for <span class="entity">src/</span></h1>
1717
<h2>
18-
Statements: <span class="metric">35.87% <small>(33 / 92)</small></span> &nbsp;&nbsp;&nbsp;&nbsp;
19-
Branches: <span class="metric">22.68% <small>(22 / 97)</small></span> &nbsp;&nbsp;&nbsp;&nbsp;
18+
Statements: <span class="metric">35.11% <small>(33 / 94)</small></span> &nbsp;&nbsp;&nbsp;&nbsp;
19+
Branches: <span class="metric">25.29% <small>(22 / 87)</small></span> &nbsp;&nbsp;&nbsp;&nbsp;
2020
Functions: <span class="metric">50% <small>(8 / 16)</small></span> &nbsp;&nbsp;&nbsp;&nbsp;
21-
Lines: <span class="metric">35.87% <small>(33 / 92)</small></span> &nbsp;&nbsp;&nbsp;&nbsp;
21+
Lines: <span class="metric">35.11% <small>(33 / 94)</small></span> &nbsp;&nbsp;&nbsp;&nbsp;
2222
Ignored: <span class="metric"><span class="ignore-none">none</span></span> &nbsp;&nbsp;&nbsp;&nbsp;
2323
</h2>
2424
<div class="path"><a href="../index.html">All files</a> &#187; src/</div>
@@ -42,23 +42,23 @@ <h2>
4242
</thead>
4343
<tbody><tr>
4444
<td class="file low" data-value="ng-reading-indicator.js"><a href="ng-reading-indicator.js.html">ng-reading-indicator.js</a></td>
45-
<td data-value="35.87" class="pic low"><span class="cover-fill" style="width: 35px;"></span><span class="cover-empty" style="width:65px;"></span></td>
46-
<td data-value="35.87" class="pct low">35.87%</td>
47-
<td data-value="92" class="abs low">(33&nbsp;/&nbsp;92)</td>
48-
<td data-value="22.68" class="pct low">22.68%</td>
49-
<td data-value="97" class="abs low">(22&nbsp;/&nbsp;97)</td>
45+
<td data-value="35.11" class="pic low"><span class="cover-fill" style="width: 35px;"></span><span class="cover-empty" style="width:65px;"></span></td>
46+
<td data-value="35.11" class="pct low">35.11%</td>
47+
<td data-value="94" class="abs low">(33&nbsp;/&nbsp;94)</td>
48+
<td data-value="25.29" class="pct low">25.29%</td>
49+
<td data-value="87" class="abs low">(22&nbsp;/&nbsp;87)</td>
5050
<td data-value="50" class="pct medium">50%</td>
5151
<td data-value="16" class="abs medium">(8&nbsp;/&nbsp;16)</td>
52-
<td data-value="35.87" class="pct low">35.87%</td>
53-
<td data-value="92" class="abs low">(33&nbsp;/&nbsp;92)</td>
52+
<td data-value="35.11" class="pct low">35.11%</td>
53+
<td data-value="94" class="abs low">(33&nbsp;/&nbsp;94)</td>
5454
</tr>
5555

5656
</tbody>
5757
</table>
5858
</div>
5959
</div>
6060
<div class="footer">
61-
<div class="meta">Generated by <a href="http://istanbul-js.org/" target="_blank">istanbul</a> at Wed Jul 15 2015 11:23:45 GMT+0200 (CEST)</div>
61+
<div class="meta">Generated by <a href="http://istanbul-js.org/" target="_blank">istanbul</a> at Thu Jul 16 2015 10:01:41 GMT+0200 (CEST)</div>
6262
</div>
6363
<script src="../prettify.js"></script>
6464
<script>

coverage/PhantomJS 1.9.8 (Mac OS X 0.0.0)/lcov-report/src/ng-reading-indicator.js.html

+24-12
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,10 @@
1515
<div class="header low">
1616
<h1>Code coverage report for <span class="entity">src/ng-reading-indicator.js</span></h1>
1717
<h2>
18-
Statements: <span class="metric">35.87% <small>(33 / 92)</small></span> &nbsp;&nbsp;&nbsp;&nbsp;
19-
Branches: <span class="metric">22.68% <small>(22 / 97)</small></span> &nbsp;&nbsp;&nbsp;&nbsp;
18+
Statements: <span class="metric">35.11% <small>(33 / 94)</small></span> &nbsp;&nbsp;&nbsp;&nbsp;
19+
Branches: <span class="metric">25.29% <small>(22 / 87)</small></span> &nbsp;&nbsp;&nbsp;&nbsp;
2020
Functions: <span class="metric">50% <small>(8 / 16)</small></span> &nbsp;&nbsp;&nbsp;&nbsp;
21-
Lines: <span class="metric">35.87% <small>(33 / 92)</small></span> &nbsp;&nbsp;&nbsp;&nbsp;
21+
Lines: <span class="metric">35.11% <small>(33 / 94)</small></span> &nbsp;&nbsp;&nbsp;&nbsp;
2222
Ignored: <span class="metric"><span class="ignore-none">none</span></span> &nbsp;&nbsp;&nbsp;&nbsp;
2323
</h2>
2424
<div class="path"><a href="../index.html">All files</a> &#187; <a href="index.html">src/</a> &#187; ng-reading-indicator.js</div>
@@ -225,7 +225,11 @@ <h2>
225225
198
226226
199
227227
200
228-
201</td><td class="line-coverage"><span class="cline-any cline-yes">1</span>
228+
201
229+
202
230+
203
231+
204
232+
205</td><td class="line-coverage"><span class="cline-any cline-yes">1</span>
229233
<span class="cline-any cline-neutral">&nbsp;</span>
230234
<span class="cline-any cline-neutral">&nbsp;</span>
231235
<span class="cline-any cline-yes">1</span>
@@ -367,6 +371,9 @@ <h2>
367371
<span class="cline-any cline-neutral">&nbsp;</span>
368372
<span class="cline-any cline-neutral">&nbsp;</span>
369373
<span class="cline-any cline-no">&nbsp;</span>
374+
<span class="cline-any cline-neutral">&nbsp;</span>
375+
<span class="cline-any cline-no">&nbsp;</span>
376+
<span class="cline-any cline-neutral">&nbsp;</span>
370377
<span class="cline-any cline-no">&nbsp;</span>
371378
<span class="cline-any cline-no">&nbsp;</span>
372379
<span class="cline-any cline-no">&nbsp;</span>
@@ -398,6 +405,7 @@ <h2>
398405
<span class="cline-any cline-no">&nbsp;</span>
399406
<span class="cline-any cline-no">&nbsp;</span>
400407
<span class="cline-any cline-no">&nbsp;</span>
408+
<span class="cline-any cline-no">&nbsp;</span>
401409
<span class="cline-any cline-neutral">&nbsp;</span>
402410
<span class="cline-any cline-no">&nbsp;</span>
403411
<span class="cline-any cline-neutral">&nbsp;</span>
@@ -545,7 +553,7 @@ <h2>
545553
<span class="cstat-no" title="statement not covered" > bottom = findEdges(article[0]).bottom;</span>
546554
<span class="cstat-no" title="statement not covered" > top = findEdges(article[0]).top;</span>
547555
<span class="cstat-no" title="statement not covered" > height = findEdges(article[0]).height;</span>
548-
<span class="cstat-no" title="statement not covered" > expandOffset = (expandOnHeadline) ? findEdges(article.find('h1')[0]) : {top: 50};</span>
556+
<span class="cstat-no" title="statement not covered" > expandOffset = (expandOnHeadline) ? findEdges(article.find('h1')[0]) : {top: 0};</span>
549557
<span class="cstat-no" title="statement not covered" > updateProgress();</span>
550558
}
551559
&nbsp;
@@ -567,6 +575,9 @@ <h2>
567575
}
568576
&nbsp;
569577
<span class="cstat-no" title="statement not covered" > progressBar.style.width = progress + '%';</span>
578+
&nbsp;
579+
<span class="cstat-no" title="statement not covered" > console.log(options, expandOffset.top, options.topOffset);</span>
580+
&nbsp;
570581
<span class="cstat-no" title="statement not covered" > if ((!options.expand &amp;&amp; options.type === 'small' &amp;&amp; scrollPos &gt;= (top + expandOffset.top + options.topOffset)) || (options.expand &amp;&amp; scrollPos &gt; top &amp;&amp; scrollPos &lt; (top + expandOffset.top + options.topOffset))) {</span>
571582
<span class="cstat-no" title="statement not covered" > angular.element(element)[0].style.height = '5px';</span>
572583
<span class="cstat-no" title="statement not covered" > angular.element(element).addClass('ng-reading-indicator-shrink');</span>
@@ -583,20 +594,21 @@ <h2>
583594
}
584595
&nbsp;
585596
<span class="fstat-no" title="function not covered" > function calculateReadingTime(){</span>
586-
<span class="cstat-no" title="statement not covered" > var wordCount = article.text().split(' ').length;</span>
597+
<span class="cstat-no" title="statement not covered" > var wordCount = angular.element(article[0]).text().trim().split(' ').length;</span>
587598
<span class="cstat-no" title="statement not covered" > var minutes = Math.floor(wordCount / options.readingTime.speed);</span>
588599
<span class="cstat-no" title="statement not covered" > var seconds = Math.floor(wordCount % options.readingTime.speed / (options.readingTime.speed / 60));</span>
589600
<span class="cstat-no" title="statement not covered" > var estimate = options.readingTime.prefix;</span>
590601
&nbsp;
591-
<span class="cstat-no" title="statement not covered" > if (!options.readingTime.seconds &amp;&amp; seconds &gt;= 30) {</span>
602+
<span class="cstat-no" title="statement not covered" > if (seconds &gt;= 30) {</span>
592603
<span class="cstat-no" title="statement not covered" > minutes++;</span>
593604
}
594605
&nbsp;
595-
<span class="cstat-no" title="statement not covered" > if (Math.floor((minutes &lt;= 9 ? minutes + '0' : minutes) * (1 - (progress/100))) &gt; 0 || !options.readingTime.seconds) {</span>
596-
<span class="cstat-no" title="statement not covered" > estimate += Math.floor((minutes &lt;= 9 ? minutes + '0' : minutes) * (1 - (progress/100)));</span>
606+
<span class="cstat-no" title="statement not covered" > if (Math.floor(minutes * (1 - (progress/100))) &gt; 0 || !options.readingTime.seconds) {</span>
607+
<span class="cstat-no" title="statement not covered" > minutes = minutes * (1 - (progress/100));</span>
608+
<span class="cstat-no" title="statement not covered" > estimate += Math.floor(minutes);</span>
597609
<span class="cstat-no" title="statement not covered" > estimate += options.readingTime.minutesSuffix;</span>
598-
} else <span class="cstat-no" title="statement not covered" >if (Math.floor((minutes &lt;= 9 ? minutes + '0' : minutes) * (1 - (progress/100))) === 0 &amp;&amp; options.readingTime.seconds) {</span>
599-
<span class="cstat-no" title="statement not covered" > estimate += Math.round((((minutes &lt;= 9 ? minutes + '0' : minutes)*60) * (1 - (progress/100))) / 10) * options.readingTime.secondInterval;</span>
610+
} else <span class="cstat-no" title="statement not covered" >if (Math.floor(minutes * (1 - (progress/100))) === 0 &amp;&amp; options.readingTime.seconds) {</span>
611+
<span class="cstat-no" title="statement not covered" > estimate += Math.round((((minutes)*60) * (1 - (progress/100))) / 10) * options.readingTime.secondInterval;</span>
600612
<span class="cstat-no" title="statement not covered" > estimate += options.readingTime.secondsSuffix;</span>
601613
} else {
602614
<span class="cstat-no" title="statement not covered" > estimate += 0 + options.readingTime.secondsSuffix;</span>
@@ -630,7 +642,7 @@ <h2>
630642

631643
</div>
632644
<div class="footer">
633-
<div class="meta">Generated by <a href="http://istanbul-js.org/" target="_blank">istanbul</a> at Wed Jul 15 2015 11:23:45 GMT+0200 (CEST)</div>
645+
<div class="meta">Generated by <a href="http://istanbul-js.org/" target="_blank">istanbul</a> at Thu Jul 16 2015 10:01:41 GMT+0200 (CEST)</div>
634646
</div>
635647
<script src="../prettify.js"></script>
636648
<script>

coverage/PhantomJS 1.9.8 (Mac OS X 0.0.0)/lcov.info

+56-64
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,9 @@ FN:106,findEdges
1313
FN:117,updateSize
1414
FN:125,updateProgress
1515
FN:135,(anonymous_13)
16-
FN:158,calculateReadingTime
17-
FN:182,(anonymous_15)
18-
FN:191,(anonymous_16)
16+
FN:161,calculateReadingTime
17+
FN:186,(anonymous_15)
18+
FN:195,(anonymous_16)
1919
FNF:16
2020
FNH:8
2121
FNDA:1,(anonymous_1)
@@ -92,41 +92,43 @@ DA:135,0
9292
DA:136,0
9393
DA:139,0
9494
DA:142,0
95-
DA:143,0
9695
DA:144,0
97-
DA:145,0
9896
DA:146,0
9997
DA:147,0
10098
DA:148,0
10199
DA:149,0
102100
DA:150,0
101+
DA:151,0
103102
DA:152,0
104103
DA:153,0
105-
DA:154,0
106-
DA:158,1
107-
DA:159,0
108-
DA:160,0
109-
DA:161,0
104+
DA:155,0
105+
DA:156,0
106+
DA:157,0
107+
DA:161,1
110108
DA:162,0
109+
DA:163,0
111110
DA:164,0
112111
DA:165,0
112+
DA:167,0
113113
DA:168,0
114-
DA:169,0
115-
DA:170,0
116114
DA:171,0
117115
DA:172,0
118116
DA:173,0
117+
DA:174,0
119118
DA:175,0
120-
DA:178,0
121-
DA:181,4
119+
DA:176,0
120+
DA:177,0
121+
DA:179,0
122122
DA:182,0
123-
DA:183,0
124-
DA:184,0
125-
DA:188,4
126-
DA:191,4
127-
DA:192,0
128-
DA:193,0
129-
LF:92
123+
DA:185,4
124+
DA:186,0
125+
DA:187,0
126+
DA:188,0
127+
DA:192,4
128+
DA:195,4
129+
DA:196,0
130+
DA:197,0
131+
LF:94
130132
LH:33
131133
BRDA:25,1,0,4
132134
BRDA:25,1,1,4
@@ -183,48 +185,38 @@ BRDA:131,25,0,0
183185
BRDA:131,25,1,0
184186
BRDA:134,26,0,0
185187
BRDA:134,26,1,0
186-
BRDA:143,27,0,0
187-
BRDA:143,27,1,0
188-
BRDA:143,28,0,0
189-
BRDA:143,28,1,0
190-
BRDA:143,28,2,0
191-
BRDA:143,28,3,0
192-
BRDA:143,28,4,0
193-
BRDA:143,28,5,0
194-
BRDA:147,29,0,0
195-
BRDA:147,29,1,0
196-
BRDA:147,30,0,0
197-
BRDA:147,30,1,0
198-
BRDA:147,30,2,0
199-
BRDA:147,30,3,0
200-
BRDA:164,31,0,0
201-
BRDA:164,31,1,0
202-
BRDA:164,32,0,0
203-
BRDA:164,32,1,0
204-
BRDA:168,33,0,0
205-
BRDA:168,33,1,0
206-
BRDA:168,34,0,0
207-
BRDA:168,34,1,0
208-
BRDA:168,35,0,0
209-
BRDA:168,35,1,0
210-
BRDA:169,36,0,0
211-
BRDA:169,36,1,0
212-
BRDA:171,37,0,0
213-
BRDA:171,37,1,0
214-
BRDA:171,38,0,0
215-
BRDA:171,38,1,0
216-
BRDA:171,39,0,0
217-
BRDA:171,39,1,0
218-
BRDA:172,40,0,0
219-
BRDA:172,40,1,0
220-
BRDA:181,41,0,0
221-
BRDA:181,41,1,4
222-
BRDA:181,42,0,4
223-
BRDA:181,42,1,0
224-
BRDA:183,43,0,0
225-
BRDA:183,43,1,0
226-
BRDA:183,44,0,0
227-
BRDA:183,44,1,0
228-
BRF:97
188+
BRDA:146,27,0,0
189+
BRDA:146,27,1,0
190+
BRDA:146,28,0,0
191+
BRDA:146,28,1,0
192+
BRDA:146,28,2,0
193+
BRDA:146,28,3,0
194+
BRDA:146,28,4,0
195+
BRDA:146,28,5,0
196+
BRDA:150,29,0,0
197+
BRDA:150,29,1,0
198+
BRDA:150,30,0,0
199+
BRDA:150,30,1,0
200+
BRDA:150,30,2,0
201+
BRDA:150,30,3,0
202+
BRDA:167,31,0,0
203+
BRDA:167,31,1,0
204+
BRDA:171,32,0,0
205+
BRDA:171,32,1,0
206+
BRDA:171,33,0,0
207+
BRDA:171,33,1,0
208+
BRDA:175,34,0,0
209+
BRDA:175,34,1,0
210+
BRDA:175,35,0,0
211+
BRDA:175,35,1,0
212+
BRDA:185,36,0,0
213+
BRDA:185,36,1,4
214+
BRDA:185,37,0,4
215+
BRDA:185,37,1,0
216+
BRDA:187,38,0,0
217+
BRDA:187,38,1,0
218+
BRDA:187,39,0,0
219+
BRDA:187,39,1,0
220+
BRF:87
229221
BRH:22
230222
end_of_record

0 commit comments

Comments
 (0)