htwkmooc/codeocean
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/master'

Browse Source
This commit is contained in:
Felix Wolff
2015-03-27 18:15:35 +01:00
parent f73051eabd 780f6a4fa6
commit db1b94dcf0
5 changed files with 19 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
app/assets/javascripts/editor.js
View File

@ -569,10 +569,17 @@ $(function() {
$('#results ul').first().html('');
$('.test-count .number').html(response.length);
clearOutput();
_.each(response, function(result, index) {
printOutput(result, false, index);
printScoringResult(result, index);
});
if (_.some(response, function(result) {
return result.status === 'timeout';
})) {
showTimeoutMessage();
}
};
var renderCode = function(event) {
@ -734,10 +741,7 @@ $(function() {
var showStatus = function(output) {
if (output.status === 'timeout') {
$.flash.danger({
icon: ['fa', 'fa-clock-o'],
text: $('#editor').data('message-timeout')
});
showTimeoutMessage();
} else if (output.stderr) {
$.flash.danger({
icon: ['fa', 'fa-bug'],
@ -755,6 +759,13 @@ $(function() {
$('a[data-toggle="tab"]').eq(index || 0).tab('show');
};
var showTimeoutMessage = function() {
$.flash.danger({
icon: ['fa', 'fa-clock-o'],
text: $('#editor').data('message-timeout')
});
};
var showWorkspaceTab = function(event) {
event.preventDefault();
showTab(1);