|
10 | 10 |
|
11 | 11 | var Base = require('./base');
|
12 | 12 | var utils = require('../utils');
|
13 |
| -var Progress = require('../browser/progress'); |
14 | 13 | var escapeRe = require('escape-string-regexp');
|
15 | 14 | var constants = require('../runner').constants;
|
16 | 15 | var EVENT_TEST_PASS = constants.EVENT_TEST_PASS;
|
@@ -38,7 +37,7 @@ exports = module.exports = HTML;
|
38 | 37 |
|
39 | 38 | var statsTemplate =
|
40 | 39 | '<ul id="mocha-stats">' +
|
41 |
| - '<li class="progress"><canvas width="40" height="40"></canvas></li>' + |
| 40 | + '<li class="progress"></li>' + |
42 | 41 | '<li class="passes"><a href="javascript:void(0);">passes:</a> <em>0</em></li>' +
|
43 | 42 | '<li class="failures"><a href="javascript:void(0);">failures:</a> <em>0</em></li>' +
|
44 | 43 | '<li class="duration">duration: <em>0</em>s</li>' +
|
@@ -68,26 +67,14 @@ function HTML(runner, options) {
|
68 | 67 | var failures = items[2].getElementsByTagName('em')[0];
|
69 | 68 | var failuresLink = items[2].getElementsByTagName('a')[0];
|
70 | 69 | var duration = items[3].getElementsByTagName('em')[0];
|
71 |
| - var canvas = stat.getElementsByTagName('canvas')[0]; |
72 | 70 | var report = fragment('<ul id="mocha-report"></ul>');
|
73 | 71 | var stack = [report];
|
74 |
| - var progress; |
75 |
| - var ctx; |
76 | 72 | var progressText;
|
77 | 73 | var root = document.getElementById('mocha');
|
78 | 74 |
|
79 |
| - if (canvas.getContext) { |
80 |
| - var ratio = window.devicePixelRatio || 1; |
81 |
| - canvas.style.width = canvas.width; |
82 |
| - canvas.style.height = canvas.height; |
83 |
| - canvas.width *= ratio; |
84 |
| - canvas.height *= ratio; |
85 |
| - ctx = canvas.getContext('2d'); |
86 |
| - ctx.scale(ratio, ratio); |
87 |
| - progress = new Progress(); |
88 |
| - } else { |
| 75 | + { |
89 | 76 | // On some broswers, canvas might be unavailable for whatever reason.
|
90 |
| - // As such, we need a text version as a fallback |
| 77 | + // As such, we need text and progress |
91 | 78 | var progressTextFallback = fragment('<li class="progress-text">progress: <em>0</em>%</li>');
|
92 | 79 | progressText = progressTextFallback.getElementsByTagName('em')[0];
|
93 | 80 | items[0].replaceWith(progressTextFallback);
|
@@ -122,10 +109,6 @@ function HTML(runner, options) {
|
122 | 109 | root.appendChild(stat);
|
123 | 110 | root.appendChild(report);
|
124 | 111 |
|
125 |
| - if (progress) { |
126 |
| - progress.size(40); |
127 |
| - } |
128 |
| - |
129 | 112 | runner.on(EVENT_SUITE_BEGIN, function (suite) {
|
130 | 113 | if (suite.root) {
|
131 | 114 | return;
|
@@ -241,9 +224,7 @@ function HTML(runner, options) {
|
241 | 224 | function updateStats() {
|
242 | 225 | // TODO: add to stats
|
243 | 226 | var percent = ((stats.tests / runner.total) * 100) | 0;
|
244 |
| - if (progress) { |
245 |
| - progress.update(percent).draw(ctx); |
246 |
| - } else if (progressText) { |
| 227 | + if (progressText) { |
247 | 228 | // setting a toFixed that is too low, makes small changes to progress not shown
|
248 | 229 | // setting it too high, makes the progress text longer then it needs to
|
249 | 230 | // to address this, calculate the toFixed based on the magnitude of total
|
|
0 commit comments