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

Merge branch 'editor-js-refactor' into editor-frontend-refactor

Browse Source
This commit is contained in:
Ralf Teusner
2016-09-01 11:02:08 +02:00
parent dca26cf237 81fca2b8c7
commit 378472f4ed
2 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
app/assets/javascripts/editor.js.erb
View File

@ -4,13 +4,15 @@ $(function() {
//TODO Change this. Otherwise it will fuck people up, //TODO Change this. Otherwise it will fuck people up,
//because it's really confusing if the variables and the code are //because it's really confusing if the variables and the code are
//split over 6 files. //split over 6 files.
$.extend(CodeOceanEditor, $.extend(
CodeOceanEditor,
CodeOceanEditorAJAX, CodeOceanEditorAJAX,
CodeOceanEditorEvaluation, CodeOceanEditorEvaluation,
CodeOceanEditorFlowr, CodeOceanEditorFlowr,
CodeOceanEditorSubmissions, CodeOceanEditorSubmissions,
CodeOceanEditorTurtle, CodeOceanEditorTurtle,
CodeOceanEditorWebsocket); CodeOceanEditorWebsocket
);
if ($('#editor').isPresent() && CodeOceanEditor) { if ($('#editor').isPresent() && CodeOceanEditor) {
if (CodeOceanEditor.isBrowserSupported()) { if (CodeOceanEditor.isBrowserSupported()) {

2
app/assets/javascripts/editor/editor.js.erb
View File

@ -203,7 +203,7 @@ var CodeOceanEditor = {
if (this.qa_api) { if (this.qa_api) {
editor.getSession().on("change", function (deltaObject) { editor.getSession().on("change", function (deltaObject) {
this.qa_api.executeCommand('syncEditor', [this.active_file, deltaObject]); this.qa_api.executeCommand('syncEditor', [this.active_file, deltaObject]);
}); }.bind(this));
} }
var document = editor.getSession().getDocument(); var document = editor.getSession().getDocument();