sa6anw/hedgedoc-hedgeagent
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

hedgeagent/1.12.0 #1

Open
sa6anw wants to merge 201 commits from hedgeagent/1.12.0 into hedgeagent/1.10.5
pull from: hedgeagent/1.12.0
merge into: sa6anw:hedgeagent/1.10.5
Conversation 0 Commits 201 Files Changed 97 +6 -2
2 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 5a5e12a693 - Show all commits

4
lib/ot/client.js
View File

@@ -282,7 +282,9 @@ ot.Client = (function (global) {
StaleWithBuffer.prototype.applyClient = function (client, operation) { StaleWithBuffer.prototype.applyClient = function (client, operation) {
var buffer = this.buffer.compose(operation); var buffer = this.buffer.compose(operation);
return new StaleWithBuffer(this.acknowlaged, buffer, client, this.revision); var swb = new StaleWithBuffer(this.acknowlaged, buffer, client, this.revision);
swb.pendingOps = this.pendingOps;
return swb;
}; };
StaleWithBuffer.prototype.applyServer = function (client, revision, operation) { StaleWithBuffer.prototype.applyServer = function (client, revision, operation) {

4
public/vendor/ot/client.js vendored
View File

@@ -282,7 +282,9 @@ ot.Client = (function (global) {
StaleWithBuffer.prototype.applyClient = function (client, operation) { StaleWithBuffer.prototype.applyClient = function (client, operation) {
var buffer = this.buffer.compose(operation); var buffer = this.buffer.compose(operation);
return new StaleWithBuffer(this.acknowlaged, buffer, client, this.revision); var swb = new StaleWithBuffer(this.acknowlaged, buffer, client, this.revision);
swb.pendingOps = this.pendingOps;
return swb;
}; };
StaleWithBuffer.prototype.applyServer = function (client, revision, operation) { StaleWithBuffer.prototype.applyServer = function (client, revision, operation) {