这是indexloc提供的服务，不要输入任何密码
Skip to content

Improve user interface #9

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Oct 30, 2018
Merged

Improve user interface #9

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
538e8ea
Improve HTML and CSS
gibson042 Oct 30, 2018
1f55c23
Show file that is being processed
gibson042 Oct 30, 2018
06080ac
Show loaded file and allow loading a replacement
gibson042 Oct 30, 2018
225eab0
Wait for test tree render before recognizing a file as loaded
gibson042 Oct 30, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 3 additions & 4 deletions index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,13 +19,12 @@
<h1>Test262 Web Runner</h1>
<p class="lead">Run the official <a href="https://github.com/tc39/test262">ECMAScript conformance tests</a> in your browser.</p>
</div>
<span id="buttons">
<div id="buttons">
Load a .zip of <a href="https://github.com/tc39/test262.git">the Test262 repository</a> (e.g. <a href="https://api.github.com/repos/tc39/test262/zipball">this</a>):
<input type="button" class="btn btn-default btn-sm" id="loadLocal" value="Local">
<input type="button" class="btn btn-default btn-sm" id="loadGithub" value="Remote">
<div id="loadStatus" style="display: none;">Loading... <div id="loadFraction"></div></div>
<br>
</span>
<div id="loadStatus" style="display: none;">Loading... <span id="loadFraction"></span></div>
</div>
<div id="tree"></div>
<div id="failures" style="display: none;">
<span id="failuresToggle">[+] Test failures (<span id="failuresCount">0</span>):</span>
Expand Down
53 changes: 36 additions & 17 deletions main.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -704,19 +704,28 @@ function loadZip(z) {
if (!tree.files.test || !tree.files.test.type === 'dir' || !tree.files.harness || !tree.files.harness.files['assert.js'] || !tree.files.harness.files['sta.js']) {
throw new Error("Doesn't look like a test262 bundle.");
}
var resolve, reject;
var renderPromise = new Promise(function(_resolve, _reject) { resolve = _resolve; reject = _reject; });
var harnessNames = Object.keys(tree.files.harness.files);
loadAllUnqueued(harnessNames.map(function(include) { return ['harness', include]; }), function(harnessFiles) {
for (var i = 0; i < harnessNames.length; ++i) {
harness[harnessNames[i]] = harnessFiles[i];
}
try {
for (var i = 0; i < harnessNames.length; ++i) {
harness[harnessNames[i]] = harnessFiles[i];
}

var treeEle = document.getElementById('tree');
treeEle.textContent = 'Tests:';
treeEle.doneCount = 0;
treeEle.totalCount = tree.files.test.count;
addRunLink(treeEle);
renderTree(tree.files.test.files, treeEle, ['test'], false);
});
var treeEle = document.getElementById('tree');
treeEle.textContent = 'Tests:';
treeEle.doneCount = 0;
treeEle.totalCount = tree.files.test.count;
addRunLink(treeEle);
renderTree(tree.files.test.files, treeEle, ['test'], false);
} catch (e) {
reject(e);
return;
}
resolve();
}, reject);
return renderPromise;
});
}

Expand Down Expand Up @@ -756,28 +765,38 @@ window.addEventListener('load', function() {
fileEle.value = ''; // so that the change event is still fired after reloads

fileEle.addEventListener('change', function() {
if (!fileEle.files[0]) {
var file = fileEle.files[0];
if (!file) {
return;
}

var src = file.name;
var safeSrc = src.replace(/</g, '&lt;');
document.getElementById('tree').textContent = '';
loadStatus.innerHTML = 'Reading <kbd>' + safeSrc + '</kbd>...';
loadStatus.style.display = 'inline-block';
loadStatus.textContent = 'Reading...';
loadZip(fileEle.files[0])
.then(function() { buttons.style.display = 'none'; })
.catch(function(e) { loadStatus.textContent = e; });
loadZip(file)
.then(function() { loadStatus.innerHTML = 'Loaded <kbd>' + safeSrc + '</kbd>.'; })
.catch(function(e) { loadStatus.textContent = e; })
.then(function() { fileEle.value = ''; });
});

document.getElementById('loadLocal').addEventListener('click', function() {
fileEle.click();
});

document.getElementById('loadGithub').addEventListener('click', function() {
var src = zipballUrl;
var safeSrc = src.replace(/</g, '&lt;');
document.getElementById('tree').textContent = '';
loadStatus.innerHTML = 'Loading <kbd>' + safeSrc + '</kbd>... <span id="loadFraction"></span>';
loadStatus.style.display = 'inline-block';
var req = new XMLHttpRequest;

req.addEventListener('load', function() {
loadStatus.textContent = 'Reading...';
loadStatus.innerHTML = 'Reading <kbd>' + safeSrc + '</kbd>...';
loadZip(req.response)
.then(function() { buttons.style.display = 'none'; })
.then(function() { loadStatus.innerHTML = 'Loaded <kbd>' + safeSrc + '</kbd>.'; })
.catch(function(e) { loadStatus.textContent = e; });
});

Expand Down
3 changes: 3 additions & 0 deletions style.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,9 @@
top: 30px;
right: 50px;
}
#buttons {
margin-bottom: 20px;
}
#loadStatus {
padding-left: 10px;
}
Expand Down