yonote/yjs
24
0
Fork 0
Code Pull Requests 1 Releases Activity

ready to publish (lint)

Browse Source
This commit is contained in:
Kevin Jahns 2016-09-01 02:40:35 +02:00
parent 330434ee24
commit d22fbca6cc
3 changed files with 5 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/Database.js
View File

@ -513,7 +513,7 @@ module.exports = function (Y /* :any */) {
}
/*
Init type. This is called when a remote operation is retrieved, and transformed to a type
TODO: delete type from store.initializedTypes[id] when corresponding id was deleted!
TODO: delete type from store.initializedTypes[id] when corresponding id was deleted!
*/
* initType (id, args) {
var sid = JSON.stringify(id)
@ -535,12 +535,7 @@ module.exports = function (Y /* :any */) {
id = id || this.getNextOpId(1)
var op = Y.Struct[structname].create(id)
op.type = typedefinition[0].name
/* TODO: implement for y-xml support
if (typedefinition[0].appendAdditionalInfo != null) {
yield* typedefinition[0].appendAdditionalInfo.call(this, op, typedefinition[1])
}
*/
this.requestTransaction(function * () {
if (op.id[0] === '_') {
yield* this.setOperation(op)

4
src/SpecHelper.js
View File

@ -122,7 +122,7 @@ function * applyTransactions (relAmount, numberOfTransactions, objects, users, t
// therefore, operations of the database will be (pre)transformed until user operations arrive
yield (function simulateConcurrentUserInteractions (type) {
if (!(type instanceof Y.utils.CustomType) && type.y instanceof Y.utils.CustomType) {
// usually we expect type to be a custom type. But in YXml we share an object {y: YXml, dom: Dom} instead
// usually we expect type to be a custom type. But in YXml we share an object {y: YXml, dom: Dom} instead
type = type.y
}
if (type.eventHandler.awaiting === 0 && type.eventHandler._debuggingAwaiting !== true) {
@ -161,7 +161,7 @@ function * applyTransactions (relAmount, numberOfTransactions, objects, users, t
function fixAwaitingInType (type) {
if (!(type instanceof Y.utils.CustomType) && type.y instanceof Y.utils.CustomType) {
// usually we expect type to be a custom type. But in YXml we share an object {y: YXml, dom: Dom} instead
// usually we expect type to be a custom type. But in YXml we share an object {y: YXml, dom: Dom} instead
type = type.y
}
return new Promise(function (resolve) {

2
src/Utils.js
View File

@ -295,7 +295,7 @@ module.exports = function (Y /* : any*/) {
var _o = yield* transaction.getInsertion(o.id)
if (_o.parentSub != null && _o.left != null) {
// if o is an insertion of a map struc (parentSub is defined), then it shouldn't be necessary to compute left
this.waiting.splice(i,1)
this.waiting.splice(i, 1)
i-- // update index
} else if (!Y.utils.compareIds(_o.id, o.id)) {
// o got extended