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

Set lastDeltaObject per file

Browse Source 
* This change will potentially resolve a race condition that could occur when the same change was simultaneously performed in two different files.
This commit is contained in:
Sebastian Serth
2023-09-06 22:41:03 +02:00
committed by Sebastian Serth
parent f7c2fbebd6
commit b43441f85e
1 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -29,7 +29,7 @@ var CodeOceanEditor = {
running: false, running: false,
lastCopyText: null, lastCopyText: null,
lastDeltaObject: null, lastDeltaObject_for_file: new Map(),
<% self.class.include Rails.application.routes.url_helpers %> <% self.class.include Rails.application.routes.url_helpers %>
<% @config ||= CodeOcean::Config.new(:code_ocean).read(erb: false) %> <% @config ||= CodeOcean::Config.new(:code_ocean).read(erb: false) %>
@ -313,6 +313,7 @@ var CodeOceanEditor = {
editor.commands.bindKey("ctrl+alt+0", null); editor.commands.bindKey("ctrl+alt+0", null);
this.editors.push(editor); this.editors.push(editor);
this.editor_for_file.set($(element).parent().data('filename'), editor); this.editor_for_file.set($(element).parent().data('filename'), editor);
this.lastDeltaObject_for_file.set($(element).parent().data('filename'), null);
var session = editor.getSession(); var session = editor.getSession();
var mode = $(element).data('mode') var mode = $(element).data('mode')
session.setMode(mode); session.setMode(mode);
@ -335,8 +336,8 @@ var CodeOceanEditor = {
// listener for autosave // listener for autosave
session.on("change", function (deltaObject, session) { session.on("change", function (deltaObject, session) {
if (this.compareDeltaObjects(deltaObject, CodeOceanEditor.lastDeltaObject)) { if (this.compareDeltaObjects(deltaObject, this.lastDeltaObject_for_file.get(this.active_file.filename))) {
CodeOceanEditor.lastDeltaObject = null; this.lastDeltaObject_for_file.set(this.active_file.filename, null);
return; return;
} }
App.synchronized_editor?.editor_change(deltaObject, this.active_file); App.synchronized_editor?.editor_change(deltaObject, this.active_file);
@ -1037,7 +1038,7 @@ var CodeOceanEditor = {
}, },
applyChanges: function (delta, active_file) { applyChanges: function (delta, active_file) {
this.lastDeltaObject = delta; this.lastDeltaObject_for_file.set(active_file.filename, delta);
const editor = this.editor_for_file.get(active_file.filename) const editor = this.editor_for_file.get(active_file.filename)
editor.session.doc.applyDeltas([delta]); editor.session.doc.applyDeltas([delta]);
}, },