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

Merge pull request #241 from openHPI/fix_access_on_active_file

Browse Source 
Use CodeOceanEditor.active_file to access file selected in JSFileTree
This commit is contained in:
rteusner
2018-12-07 20:17:08 +01:00
committed by GitHub
parent e08e02f1c8 1833435268
commit 4fd128b31b
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
app/assets/javascripts/editor/submissions.js
View File

@ -85,7 +85,7 @@ CodeOceanEditorSubmissions = {
destroyFile: function() { destroyFile: function() {
this.createSubmission($('#destroy-file'), function(files) { this.createSubmission($('#destroy-file'), function(files) {
return _.reject(files, function(file) { return _.reject(files, function(file) {
return file.file_id === active_file.id; return file.file_id === CodeOceanEditor.active_file.id;
}); });
}, window.CodeOcean.refresh); }, window.CodeOcean.refresh);
}, },
@ -124,7 +124,7 @@ CodeOceanEditorSubmissions = {
event.preventDefault(); event.preventDefault();
if ($('#render').is(':visible')) { if ($('#render').is(':visible')) {
this.createSubmission('#render', null, function (response) { this.createSubmission('#render', null, function (response) {
var url = response.render_url.replace(this.FILENAME_URL_PLACEHOLDER, this.active_file.filename.replace(/#$/,'')); // remove # if it is the last character, this is not part of the filename and just an anchor var url = response.render_url.replace(this.FILENAME_URL_PLACEHOLDER, CodeOceanEditor.active_file.filename.replace(/#$/,'')); // remove # if it is the last character, this is not part of the filename and just an anchor
var pop_up_window = window.open(url); var pop_up_window = window.open(url);
if (pop_up_window) { if (pop_up_window) {
pop_up_window.onerror = function (message) { pop_up_window.onerror = function (message) {
@ -157,7 +157,7 @@ CodeOceanEditorSubmissions = {
this.showSpinner($('#run')); this.showSpinner($('#run'));
$('#score_div').addClass('d-none'); $('#score_div').addClass('d-none');
this.toggleButtonStates(); this.toggleButtonStates();
var url = submission.run_url.replace(this.FILENAME_URL_PLACEHOLDER, this.active_file.filename.replace(/#$/,'')); // remove # if it is the last character, this is not part of the filename and just an anchor var url = submission.run_url.replace(this.FILENAME_URL_PLACEHOLDER, CodeOceanEditor.active_file.filename.replace(/#$/,'')); // remove # if it is the last character, this is not part of the filename and just an anchor
this.initializeSocketForRunning(url); this.initializeSocketForRunning(url);
}, },
@ -176,7 +176,7 @@ CodeOceanEditorSubmissions = {
this.createSubmission('#test', null, function(response) { this.createSubmission('#test', null, function(response) {
this.showSpinner($('#test')); this.showSpinner($('#test'));
$('#score_div').addClass('d-none'); $('#score_div').addClass('d-none');
var url = response.test_url.replace(this.FILENAME_URL_PLACEHOLDER, this.active_file.filename.replace(/#$/,'')); // remove # if it is the last character, this is not part of the filename and just an anchor var url = response.test_url.replace(this.FILENAME_URL_PLACEHOLDER, CodeOceanEditor.active_file.filename.replace(/#$/,'')); // remove # if it is the last character, this is not part of the filename and just an anchor
this.initializeSocketForTesting(url); this.initializeSocketForTesting(url);
}.bind(this)); }.bind(this));
} }