Skip to content

Commit

Permalink
fix wrong remaing estimate if text not reaches bottom of page
Browse files Browse the repository at this point in the history
  • Loading branch information
@dominicrico
dominicrico committed Jul 14, 2015
1 parent 8a0b581 commit 5b3aafe
Show file tree
Hide file tree
Showing 7 changed files with 176 additions and 171 deletions.
28 changes: 14 additions & 14 deletions coverage/PhantomJS 1.9.8 (Mac OS X 0.0.0)/lcov-report/index.html
View file
Expand Up @@ -15,10 +15,10 @@
<div class="header low">
<h1>Code coverage report for <span class="entity">All files</span></h1>
<h2>
Statements: <span class="metric">43.33% <small>(39 / 90)</small></span> &nbsp;&nbsp;&nbsp;&nbsp;
Branches: <span class="metric">18.56% <small>(18 / 97)</small></span> &nbsp;&nbsp;&nbsp;&nbsp;
Functions: <span class="metric">56.25% <small>(9 / 16)</small></span> &nbsp;&nbsp;&nbsp;&nbsp;
Lines: <span class="metric">43.33% <small>(39 / 90)</small></span> &nbsp;&nbsp;&nbsp;&nbsp;
Statements: <span class="metric">31.87% <small>(29 / 91)</small></span> &nbsp;&nbsp;&nbsp;&nbsp;
Branches: <span class="metric">14.43% <small>(14 / 97)</small></span> &nbsp;&nbsp;&nbsp;&nbsp;
Functions: <span class="metric">43.75% <small>(7 / 16)</small></span> &nbsp;&nbsp;&nbsp;&nbsp;
Lines: <span class="metric">31.87% <small>(29 / 91)</small></span> &nbsp;&nbsp;&nbsp;&nbsp;
Ignored: <span class="metric"><span class="ignore-none">none</span></span> &nbsp;&nbsp;&nbsp;&nbsp;
</h2>
<div class="path"></div>
Expand All @@ -42,23 +42,23 @@ <h2>
</thead>
<tbody><tr>
<td class="file low" data-value="src/"><a href="src/index.html">src/</a></td>
<td data-value="43.33" class="pic low"><span class="cover-fill" style="width: 43px;"></span><span class="cover-empty" style="width:57px;"></span></td>
<td data-value="43.33" class="pct low">43.33%</td>
<td data-value="90" class="abs low">(39&nbsp;/&nbsp;90)</td>
<td data-value="18.56" class="pct low">18.56%</td>
<td data-value="97" class="abs low">(18&nbsp;/&nbsp;97)</td>
<td data-value="56.25" class="pct medium">56.25%</td>
<td data-value="16" class="abs medium">(9&nbsp;/&nbsp;16)</td>
<td data-value="43.33" class="pct low">43.33%</td>
<td data-value="90" class="abs low">(39&nbsp;/&nbsp;90)</td>
<td data-value="31.87" class="pic low"><span class="cover-fill" style="width: 31px;"></span><span class="cover-empty" style="width:69px;"></span></td>
<td data-value="31.87" class="pct low">31.87%</td>
<td data-value="91" class="abs low">(29&nbsp;/&nbsp;91)</td>
<td data-value="14.43" class="pct low">14.43%</td>
<td data-value="97" class="abs low">(14&nbsp;/&nbsp;97)</td>
<td data-value="43.75" class="pct low">43.75%</td>
<td data-value="16" class="abs low">(7&nbsp;/&nbsp;16)</td>
<td data-value="31.87" class="pct low">31.87%</td>
<td data-value="91" class="abs low">(29&nbsp;/&nbsp;91)</td>
</tr>

</tbody>
</table>
</div>
</div>
<div class="footer">
<div class="meta">Generated by <a href="http://istanbul-js.org/" target="_blank">istanbul</a> at Tue Jul 14 2015 10:57:46 GMT+0200 (CEST)</div>
<div class="meta">Generated by <a href="http://istanbul-js.org/" target="_blank">istanbul</a> at Tue Jul 14 2015 11:37:52 GMT+0200 (CEST)</div>
</div>
<script src="prettify.js"></script>
<script>
Expand Down
28 changes: 14 additions & 14 deletions coverage/PhantomJS 1.9.8 (Mac OS X 0.0.0)/lcov-report/src/index.html
View file
Expand Up @@ -15,10 +15,10 @@
<div class="header low">
<h1>Code coverage report for <span class="entity">src/</span></h1>
<h2>
Statements: <span class="metric">43.33% <small>(39 / 90)</small></span> &nbsp;&nbsp;&nbsp;&nbsp;
Branches: <span class="metric">18.56% <small>(18 / 97)</small></span> &nbsp;&nbsp;&nbsp;&nbsp;
Functions: <span class="metric">56.25% <small>(9 / 16)</small></span> &nbsp;&nbsp;&nbsp;&nbsp;
Lines: <span class="metric">43.33% <small>(39 / 90)</small></span> &nbsp;&nbsp;&nbsp;&nbsp;
Statements: <span class="metric">31.87% <small>(29 / 91)</small></span> &nbsp;&nbsp;&nbsp;&nbsp;
Branches: <span class="metric">14.43% <small>(14 / 97)</small></span> &nbsp;&nbsp;&nbsp;&nbsp;
Functions: <span class="metric">43.75% <small>(7 / 16)</small></span> &nbsp;&nbsp;&nbsp;&nbsp;
Lines: <span class="metric">31.87% <small>(29 / 91)</small></span> &nbsp;&nbsp;&nbsp;&nbsp;
Ignored: <span class="metric"><span class="ignore-none">none</span></span> &nbsp;&nbsp;&nbsp;&nbsp;
</h2>
<div class="path"><a href="../index.html">All files</a> &#187; src/</div>
Expand All @@ -42,23 +42,23 @@ <h2>
</thead>
<tbody><tr>
<td class="file low" data-value="ng-reading-indicator.js"><a href="ng-reading-indicator.js.html">ng-reading-indicator.js</a></td>
<td data-value="43.33" class="pic low"><span class="cover-fill" style="width: 43px;"></span><span class="cover-empty" style="width:57px;"></span></td>
<td data-value="43.33" class="pct low">43.33%</td>
<td data-value="90" class="abs low">(39&nbsp;/&nbsp;90)</td>
<td data-value="18.56" class="pct low">18.56%</td>
<td data-value="97" class="abs low">(18&nbsp;/&nbsp;97)</td>
<td data-value="56.25" class="pct medium">56.25%</td>
<td data-value="16" class="abs medium">(9&nbsp;/&nbsp;16)</td>
<td data-value="43.33" class="pct low">43.33%</td>
<td data-value="90" class="abs low">(39&nbsp;/&nbsp;90)</td>
<td data-value="31.87" class="pic low"><span class="cover-fill" style="width: 31px;"></span><span class="cover-empty" style="width:69px;"></span></td>
<td data-value="31.87" class="pct low">31.87%</td>
<td data-value="91" class="abs low">(29&nbsp;/&nbsp;91)</td>
<td data-value="14.43" class="pct low">14.43%</td>
<td data-value="97" class="abs low">(14&nbsp;/&nbsp;97)</td>
<td data-value="43.75" class="pct low">43.75%</td>
<td data-value="16" class="abs low">(7&nbsp;/&nbsp;16)</td>
<td data-value="31.87" class="pct low">31.87%</td>
<td data-value="91" class="abs low">(29&nbsp;/&nbsp;91)</td>
</tr>

</tbody>
</table>
</div>
</div>
<div class="footer">
<div class="meta">Generated by <a href="http://istanbul-js.org/" target="_blank">istanbul</a> at Tue Jul 14 2015 10:57:46 GMT+0200 (CEST)</div>
<div class="meta">Generated by <a href="http://istanbul-js.org/" target="_blank">istanbul</a> at Tue Jul 14 2015 11:37:52 GMT+0200 (CEST)</div>
</div>
<script src="../prettify.js"></script>
<script>
Expand Down
69 changes: 36 additions & 33 deletions coverage/PhantomJS 1.9.8 (Mac OS X 0.0.0)/lcov-report/src/ng-reading-indicator.js.html
View file
Expand Up @@ -15,10 +15,10 @@
<div class="header low">
<h1>Code coverage report for <span class="entity">src/ng-reading-indicator.js</span></h1>
<h2>
Statements: <span class="metric">43.33% <small>(39 / 90)</small></span> &nbsp;&nbsp;&nbsp;&nbsp;
Branches: <span class="metric">18.56% <small>(18 / 97)</small></span> &nbsp;&nbsp;&nbsp;&nbsp;
Functions: <span class="metric">56.25% <small>(9 / 16)</small></span> &nbsp;&nbsp;&nbsp;&nbsp;
Lines: <span class="metric">43.33% <small>(39 / 90)</small></span> &nbsp;&nbsp;&nbsp;&nbsp;
Statements: <span class="metric">31.87% <small>(29 / 91)</small></span> &nbsp;&nbsp;&nbsp;&nbsp;
Branches: <span class="metric">14.43% <small>(14 / 97)</small></span> &nbsp;&nbsp;&nbsp;&nbsp;
Functions: <span class="metric">43.75% <small>(7 / 16)</small></span> &nbsp;&nbsp;&nbsp;&nbsp;
Lines: <span class="metric">31.87% <small>(29 / 91)</small></span> &nbsp;&nbsp;&nbsp;&nbsp;
Ignored: <span class="metric"><span class="ignore-none">none</span></span> &nbsp;&nbsp;&nbsp;&nbsp;
</h2>
<div class="path"><a href="../index.html">All files</a> &#187; <a href="index.html">src/</a> &#187; ng-reading-indicator.js</div>
Expand Down Expand Up @@ -222,7 +222,8 @@ <h2>
195
196
197
198</td><td class="line-coverage"><span class="cline-any cline-yes">1</span>
198
199</td><td class="line-coverage"><span class="cline-any cline-yes">1</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-yes">1</span>
Expand Down Expand Up @@ -305,7 +306,7 @@ <h2>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-yes">1</span>
<span class="cline-any cline-yes">1</span>
<span class="cline-any cline-yes">1</span>
<span class="cline-any cline-no">&nbsp;</span>
<span class="cline-any cline-no">&nbsp;</span>
<span class="cline-any cline-no">&nbsp;</span>
<span class="cline-any cline-no">&nbsp;</span>
Expand All @@ -318,29 +319,30 @@ <h2>
<span class="cline-any cline-no">&nbsp;</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-no">&nbsp;</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-yes">1</span>
<span class="cline-any cline-no">&nbsp;</span>
<span class="cline-any cline-no">&nbsp;</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-yes">1</span>
<span class="cline-any cline-yes">1</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-yes">1</span>
<span class="cline-any cline-yes">3</span>
<span class="cline-any cline-no">&nbsp;</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-yes">3</span>
<span class="cline-any cline-no">&nbsp;</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-yes">1</span>
<span class="cline-any cline-yes">1</span>
<span class="cline-any cline-yes">1</span>
<span class="cline-any cline-yes">1</span>
<span class="cline-any cline-yes">1</span>
<span class="cline-any cline-no">&nbsp;</span>
<span class="cline-any cline-no">&nbsp;</span>
<span class="cline-any cline-no">&nbsp;</span>
<span class="cline-any cline-no">&nbsp;</span>
<span class="cline-any cline-no">&nbsp;</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-yes">1</span>
Expand Down Expand Up @@ -501,8 +503,8 @@ <h2>
progressBar = document.getElementsByClassName('ng-reading-indicator-progress')[0];
&nbsp;
function initizalize() {
<span class="missing-if-branch" title="else path not taken" >E</span>if (options.expand || (<span class="branch-1 cbranch-no" title="branch not covered" >!options.expand </span>&amp;&amp; <span class="branch-2 cbranch-no" title="branch not covered" >options.type !== 'small')</span>) {
$timeout(<span class="fstat-no" title="function not covered" >function(){</span>
$timeout(<span class="fstat-no" title="function not covered" >function(){</span>
<span class="cstat-no" title="statement not covered" > if (options.expand || (!options.expand &amp;&amp; options.type !== 'small')) {</span>
<span class="cstat-no" title="statement not covered" > if (options.showHeadline &amp;&amp; scope.headline) {</span>
<span class="cstat-no" title="statement not covered" > headline = scope.headline;</span>
} else <span class="cstat-no" title="statement not covered" >if (options.showHeadline &amp;&amp; !scope.headline &amp;&amp; article.find('h1').length &gt; 0) {</span>
Expand All @@ -513,31 +515,32 @@ <h2>
}
&nbsp;
<span class="cstat-no" title="statement not covered" > scope.headline = (headline) ? headline : null;</span>
});
}
}
&nbsp;
updateSize();
<span class="cstat-no" title="statement not covered" > updateSize();</span>
&nbsp;
angular.element($window).on('scroll', updateProgress);
angular.element($window).on('resize', updateSize);
<span class="cstat-no" title="statement not covered" > angular.element($window).on('scroll', updateProgress);</span>
<span class="cstat-no" title="statement not covered" > angular.element($window).on('resize', updateSize);</span>
});
}
&nbsp;
function findEdges(elem) {
var bodyRect = document.body.getBoundingClientRect(),
<span class="fstat-no" title="function not covered" > function findEdges(elem) {</span>
<span class="cstat-no" title="statement not covered" > var bodyRect = document.body.getBoundingClientRect(),</span>
elemRect = elem.getBoundingClientRect();
&nbsp;
return {
<span class="cstat-no" title="statement not covered" > return {</span>
top: (elemRect.top - bodyRect.top),
bottom: (elem.scrollHeight - window.innerHeight &gt; 0 ) ? <span class="branch-0 cbranch-no" title="branch not covered" >elem.scrollHeight - window.innerHeight </span>: elem.scrollHeight,
bottom: (elem.scrollHeight - window.innerHeight &gt; 0 ) ? elem.scrollHeight - window.innerHeight : elem.scrollHeight,
height: elemRect.height
};
}
&nbsp;
function updateSize() {
bottom = findEdges(article[0]).bottom;
top = findEdges(article[0]).top;
height = findEdges(article[0]).height;
expandOffset = (expandOnHeadline) ? <span class="branch-0 cbranch-no" title="branch not covered" >findEdges(article.find('h1')[0]) </span>: {top: 50};
<span class="fstat-no" title="function not covered" > function updateSize() {</span>
<span class="cstat-no" title="statement not covered" > bottom = findEdges(article[0]).bottom;</span>
<span class="cstat-no" title="statement not covered" > top = findEdges(article[0]).top;</span>
<span class="cstat-no" title="statement not covered" > height = findEdges(article[0]).height;</span>
<span class="cstat-no" title="statement not covered" > expandOffset = (expandOnHeadline) ? findEdges(article.find('h1')[0]) : {top: 50};</span>
<span class="cstat-no" title="statement not covered" > updateProgress();</span>
}
&nbsp;
<span class="fstat-no" title="function not covered" > function updateProgress() {</span>
Expand All @@ -546,7 +549,7 @@ <h2>
<span class="cstat-no" title="statement not covered" > if (article[0].scrollHeight - window.innerHeight &gt; 0) {</span>
<span class="cstat-no" title="statement not covered" > progress = (scrollPos &lt;= top) ? 0 : ((scrollPos-top) / bottom) * 100;</span>
} else {
<span class="cstat-no" title="statement not covered" > progress = (scrollPos &lt;= top) ? 0 : (((scrollPos-top)+((top + height) - (document.body.offsetHeight - window.innerHeight))) / bottom) * 100;</span>
<span class="cstat-no" title="statement not covered" > progress = (scrollPos &lt;= top) ? 0 : (((scrollPos-top)+((top + bottom) - (document.body.offsetHeight - window.innerHeight))) / bottom) * 100;</span>
}
&nbsp;
<span class="cstat-no" title="statement not covered" > if (options.readingTime.enable) {</span>
Expand Down Expand Up @@ -621,7 +624,7 @@ <h2>

</div>
<div class="footer">
<div class="meta">Generated by <a href="http://istanbul-js.org/" target="_blank">istanbul</a> at Tue Jul 14 2015 10:57:46 GMT+0200 (CEST)</div>
<div class="meta">Generated by <a href="http://istanbul-js.org/" target="_blank">istanbul</a> at Tue Jul 14 2015 11:37:52 GMT+0200 (CEST)</div>
</div>
<script src="../prettify.js"></script>
<script>
Expand Down

0 comments on commit 5b3aafe

Please sign in to comment.