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

Merge branch 'master' of https://github.com/openHPI/codeocean

Browse Source
This commit is contained in:
Ralf Teusner
2015-11-30 17:05:38 +01:00
parent 6170068f24 4597996a26
commit cb16f6a771
2 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -100,12 +100,12 @@ $(function() {
} }
}; };
var confirmSubmission = function(event) { //var confirmSubmission = function(event) {
event.preventDefault(); // event.preventDefault();
if (confirm($(this).data('message-confirm'))) { // if (confirm($(this).data('message-confirm'))) {
submitCode(); // submitCode();
} // }
}; //};
var createSubmission = function(initiator, filter, callback) { var createSubmission = function(initiator, filter, callback) {
showSpinner(initiator); showSpinner(initiator);
@ -637,7 +637,8 @@ $(function() {
var initializeWorkflowButtons = function() { var initializeWorkflowButtons = function() {
$('#start').on('click', showWorkspaceTab); $('#start').on('click', showWorkspaceTab);
$('#submit').on('click', confirmSubmission); //$('#submit').on('click', confirmSubmission);
$('#submit').on('click', submitCode);
}; };
var initializeWorkspaceButtons = function() { var initializeWorkspaceButtons = function() {

3
app/views/exercises/implement.html.slim
View File

@ -76,8 +76,7 @@
br br
- if session[:lti_parameters].try(:has_key?, 'lis_outcome_service_url') - if session[:lti_parameters].try(:has_key?, 'lis_outcome_service_url')
p.text-center = render('editor_button', classes: 'btn-lg btn-success', data: {:'data-message-confirm' => t('exercises.editor.confirm_submit'), :'data-url' => submit_exercise_path(@exercise)}, icon: 'fa fa-send', id: 'submit', label: t('exercises.editor.submit')) p.text-center = render('editor_button', classes: 'btn-lg btn-success', data: {:'data-url' => submit_exercise_path(@exercise)}, icon: 'fa fa-send', id: 'submit', label: t('exercises.editor.submit'))
- if qa_url - if qa_url
#questions-column #questions-column
#questions-holder data-url="#{qa_url}/qa/index/#{@exercise.id}/#{@user_id}" #questions-holder data-url="#{qa_url}/qa/index/#{@exercise.id}/#{@user_id}"